Add deprecation warnings for -u to the documentation, since putting options after -- is much more sane. (However, -u will not go away any time soon.) Closes: #554509

5 files changed, 23 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 35647d88..1eca2a1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ debhelper (7.4.4) UNRELEASED; urgency=low
     debhelper runs make, and the parent debian/rules was run in parallel
     mode (as dpkg-buildpackage -j currently does).
   * Thanks, Modestas Vainius for much of the work on parallel build support.
+  * Add deprecation warnings for -u to the documentation, since putting
+    options after -- is much more sane. (However, -u will not go away any
+    time soon.) Closes: #554509
 
  -- Joey Hess <joeyh@debian.org>  Wed, 28 Oct 2009 18:10:45 -0400
 
diff --git a/dh_builddeb b/dh_builddeb
index 3547649b..3477f257 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -32,13 +32,16 @@ other than the default of ".."
 Use this if you want to force the generated .deb file to have a particular
 file name. Does not work well if more than one .deb is generated!
 
-=item B<-u>I<params>
-
 =item B<--> I<params>
 
 Pass I<params> to L<dpkg-deb(1)> when it is used to build the
 package.
 
+=item B<-u>I<params>
+
+This is another way to pass I<params> to L<dpkg-deb(1)>.
+It is deprecated; use B<--> instead.
+
 =back
 
 =cut
diff --git a/dh_gencontrol b/dh_gencontrol
index 726d0855..93f04594 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -27,12 +27,15 @@ useful flags.
 
 =over 4
 
-=item B<-u>I<params>, B<--dpkg-gencontrol-params>=I<params>
-
 =item B<--> I<params>
 
 Pass "params" to L<dpkg-gencontrol(1)>.
 
+=item B<-u>I<params>, B<--dpkg-gencontrol-params>=I<params>
+
+This is another way to pass I<params> to L<dpkg-deb(1)>.
+It is deprecated; use B<--> instead.
+
 =back
 
 =cut
diff --git a/dh_shlibdeps b/dh_shlibdeps
index e5f73cba..91930d74 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -27,12 +27,6 @@ a list of ELF executables and shared libraries it has found.
 
 =over 4
 
-=item B<-u>I<params>, B<--dpkg-shlibdeps-params=>I<params>
-
-=item B<--> I<params>
-
-Pass "params" to L<dpkg-shlibdeps(1)>.
-
 =item B<-X>I<item>, B<--exclude=>I<item>
 
 Exclude files that contain "item" anywhere in their filename from being
@@ -40,6 +34,15 @@ passed to dpkg-shlibdeps. This will make their dependencies be ignored.
 This may be useful in some situations, but use it with caution. This option
 may be used more than once to exclude more than one thing.
 
+=item B<--> I<params>
+
+Pass "params" to L<dpkg-shlibdeps(1)>.
+
+=item B<-u>I<params>, B<--dpkg-shlibdeps-params=>I<params>
+
+This is another way to pass I<params> to L<dpkg-deb(1)>.
+It is deprecated; use B<--> instead.
+
 =item B<-l>I<directory>[:directory:directory:..]
 
 With recent versions of dpkg-shlibdeps, this option is generally not
diff --git a/doc/TODO b/doc/TODO
index ec379968..89469c96 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -32,3 +32,4 @@ Deprecated:
   that pass unknown options to commands are fixed.
 * dh_desktop, dh_scrollkeeper. Remove eventually..
 * -s flag, not formally deprecated yet; remove eventually
+* -u flag; add a warning on use and remove eventually