r1747: * dh_md5sums: Don't pass "." to find, so results don't have ./ prepended,

    which broke exclusion of conffiles. Thanks, Damir Dzeko
    (note: this was broken in version 4.1.22)

diff --git a/debian/changelog b/debian/changelog
index 3e23321b14439da858388c4a309704c60d4fa786..42615897f25d87b574a943a0ea678e130b4b1139 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ debhelper (4.2.33) UNRELEASED; urgency=low
     update-modules to indicate /etc/modules.conf is not automatically
     generated, we can ignore that return code since it's not a condition that
     should fail an installation. Closes: #165400
+  * dh_md5sums: Don't pass "." to find, so results don't have ./ prepended,
+    which broke exclusion of conffiles. Thanks, Damir Dzeko
+    (note: this was broken in version 4.1.22)
 
  -- Joey Hess <joeyh@debian.org>  Sat,  9 Apr 2005 17:27:12 -0400
 

diff --git a/dh_md5sums b/dh_md5sums
index 0619a3bae2337063f5bce1df6942d8c7a6782bb1..91c217e20ad8a66b3211b6e46b9113e0a9a59186 100755 (executable)
--- a/dh_md5sums
+++ b/dh_md5sums
@@ -73,7 +73,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }
        
        my $olddir=getcwd();
-       complex_doit("cd $tmp >/dev/null ; find . -type f $exclude ! -regex '.*/DEBIAN/.*' -printf '%P\\0' | xargs -r0 md5sum > DEBIAN/md5sums ; cd '$olddir' >/dev/null");
+       complex_doit("cd $tmp >/dev/null ; find -type f $exclude ! -regex '.*/DEBIAN/.*' -printf '%P\\0' | xargs -r0 md5sum > DEBIAN/md5sums ; cd '$olddir' >/dev/null");
        # If the file's empty, no reason to waste inodes on it.
        if (-z "$tmp/DEBIAN/md5sums") {
                doit("rm","-f","$tmp/DEBIAN/md5sums");