[SCM] dpkg's main repository branch, master, updated. 1.15.0-141-ga4d87d5

[Guillem Jover]

The following commit has been merged in the master branch:
commit bf8ae12d0ec3710f409f7b2a533f496a15347da7
Author: Guillem Jover <guil...@debian.org>
Date:   Tue May 19 07:49:15 2009 +0200

    Make deprecated dpkg-scanpackages --udeb option produce a warning
    
    Callers should use -tudeb instead.

diff --git a/README.feature-removal-schedule b/README.feature-removal-schedule
index 61f9bcf..54ec7a7 100644
--- a/README.feature-removal-schedule
+++ b/README.feature-removal-schedule
@@ -21,7 +21,7 @@ Why:
 What: -u, --udeb (dpkg-scanpackages option)
 Status: deprecated
 When: lenny+1
-Warning: none
+Warning: program
 Why:
  This option has been superseded by -tudeb.
 
diff --git a/debian/changelog b/debian/changelog
index 263a623..542ceda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -127,6 +127,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low
   * Do not right justify the database reading progress percent counter.
   * Remove deprecated status on substvars for dpkg-source dpkg-genchanges,
     and stop producing warnings.
+  * Make deprecated dpkg-scanpackages --udeb option produce a warning.
 
   [ Frank Lichtenheld ]
   * Dpkg::Version: Remove unnecessary function next_elem which just
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 0528442..10eeb7f 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -38,7 +38,7 @@ use Getopt::Long qw(:config bundling);
 my %options = (help            => sub { usage(); exit 0; },
               version         => \&version,
               type            => undef,
-              udeb            => 0,
+              udeb            => \&set_type_udeb,
               arch            => undef,
               multiversion    => 0,
              );
@@ -66,6 +66,12 @@ Options:
 "), $progname;
 }
 
+sub set_type_udeb()
+{
+    warning(_g("-u, --udeb option is deprecated (see 
README.feature-removal-schedule)"));
+    $options{type} = 'udeb';
+}
+
 sub load_override
 {
     my $override = shift;
@@ -115,8 +121,7 @@ if (not @ARGV >= 1 && @ARGV <= 3) {
     usageerr(_g("1 to 3 args expected"));
 }
 
-my $type = defined($options{type}) ? $options{type} :
-                                    $options{udeb} ? 'udeb' : 'deb';
+my $type = defined($options{type}) ? $options{type} : 'deb';
 my $arch = $options{arch};
 
 my @find_args;

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org