r486: * Clean up old substvars.debhelper files, although debhelper doesn't

     generate them now, it used to and they may still be lurking in build
     trees. Closes: #106514
   * Fixed a typo. Closes: #106532

diff --git a/debian/changelog b/debian/changelog
index 1f988befdf474b17e7ad33e24ccae8375d8118c4..a569e78d1313b1898f4df3c5c20957007ae1cd64 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (3.0.41) unstable; urgency=low
+
+  * Clean up old substvars.debhelper files, although debhelper doesn't
+    generate them now, it used to and they may still be lurking in build
+    trees. Closes: #106514
+  * Fixed a typo. Closes: #106532
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 25 Jul 2001 17:04:21 -0400
+
 debhelper (3.0.40) unstable; urgency=low
 
   * Typo, Closes: #104405

diff --git a/debian/control b/debian/control
index 9516be33af495094a56b5b78f9484c7327a36721..2f9d0bbf62d13c5d2e3b66861cdfb464d54b6e2c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: debhelper
 Section: devel
 Priority: optional
 Maintainer: Joey Hess <joeyh@debian.org>
-Build-Depends-Indep: perl-5.6, fileutils (>= 4.0-2.1), file (>= 3.23-1), debconf-utils
-Standards-Version: 3.5.5.0
+Build-Depends-Indep: perl, fileutils (>= 4.0-2.1), file (>= 3.23-1), debconf-utils
+Standards-Version: 3.2.1.0
 
 Package: debhelper
 Architecture: all

diff --git a/dh_clean b/dh_clean
index d86743a5ab775ea614ded0b112832902d8fccc70..570179b9573e969bf5b6d28b441cefd2f4755897 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -63,6 +63,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
        if (! $dh{D_FLAG}) {
                doit("rm","-f","debian/${ext}substvars",
+                       "debian/${ext}substvars.debhelper",
                        "debian/${ext}postinst.debhelper",
                        "debian/${ext}postrm.debhelper",
                        "debian/${ext}preinst.debhelper",

diff --git a/dh_movefiles b/dh_movefiles
index 18e46d4d8c9f3b85491f287a97e591b26cac5af8..b4e1a6f6315d94a3b7fe55abc619fa5970cc8aa6 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -91,7 +91,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }
 
        if (@tomove && $tmp eq $sourcedir) {
-               error("I was asked to move files from $sourcedir to $sourcedir. Perhaps you should set DH_COMAPT=2?");
+               error("I was asked to move files from $sourcedir to $sourcedir. Perhaps you should set DH_COMPAT=2?");
        }
 
        # Now we need to expand wildcards in @tomove.