dh_testversion: Removed this deprecated command.

2 packages in the archive still use it, but both like this:

ifneq ($(shell dh_testversion '<<' 7.4.10 2>/dev/null && echo old),old)
dh_parallel = --parallel
endif

Happily, the way that was written, if the command doesn't exist,
it does the right thing and enables the behavior for the new debhelper.
Not that it would greatly matter if it did not, since --parallel is not
crucial.

diff --git a/debian/changelog b/debian/changelog
index 2a9fc6693c5e6469198d4fd4c2663299903a6014..fd0beb530d2733d3deb0e27769daab1867f43f63 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ debhelper (7.4.21) UNRELEASED; urgency=low
     means that libraries in unusual locations, where dpkg-gensymbols does
     not itself normally look will be passed to it, a behavior change which
     may break some packages. Closes: #557603
+  * dh_testversion: Removed this deprecated command.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 May 2010 20:01:19 -0400
 

diff --git a/dh_testversion b/dh_testversion
deleted file mode 100755 (executable)
index db411ab..0000000
--- a/dh_testversion
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_testversion - ensure that the correct version of debhelper is installed (deprecated)
-
-=cut
-
-use Debian::Debhelper::Dh_Lib;
-use Debian::Debhelper::Dh_Version; # contains the version number of debhelper.
-
-=head1 SYNOPSIS
-
-B<dh_testversion> [S<I<debhelper options>>] [I<operator>] [I<version>]
-
-=head1 DESCRIPTION
-
-Note: This program is deprecated. You should use build dependencies
-instead.
-
-dh_testversion compares the version of debhelper against the version you
-specify, and if the condition is not met, exits with an error message.
-
-You can use this in your debian/rules files if a new debhelper feature is
-introduced, and your package requires that feature to build correctly. Use
-debhelper's changelog to figure out the version you need.
-
-Be sure not to overuse dh_testversion. If debhelper version 9.5
-introduces a new dh_autofixbugs command, and your package uses it, then if
-someone tries to build it with debhelper 1.0, the build will fail anyway when
-dh_autofixbugs cannot be found, so there is no need for you to use
-dh_testversion.
-
-=head1 OPTIONS
-
-=over 4
-
-=item I<operator>
-
-Optional comparison operator used in comparing the versions. If not 
-specified, ">=" is used. For descriptions of the comparison operators, see 
-dpkg --help.
-
-=item I<version>
-
-Version number to compare against the current version of debhelper. If not
-specified, dh_testversion does nothing.
-
-=back
-
-=cut
-
-init();
-inhibit_log();
-
-my($compare, $ver);
-
-if ($#ARGV > 0) {
-       $compare=shift;
-       $ver=shift;
-}
-elsif ($#ARGV eq 0) {
-       $compare=">=";
-       $ver=shift;
-}
-
-warning("This program is deprecated, you should use build dependencies instead.");
-
-if (defined $compare and defined $ver) {
-       warning("Something like: \"Build-Depends: debhelper ($compare $ver)\"");
-       system('dpkg','--compare-versions',$Debian::Debhelper::Dh_Version::version,$compare,$ver) == 0 ||
-               error("debhelper version $Debian::Debhelper::Dh_Version::version is installed, but a version $compare $ver is needed to build this package.");
-}
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of debhelper.
-
-=head1 AUTHOR
-
-Joey Hess <joeyh@debian.org>
-
-=cut

diff --git a/doc/TODO b/doc/TODO
index 728e38eb3674c54ad34b1edad75b9c38fd6167af..3996c427e6b9789457d6b990ff20af89a47925aa 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,12 +1,8 @@
-This is the TODO for debhelper. As more and more people use debhelper, this
-list grows - I welcome patches to fix items on it!
-
 v8:
 
 * escaping in config files (for whitespace)?
 * make dh_install use hard links for efficiency (maybe?)
 * dh_installinit --restart-after-upgrade as default?
-* #487006: dh_installman with 3-letter codes
 * clean up dh's handling of options passed onto commands it calls,
   by implementing one of the changes discussed in #570039
   (either change #3, change #4, or change #5; change #0 was done, but 
@@ -25,7 +21,6 @@ Deprecated:
   though.
 * dh_suidregister. Once nothing in the archive uses it.
 * dh_installmanpages.
-* dh_testversion. Remove as soon as nothing uses it.
 * dh_movefiles. I won't hold my breath. Have not added deprecation
   docs or message yet.
 * dh_undocumented