Просмотр исходного кода

dpkg-architecture(1): Fold DEBIAN/RULES section into EXAMPLES

Guillem Jover лет назад: 13
Родитель
Сommit
203c16edb3
2 измененных файлов с 24 добавлено и 23 удалено
  1. 1 0
      debian/changelog
  2. 23 23
      man/dpkg-architecture.1

+ 1 - 0
debian/changelog

@@ -23,6 +23,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
     - Unify WARNING and ERROR sections into DIAGNOSTICS.
     - Unify command-line options into a single OPTIONS section.
     - Mark programs, variables, fields and command-line options in bold.
+    - Fold dpkg-architecture(1) DEBIAN/RULES section into EXAMPLES.
   * Use colon instead of dot for user:group in dpkg debug output.
   * Remove support for obsolete DM-Upload-Allowed from Dpkg::Vendor::Debian.
   * Fix update-alternatives to use the current alternative link as the first

+ 23 - 23
man/dpkg-architecture.1

@@ -180,7 +180,29 @@ names.
 Makefile snippet that properly sets and exports all the variables that
 \fBdpkg\-architecture\fP outputs (since dpkg 1.16.1).
 .
-.SH DEBIAN/RULES
+.SH EXAMPLES
+\fBdpkg\-buildpackage\fP accepts the \fB\-a\fR option and passes it to
+\fBdpkg\-architecture\fP. Other examples:
+.IP
+CC=i386\-gnu\-gcc dpkg\-architecture \-c debian/rules build
+.IP
+eval \`dpkg\-architecture \-u\`
+.PP
+Check if an architecture is equal to the current architecture or a given
+one:
+.IP
+dpkg\-architecture \-elinux\-alpha
+.IP
+dpkg\-architecture \-amips \-elinux\-mips
+.PP
+Check if the current architecture or an architecture provided with \fB\-a\fP
+are Linux systems:
+.IP
+dpkg\-architecture \-ilinux\-any
+.IP
+dpkg\-architecture \-ai386 \-ilinux\-any
+.
+.SS Usage in debian/rules
 The environment variables set by \fBdpkg\-architecture\fP are passed to
 \fIdebian/rules\fP as make variables (see make documentation). However,
 you should not rely on them, as this breaks manual invocation of the
@@ -227,28 +249,6 @@ endif
 In any case, you should never use \fBdpkg \-\-print\-architecture\fP to get
 architecture information during a package build.
 .
-.SH EXAMPLES
-\fBdpkg\-buildpackage\fP accepts the \fB\-a\fR option and passes it to
-\fBdpkg\-architecture\fP. Other examples:
-.IP
-CC=i386\-gnu\-gcc dpkg\-architecture \-c debian/rules build
-.IP
-eval \`dpkg\-architecture \-u\`
-.PP
-Check if an architecture is equal to the current architecture or a given
-one:
-.IP
-dpkg\-architecture \-elinux\-alpha
-.IP
-dpkg\-architecture \-amips \-elinux\-mips
-.PP
-Check if the current architecture or an architecture provided with \fB\-a\fP
-are Linux systems:
-.IP
-dpkg\-architecture \-ilinux\-any
-.IP
-dpkg\-architecture \-ai386 \-ilinux\-any
-.
 .SH SEE ALSO
 .BR dpkg\-buildpackage (1),
 .BR dpkg\-cross (1).