r551: * Make addsubstvars remove old instances of line before adding new. This

     will make dh_perl get deps right for packages that have perl modules and
     XS in them.

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index e2d26b259ea2c998d39d86403a889d5bb7918d3c..3b7a51928240ceeaad5148671f6609bd686ceca3 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -439,7 +439,8 @@ sub addsubstvar {
        }
 
        if (length $line) {
-                complex_doit("echo '${substvar}=$line' >> $substvarfile");
+                complex_doit("(grep -v ${substvar} $substvarfile 2>/dev/null; echo '${substvar}=$line') > $substvarfile.new");
+                doit("mv", "$substvarfile.new", $substvarfile);
        }
 }
 

diff --git a/debian/changelog b/debian/changelog
index ad7014a7280fd7b57a608e9042ba83d0639e18c7..87cc9bd22ba54b562ec01ce96d4b20b316fecd6b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (4.1.11) unstable; urgency=low
+
+  * Make addsubstvars remove old instances of line before adding new. This
+    will make dh_perl get deps right for packages that have perl modules and
+    XS in them.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 22 Sep 2002 11:27:08 -0400
+
 debhelper (4.1.10) unstable; urgency=low
 
   * Depend on coreutils | fileutils. Closes: #161452