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.

1 files changed, 2 insertions, 1 deletions

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index e2d26b25..3b7a5192 100644
--- 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);
 	}
 }