Fix removing of diversions. This has always been broken, but was just

masked by another bug, that made it work. :|

ChangeLog

@@ -1,3 +1,9 @@
+Sat Apr 28 14:31:27 CDT 2001 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-divert.pl, debian/changelog: Fix removing of diversions.
+    This has always been broken, but was just masked by another bug, that
+    made it work. :|
+
 Sat Apr 28 12:18:55 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-buildpackage.sh: only check for valid sign interface

debian/changelog

@@ -12,6 +12,7 @@ dpkg (1.9.1) unstable; urgency=low
     support package signatures.  Closes: Bug#95573
   * dpkg-buildpackage should only check for valid signinterface if the
     user specifies one. Closes: Bug#95598
+  * Fix removing of diversions.  Closes: Bug#95655
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

scripts/dpkg-divert.pl

@@ -160,6 +160,7 @@ if ($mode eq 'add') {
                    ($i < $#altname ? @altname[$i+1..$#altname] : ()));
         @package= (($i > 0 ? @package[0..$i-1] : ()),
                    ($i < $#package ? @package[$i+1..$#package] : ()));
+	$dorename = 1;
         &checkrename($orgdivertto,$orgfile);
         &dorename($orgdivertto,$orgfile);
         &save;
@@ -223,7 +224,7 @@ sub checkrename {
 		&quit("error checking \`$file': $!");
 	close TMP;
 	if ($! == ENOENT) {
-		$dorename = 0;
+		$dorename = !$dorename;
 	} else {
 		unlink ("${file}.dpkg-devert.tmp");
 	}