[SCM] Debian package checker branch, master, updated. 2.2.8-19-g45597f1

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit b303d5d607c99b1e8c34814114e862a06d7cdeae
Author: Russ Allbery <rra@debian.org>
Date:   Fri Apr 3 10:54:33 2009 -0700

    Add changelog for variable diversions
    
    Also fix some minor coding style whitespace bits.

diff --git a/checks/scripts b/checks/scripts
index 9542b78..c51883a 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -936,20 +936,20 @@ if ($expand_diversions) {
 
 	# find the widest regex:
 	my @matches = grep {
-		    my $lrx = $_;
-		    my $l = $lrx;
-		    $l =~ s/\\//g;
-
-		    if ($wider =~ m/^$lrx$/) {
-			$widerrx = $lrx;
-			$wider = $l;
-			1;
-		    } elsif ($l =~ m/^$widerrx$/) {
-			1;
-		    } else {
-			0;
-		    }
-		} (keys %removed_diversions, keys %added_diversions);
+	    my $lrx = $_;
+	    my $l = $lrx;
+	    $l =~ s/\\//g;
+
+	    if ($wider =~ m/^$lrx$/) {
+		$widerrx = $lrx;
+		$wider = $l;
+		1;
+	    } elsif ($l =~ m/^$widerrx$/) {
+		1;
+	    } else {
+		0;
+	    }
+	} (keys %removed_diversions, keys %added_diversions);
 
 	# replace all the occurences with the widest regex:
 	for my $k (@matches) {
@@ -968,7 +968,6 @@ if ($expand_diversions) {
 }
 
 for my $divert (keys %removed_diversions) {
-
     if (exists $added_diversions{$divert}) {
 	# just mark the entry, because a --remove might
 	# happen in two branches in the script, i.e. we
@@ -1011,6 +1010,7 @@ for my $divert (keys %added_diversions) {
 	tag 'orphaned-diversion', $divert, $script;
     }
 }
+
 }
 
 # -----------------------------------
diff --git a/debian/changelog b/debian/changelog
index 50c8b86..f7d8a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ lintian (2.2.9) UNRELEASED; urgency=low
     + [RA] Fix a hash collision that could suppress a correct
       remove-of-unknown-diversion tag if the diversion was removed in
       multiple maintainer scripts including postrm.
+    + [RA] Handle variables in maintainer scripts when adding and removing
+      diversions.  Patch from Raphael Geissert.  (Closes: #519268)
   * checks/shared-libs:
     + [RA] Correctly handle SONAMEs in symbols files that contain regex
       metacharacters like +.  Thanks, Daniel Kobras.  (Closes: #521621)

-- 
Debian package checker