[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.4.3-209-gbf00432



The following commit has been merged in the master branch:
commit d6947af28655fe9c24be8440b679057029c499da
Author: Jari Aalto <jari.aalto@cante.net>
Date:   Thu Oct 21 11:32:00 2010 +0300

    frontend/lintian: order options alphabetically
    
     * frontend/lintian:
        + [NT] Sorted related options alphabetically.  Thanks to Jari Aalto
          for the initial patch.  (Closes: #600905)
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 028461f..ebc9ea6 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -176,6 +176,8 @@ lintian (2.5.0) UNRELEASED; urgency=low
       exiting.  In some cases these jobs would attempt to modify the
       lab while Lintian was trying to remove it.  Thanks to
       Andreas Beckmann for reporting this issue.  (Closes: #610218)
+    + [NT] Sorted related options alphabetically.  Thanks to Jari Aalto
+      for the initial patch.  (Closes: #600905)
 
   * lib/Lintian/Check.pm:
     + [NT] Use Email::Valid to validate email addreses.
diff --git a/frontend/lintian b/frontend/lintian
index 23f6d78..c6a70f5 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -139,54 +139,54 @@ sub syntax {
     print <<"EOT-EOT-EOT";
 Syntax: lintian [action] [options] [--] [packages] ...
 Actions:
-    -S, --setup-lab           set up static lab
-    -R, --remove-lab          remove static lab
     -c, --check               check packages (default action)
     -C X, --check-part X      check only certain aspects
-    -X X, --dont-check-part X don\'t check certain aspects
+    -F, --ftp-master-rejects  only check for automatic reject tags
+    -r, --remove              remove package from the lab
+    -R, --remove-lab          remove static lab
+    -S, --setup-lab           set up static lab
     -T X, --tags X            only run checks needed for requested tags
     --tags-from-file X        like --tags, but read list from file
-    -F, --ftp-master-rejects  only check for automatic reject tags
     -u, --unpack              only unpack packages in the lab
-    -r, --remove              remove package from the lab
+    -X X, --dont-check-part X don\'t check certain aspects
 General options:
+    -d, --debug               turn Lintian\'s debug messages ON
     -h, --help                display short help text
-    -v, --verbose             verbose messages
-    -V, --version             display Lintian version and exit
     --print-version           print unadorned version number and exit
-    -d, --debug               turn Lintian\'s debug messages ON
     -q, --quiet               suppress all informational messages
+    -v, --verbose             verbose messages
+    -V, --version             display Lintian version and exit
 Behaviour options:
+    --allow-root              suppress lintian\'s warning when run as root
+    --color never/always/auto disable, enable, or enable color for TTY
+    --display-source X        restrict displayed tags by source
+    -E, --display-experimental display "X:" tags (normally suppressed)
+    --fail-on-warnings        return a non-zero exit status if warnings found
     -i, --info                give detailed info about tags
     -I, --display-info        display "I:" tags (normally suppressed)
-    -E, --display-experimental display "X:" tags (normally suppressed)
-    --pedantic                display "P:" tags (normally suppressed)
+    --keep-lab                keep lab after run, even if temporary
     -L, --display-level       display tags with the specified level
-    --display-source X        restrict displayed tags by source
-    --suppress-tags T,...     don\'t show the specified tags
-    --suppress-tags-from-file X don\'t show the tags listed in file X
+    -m, --md5sums, --checksums check checksums when processing a .changes file
     -o, --no-override         ignore overrides
+    --pedantic                display "P:" tags (normally suppressed)
     --show-overrides          output tags that have been overriden
-    --color never/always/auto disable, enable, or enable color for TTY
+    --suppress-tags T,...     don\'t show the specified tags
+    --suppress-tags-from-file X don\'t show the tags listed in file X
     -U X, --unpack-info X     specify which info should be collected
-    -m, --md5sums, --checksums check checksums when processing a .changes file
-    --allow-root              suppress lintian\'s warning when run as root
-    --fail-on-warnings        return a non-zero exit status if warnings found
-    --keep-lab                keep lab after run, even if temporary
 Configuration options:
-    --cfg CONFIGFILE          read CONFIGFILE for configuration
-    --lab LABDIR              use LABDIR as permanent laboratory
+    --arch ARCH               scan packages with architecture ARCH
+    --area AREA               scan packages in this archive area (e.g. main)
     --archivedir ARCHIVEDIR   location of Debian archive to scan for packages
+    --cfg CONFIGFILE          read CONFIGFILE for configuration
     --dist DIST               scan packages in this distribution (e.g. sid)
-    --area AREA               scan packages in this archive area (e.g. main)
-    --arch ARCH               scan packages with architecture ARCH
+    --lab LABDIR              use LABDIR as permanent laboratory
     --root ROOTDIR            use ROOTDIR instead of /usr/share/lintian
 Package selection options:
     -a, --all                 process all packages in distribution
     -b, --binary              process only binary packages
+    -p X, --packages-file X   process all files in file (special syntax!)
     -s, --source              process only source packages
     --udeb                    process only udeb packages
-    -p X, --packages-file X   process all files in file (special syntax!)
 EOT-EOT-EOT
 
     exit 0;

-- 
Debian package checker


Reply to: