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

dpkg-architecture(1): Fix typos

DEB_HOST_ARCH_BITS was listed as DEB_BUILD_ARCH_BITS;
DEB_HOST_ARCH_ENDIAN was listed as DEB_BUILD_ARCH_ENDIAN.  In the
process, adjust the ordering to match dpkg-architecture's output.
Originally reported as
https://bugs.launchpad.net/ubuntu/+source/dpkg/+bug/564308.
Ian Fleming лет назад: 16
Родитель
Сommit
395c8a0acc
2 измененных файлов с 10 добавлено и 7 удалено
  1. 3 0
      debian/changelog
  2. 7 7
      man/dpkg-architecture.1

+ 3 - 0
debian/changelog

@@ -8,6 +8,9 @@ dpkg (1.15.8) UNRELEASED; urgency=low
     Closes: #572526
     Closes: #572526
   * Merge non-regression test for Ubuntu's specificities concerning
   * Merge non-regression test for Ubuntu's specificities concerning
     changelog handling. Closes: #582389
     changelog handling. Closes: #582389
+  * Fix some copy-paste mistakes in dpkg-architecture(1). Thanks to Ian Fleming
+    <iflema@yahoo.com.au> for the patch and Colin Watson for forwarding out of
+    Launchpad. Closes: #582404 LP: #564308
 
 
   [ Guillem Jover ]
   [ Guillem Jover ]
   * Require gettext 0.18:
   * Require gettext 0.18:

+ 7 - 7
man/dpkg-architecture.1

@@ -109,28 +109,28 @@ The Debian cpu name of the build machine.
 The pointer size of the build machine (in bits).
 The pointer size of the build machine (in bits).
 .IP "\s-1DEB_BUILD_ARCH_ENDIAN\s0" 4
 .IP "\s-1DEB_BUILD_ARCH_ENDIAN\s0" 4
 The endianness of the build machine (little / big).
 The endianness of the build machine (little / big).
-.IP "\s-1DEB_BUILD_GNU_TYPE\s0" 4
-The \s-1GNU\s0 system type of the build machine.
 .IP "\s-1DEB_BUILD_GNU_CPU\s0" 4
 .IP "\s-1DEB_BUILD_GNU_CPU\s0" 4
-The \s-1CPU\s0 part of \s-1DEB_BUILD_GNU_TYPE\s0
+The \s-1CPU\s0 part of \s-1DEB_BUILD_GNU_TYPE\s0.
 .IP "\s-1DEB_BUILD_GNU_SYSTEM\s0" 4
 .IP "\s-1DEB_BUILD_GNU_SYSTEM\s0" 4
 The System part of \s-1DEB_BUILD_GNU_TYPE\s0.
 The System part of \s-1DEB_BUILD_GNU_TYPE\s0.
+.IP "\s-1DEB_BUILD_GNU_TYPE\s0" 4
+The \s-1GNU\s0 system type of the build machine.
 .IP "\s-1DEB_HOST_ARCH\s0" 4
 .IP "\s-1DEB_HOST_ARCH\s0" 4
 The Debian architecture of the host machine.
 The Debian architecture of the host machine.
 .IP "\s-1DEB_HOST_ARCH_OS\s0" 4
 .IP "\s-1DEB_HOST_ARCH_OS\s0" 4
 The Debian system name of the host machine.
 The Debian system name of the host machine.
 .IP "\s-1DEB_HOST_ARCH_CPU\s0" 4
 .IP "\s-1DEB_HOST_ARCH_CPU\s0" 4
 The Debian cpu name of the host machine.
 The Debian cpu name of the host machine.
-.IP "\s-1DEB_BUILD_ARCH_BITS\s0" 4
+.IP "\s-1DEB_HOST_ARCH_BITS\s0" 4
 The pointer size of the host machine (in bits).
 The pointer size of the host machine (in bits).
-.IP "\s-1DEB_BUILD_ARCH_ENDIAN\s0" 4
+.IP "\s-1DEB_HOST_ARCH_ENDIAN\s0" 4
 The endianness of the host machine (little / big).
 The endianness of the host machine (little / big).
-.IP "\s-1DEB_HOST_GNU_TYPE\s0" 4
-The \s-1GNU\s0 system type of the host machine.
 .IP "\s-1DEB_HOST_GNU_CPU\s0" 4
 .IP "\s-1DEB_HOST_GNU_CPU\s0" 4
 The \s-1CPU\s0 part of \s-1DEB_HOST_GNU_TYPE\s0.
 The \s-1CPU\s0 part of \s-1DEB_HOST_GNU_TYPE\s0.
 .IP "\s-1DEB_HOST_GNU_SYSTEM\s0" 4
 .IP "\s-1DEB_HOST_GNU_SYSTEM\s0" 4
 The System part of \s-1DEB_HOST_GNU_TYPE\s0.
 The System part of \s-1DEB_HOST_GNU_TYPE\s0.
+.IP "\s-1DEB_HOST_GNU_TYPE\s0" 4
+The \s-1GNU\s0 system type of the host machine.
 .
 .
 .SH "DEBIAN/RULES"
 .SH "DEBIAN/RULES"
 The environment variables set by \fBdpkg\-architecture\fP are passed to
 The environment variables set by \fBdpkg\-architecture\fP are passed to