[SCM] Debian package checker branch, master, updated. 2.5.4-16-ga093a45

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit a093a45996b5a7d4ad9c8b272be85a1767bdbc11
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Dec 2 06:50:17 2011 +0100

    Allow --unpack-info to appear more than once on the cmd-line
    
    The following two lines of arguments are now semantically
    equivalent:
    
      -U info1 -U info2
      -U info1,info2
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 221ca1f..14e7b65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ lintian (2.5.5) UNRELEASED; urgency=low
     + [JW] Add python3-sphinx as provider of dh_sphinxdoc.
       (Closes: #649640)
 
+  * frontend/lintian:
+    + [NT] Allow -U to be given more than once.
+
   * lib/Lintian/Collect/{Binary,Source}.pm:
     + [NT] Assume packages to be non-native when it cannot be
       accurately determined due to missing version field.
diff --git a/frontend/lintian b/frontend/lintian
index 8e2b64c..cc71bb3 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -115,7 +115,7 @@ my $action;
 my $checks;
 my $check_tags;
 my $dont_check;
-my $unpack_info;
+my @unpack_info;
 my $cwd;
 my $exit_code = 0;
 my $LAB;
@@ -338,10 +338,7 @@ sub record_dont_check_part {
 
 # Process for -U|--unpack-info flag
 sub record_unpack_info {
-    if ($unpack_info) {
-        die('multiple -U or --unpack-info options not allowed');
-    }
-    $unpack_info = "$_[1]";
+    push @unpack_info, "$_[1]";
 }
 
 # Record what type of data is specified
@@ -1101,9 +1098,9 @@ if ($action eq 'unpack') {
     }
 }
 
-if ($unpack_info) {
+if (@unpack_info) {
     # Add collections specifically requested by the user (--unpack-info)
-    for my $i (split(/,/,$unpack_info)) {
+    for my $i (map { split m/,/ } @unpack_info) {
         unless ($collection_info{$i}) {
             fail("unknown info specified: $i");
         }
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index 04812f2..6285e07 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -350,6 +350,12 @@ auto-removed (in this run).
 
 This option is mostly useful for debugging or special purpose setups.
 
+It is allowed to give this option more than once.  The following
+two lines of arguments are semantically equivalent:
+
+ -U info1 -U info2
+ -U info1,info2
+
 =back
 
 Configuration options:

-- 
Debian package checker