[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

pu: debsums 2.0.52+deb7u1



Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

On Sonntag, 1. Juni 2014, Holger Levsen wrote:
> debsums is seriously broken in stable due to #744398 and this affects
> piuparts.d.o badly, so currently I've manually+hackishly installed debsums
> from the 2.0.52+nmu2 upload on piu-slave-bm-a.d.o, where I need it.
> 
> But I (and DSA) would like to use a packaged version, so I wonder if the
> following patch would be suitable for a stable upload:
> 
> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=99;filename=744398-nmu.pa
> tch;att=1;bug=744398
> 
> Alternativly I could backport debsums and use that, but AIUI serious bugs
> in stable should be fixed there properly.

I've now prepared this and pushed this to git:

+debsums (2.0.52+deb7u1) wheezy; urgency=low
+
+  * Non-maintainer upload.
+  * Take patch from 2.0.52+nmu2 from Axel Beckert to suppress reporting
+    conffiles which were moved to a new package as modified in the old
+    package. (Closes: #744398)
+
+ -- Holger Levsen <holger@debian.org>  Mon, 02 Jun 2014 14:14:24 +0200

The diff is the same as before and is attached. 

May I upload?


cheers,
	Holger
diff --git a/debian/changelog b/debian/changelog
index 978db8e..eb66715 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debsums (2.0.52+deb7u1) wheezy; urgency=low
+
+  * Non-maintainer upload.
+  * Take patch from 2.0.52+nmu2 from Axel Beckert to suppress reporting
+    conffiles which were moved to a new package as modified in the old
+    package. (Closes: #744398)
+
+ -- Holger Levsen <holger@debian.org>  Mon, 02 Jun 2014 14:14:24 +0200
+
 debsums (2.0.52) unstable; urgency=low
 
   * Remove debsums_gen from package (Closes: #640296)
diff --git a/debsums b/debsums
index 367d0f6..efb5dc5 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";

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: