Package: dpkg-dev
Version: 1.16.1.1
Severity: wishlist
Tags: patch

The following patch orders items in section in alphabetical order:

    COMMANDS, OPTIONS, TERMS, VARIABLES

The patch is based on Git:

    36a0986 2011-11-29  Update Japanese translation of manual pages

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages dpkg-dev depends on:
ii  base-files    6.5                  
ii  binutils      2.21.90.20111004-2   
ii  bzip2         1.0.5-7              
ii  libdpkg-perl  1.16.1.1             
ii  make          3.81-8.1             
ii  patch         2.6.1-2              
ii  xz-utils      5.1.1alpha+20110809-3

Versions of packages dpkg-dev recommends:
ii  build-essential          11.5     
ii  fakeroot                 1.18.1-1 
ii  gcc [c-compiler]         4:4.6.1-3
ii  gcc-4.4 [c-compiler]     4.4.6-11 
ii  gcc-4.5 [c-compiler]     4.5.3-9  
ii  gcc-4.6 [c-compiler]     4.6.1-15 
ii  gnupg                    1.4.11-3 
ii  gpgv                     1.4.11-3 
ii  libalgorithm-merge-perl  0.08-2   

Versions of packages dpkg-dev suggests:
ii  debian-keyring  2011.08.07

-- no debconf information
>From 50a87ce7fe89d747a13578e72badcb871557379b Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 30 Nov 2011 11:07:22 +0200
Subject: [PATCH 2/3] dpkg-architecture.1: (TERMS): order alphabetically
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit


Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
 man/dpkg-architecture.1 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/dpkg-architecture.1 b/man/dpkg-architecture.1
index fc7c32e..29d59fa 100644
--- a/man/dpkg-architecture.1
+++ b/man/dpkg-architecture.1
@@ -80,21 +80,21 @@ in some other script (for example \fBdpkg\-buildpackage\fP(1)).
 Set the GNU system type.
 .
 .SH TERMS
+.IP "architecture wildcard" 4
+An architecture wildcard is a special architecture string that will match
+any real architecture being part of it. The general form is <kernel>\-<cpu>.
+Examples: linux\-any, any\-i386, hurd\-any.
 .IP "build machine" 4
 The machine the package is built on.
-.IP "host machine" 4
-The machine the package is built for.
 .IP "Debian architecture" 4
 The Debian architecture string, which specifies the binary tree in the
 \s-1FTP\s0 archive. Examples: i386, sparc, hurd\-i386.
-.IP "architecture wildcard" 4
-An architecture wildcard is a special architecture string that will match
-any real architecture being part of it. The general form is <kernel>\-<cpu>.
-Examples: linux\-any, any\-i386, hurd\-any.
 .IP "\s-1GNU\s0 system type" 4
 An architecture specification string consisting of two parts separated by
 a dash: cpu and system. Examples: i386\-linux\-gnu, sparc\-linux\-gnu,
 i386\-gnu, x86_64\-netbsd.
+.IP "host machine" 4
+The machine the package is built for.
 .
 .SH VARIABLES
 The following variables are set by \fBdpkg\-architecture\fP:
-- 
1.7.7.1

>From 3f38064fb7548a9b3c489befc5d3eeeb9b29b8e8 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 30 Nov 2011 11:02:20 +0200
Subject: [PATCH 1/3] man/dpkg-architecture.1: (COMMANDS, OPTIONS): Order
 items alphabetically
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit


Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
 man/dpkg-architecture.1 |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/man/dpkg-architecture.1 b/man/dpkg-architecture.1
index bf27079..fc7c32e 100644
--- a/man/dpkg-architecture.1
+++ b/man/dpkg-architecture.1
@@ -2,7 +2,7 @@
 .SH "NAME"
 dpkg\-architecture \- set and determine the architecture for package building
 .
-.SH SYNOPSIS
+ajor.SH SYNOPSIS
 .B dpkg\-architecture
 .RI [ option "...] [" command ]
 .PP
@@ -25,9 +25,9 @@ does not match the default.
 .
 .SH COMMANDS
 .TP
-.B \-l
-Print the environment variables, one each line, in the format
-\fIVARIABLE=value\fP. This is the default action.
+.BI \-c " command"
+Execute a \fIcommand\fP in an environment which has all variables set to
+the determined value.
 .TP
 .BI \-e debian-architecture
 Check for equality of architecture. By default \fIdebian-architecture\fP
