[debsums] 162/184: Prepare NMU to fix #744398

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository debsums.

commit 9a2203f65175d991a067c1755ca6ade4593bebc4
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu May 29 17:35:52 2014 +0200

    Prepare NMU to fix #744398
---
 debian/changelog | 8 ++++++++
 debsums          | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9cda487..678505c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debsums (2.0.52+nmu2) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Suppress reporting conffiles which were moved to a new package as
+    modified in the old package. (Closes: #744398)
+
+ -- Axel Beckert <abe at debian.org>  Thu, 29 May 2014 19:50:48 +0200
+
 debsums (2.0.52+nmu1) unstable; urgency=low
 
   * Non-maintainer upload
diff --git a/debsums b/debsums
index 9319f27..edea289 100755
--- a/debsums
+++ b/debsums
@@ -462,6 +462,13 @@ sub is_localepurge_file {
 	    return 0;
 	}
 
+	my $correct_package = `dpkg-query "--admindir=$DPKG" -S "$path" | awk -F: '{print \$1}'`;
+	chomp($correct_package);
+	if ($pack ne $correct_package) {
+	    #print "$pack != $correct_package\n";
+	    return 0;
+	}
+
 	if ($changed)
 	{
 	    print $root, "/", $path, "\n";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/debsums.git