dpkg-scanpackages: Remove obsolete --udeb option

debian/changelog

@@ -19,6 +19,7 @@ dpkg (1.16.4) UNRELEASED; urgency=low
     Requested by Thorsten Glaser <tg@mirbsd.de>.
   * Remove deprecated support for PGP style signing command interface from
     dpkg-buildpackage.
+  * Remove obsolete --udeb dpkg-scanpackages option.
 
   [ Updated man page translations ]
   * German (Helge Kreutzmann).

doc/README.feature-removal-schedule

@@ -27,13 +27,6 @@ Why:
  These fields have been superseded by either other fields with better names
  or values in other fields.
 
-What: -u, --udeb (dpkg-scanpackages option)
-Status: deprecated
-When: 1.16.x
-Warning: program
-Why:
- This option has been superseded by -tudeb.
-
 What: --print-installation-architecture (dpkg option)
 Status: obsolete
 When: 1.15.x
@@ -124,3 +117,10 @@ Why:
  PGP is not part of Debian and GnuPG has been the standard tool for digital
  signatures for several years already. Supporting only GnuPG enables us to
  rely on some of its features.
+
+What: -u, --udeb (dpkg-scanpackages option)
+Status: deprecated
+When: 1.16.4
+Warning: program
+Why:
+ This option has been superseded by -tudeb.

man/dpkg-scanpackages.1

@@ -2,6 +2,7 @@
 .\"
 .\" Copyright © 1996 Michael Shields <shields@crosslink.net>
 .\" Copyright © 2006 Frank Lichtenheld <djpig@debian.org>
+.\" Copyright © 2007 Guillem Jover <guillem@debian.org>
 .\" Copyright © 2009 Raphaël Hertzog <hertzog@debian.org>
 .\" 
 .\" This is free software; you can redistribute it and/or modify
@@ -17,7 +18,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .
-.TH dpkg\-scanpackages 1 "2011-08-14" "Debian Project" "dpkg utilities"
+.TH dpkg\-scanpackages 1 "2012-05-07" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-scanpackages \- create Packages index files
 .
@@ -78,9 +79,6 @@ differ in architecture only the first one found is used.
 .BR \-t ", " \-\-type " \fItype\fP"
 Scan for *.\fItype\fP packages, instead of *.deb.
 .TP
-.BR \-u ", " \-\-udeb
-\fBObsolete\fP alias for \fB\-tudeb\fP.
-.TP
 .BR \-e ", " \-\-extra\-override " \fIfile\fP"
 Scan \fIfile\fP to find supplementary overrides (the file can be
 compressed). See

scripts/dpkg-scanpackages.pl

@@ -2,6 +2,8 @@
 #
 # dpkg-scanpackages
 #
+# Copyright © 2006-2011 Guillem Jover <guillem@debian.org>
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -44,7 +46,6 @@ my %overridden;
 my %options = (help            => sub { usage(); exit 0; },
 	       version         => \&version,
 	       type            => undef,
-	       udeb            => \&set_type_udeb,
 	       arch            => undef,
 	       multiversion    => 0,
 	       'extra-override'=> undef,
@@ -52,7 +53,7 @@ my %options = (help            => sub { usage(); exit 0; },
 	      );
 
 my $result = GetOptions(\%options,
-                        'help|h|?', 'version', 'type|t=s', 'udeb|u!',
+                        'help|h|?', 'version', 'type|t=s',
                         'arch|a=s', 'multiversion|m!', 'extra-override|e=s',
                         'medium|M=s');
 
@@ -67,7 +68,6 @@ sub usage {
 
 Options:
   -t, --type <type>        scan for <type> packages (default is 'deb').
-  -u, --udeb               scan for udebs (obsolete alias for -tudeb).
   -a, --arch <arch>        architecture to scan for.
   -m, --multiversion       allow multiple versions of a single package.
   -e, --extra-override <file>
@@ -78,12 +78,6 @@ 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;