@@ -41,6 +41,13 @@ as an architecture wildcard and comparing against the current Debian
 architecture. Command finishes with an exit status of 0 if matched, 1 if
 not matched.
 .TP
+.B \-l
+Print the environment variables, one each line, in the format
+\fIVARIABLE=value\fP. This is the default action.
+.TP
+.B \-L
+Print a list of valid architecture names.
+.TP
 .BI \-q variable-name
 Print the value of a single variable.
 .TP
@@ -51,13 +58,6 @@ using eval.
 .B \-u
 Print a similar command to \fB\-s\fP but to unset all variables.
 .TP
-.BI \-c " command"
-Execute a \fIcommand\fP in an environment which has all variables set to
-the determined value.
-.TP
-.B \-L
-Print a list of valid architecture names.
-.TP
 .B \-\-help
 Show the usage message and exit.
 .TP
@@ -69,15 +69,15 @@ Show the version and exit.
 .BI \-a debian-architecture
 Set the Debian architecture.
 .TP
-.BI \-t gnu-system-type
-Set the GNU system type.
-.TP
 .B \-f
 Values set by existing environment variables with the same name as used by
 the scripts are honored (i.e. used by \fBdpkg\-architecture\fP), except if
 this force flag is present. This allows the user
 to override a value even when the call to \fBdpkg\-architecture\fP is buried
 in some other script (for example \fBdpkg\-buildpackage\fP(1)).
+.TP
+.BI \-t gnu-system-type
+Set the GNU system type.
 .
 .SH TERMS
 .IP "build machine" 4
-- 
1.7.7.1

>From c7b635816d0809428b39b9c5b981405e3492d9d0 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 30 Nov 2011 11:11:07 +0200
Subject: [PATCH 3/3] dpkg-architecture.1: (VARIABLES): order alphabetically
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit


Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
 man/dpkg-architecture.1 |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/man/dpkg-architecture.1 b/man/dpkg-architecture.1
index 29d59fa..74d3aa1 100644
--- a/man/dpkg-architecture.1
+++ b/man/dpkg-architecture.1
@@ -100,14 +100,14 @@ The machine the package is built for.
 The following variables are set by \fBdpkg\-architecture\fP:
 .IP "\s-1DEB_BUILD_ARCH\s0" 4
 The Debian architecture of the build machine.
-.IP "\s-1DEB_BUILD_ARCH_OS\s0" 4
-The Debian system name of the build machine.
-.IP "\s-1DEB_BUILD_ARCH_CPU\s0" 4
-The Debian cpu name of the build machine.
 .IP "\s-1DEB_BUILD_ARCH_BITS\s0" 4
 The pointer size of the build machine (in bits).
+.IP "\s-1DEB_BUILD_ARCH_CPU\s0" 4
+The Debian cpu name of the build machine.
 .IP "\s-1DEB_BUILD_ARCH_ENDIAN\s0" 4
 The endianness of the build machine (little / big).
+.IP "\s-1DEB_BUILD_ARCH_OS\s0" 4
+The Debian system name of the build machine.
 .IP "\s-1DEB_BUILD_GNU_CPU\s0" 4
 The \s-1CPU\s0 part of \s-1DEB_BUILD_GNU_TYPE\s0.
 .IP "\s-1DEB_BUILD_GNU_SYSTEM\s0" 4
@@ -119,14 +119,14 @@ The clarified \s-1GNU\s0 system type of the build machine, used for filesystem
 paths.
 .IP "\s-1DEB_HOST_ARCH\s0" 4
 The Debian architecture of the host machine.
-.IP "\s-1DEB_HOST_ARCH_OS\s0" 4
-The Debian system name of the host machine.
-.IP "\s-1DEB_HOST_ARCH_CPU\s0" 4
-The Debian cpu name of the host machine.
 .IP "\s-1DEB_HOST_ARCH_BITS\s0" 4
 The pointer size of the host machine (in bits).
+.IP "\s-1DEB_HOST_ARCH_CPU\s0" 4
+The Debian cpu name of the host machine.
 .IP "\s-1DEB_HOST_ARCH_ENDIAN\s0" 4
 The endianness of the host machine (little / big).
+.IP "\s-1DEB_HOST_ARCH_OS\s0" 4
+The Debian system name of the host machine.
 .IP "\s-1DEB_HOST_GNU_CPU\s0" 4
 The \s-1CPU\s0 part of \s-1DEB_HOST_GNU_TYPE\s0.
 .IP "\s-1DEB_HOST_GNU_SYSTEM\s0" 4
-- 
1.7.7.1

Reply via email to