Merge v1_9_10 with HEAD.

ChangeLog

@@ -1,3 +1,13 @@
+Sat Jun 16 18:52:17 CDT 2001 Adam Heath <doogie@debian.org>
+
+  * Merge changes from v1_9_10 tag:
+    + scripts/update-alternatives.pl: Fix switching to auto mode if
+      alternative symlink goes missing.
+    + scripts/dpkg-source.pl: s/DEAD_JOE/DEADJOE/
+    + scripts/dpkg-divert.pl: Fix cleanup of devert.tmp files.
+    + scripts/dpkg-checkbuilddeps.pl: Fix [arch] parsing, and handle
+      more variations of spaces.
+
 Sat Jun 16 22:04:04 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * po/es.po: Updated

debian/changelog

@@ -4,7 +4,22 @@ dpkg (1.10) unstable; urgency=low
     (and 3 others).
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
- 
+
+dpkg (1.9.10) unstable; urgency=low
+
+  * Fix [arch] parsing, and handle extra spaces better.  Closes: #100512,
+    #101031.
+  * Apply patch from bug, to fix cleanup of dpkg-divert temp files.
+    Closes: #100474.
+  * Swap j/k keys on the main menu, so they function like the package
+    selection screen(and like vi).  Closes: #100502.
+  * Multiple fixes in bug: Closes: #99892.
+    * s/DEAD_JOE/DEADJOE/ in dpkg-source.
+    * Switch to auto mode if alternative symlink is missing.
+  * Update Spanish translation
+
+ -- Adam Heath <doogie@debian.org>  Sat, 16 Jun 2001 14:57:45 -0500
+
 dpkg (1.9.9) unstable; urgency=low
 
   * The leading and trailing spaces patch in the last upload had some

scripts/dpkg-checkbuilddeps.pl

@@ -128,7 +128,7 @@ sub check_line {
 		my $ok=0;
 		my @possibles=();
 ALTERNATE:	foreach my $alternate (split(/\s*\|\s*/, $dep)) {
-			my ($package, $rest)=split(/\s*(?=\()/, $alternate, 2);
+			my ($package, $rest)=split(/\s*(?=[[(])/, $alternate, 2);
 	
 			# Check arch specifications.
 			if (defined $rest && $rest=~m/\[(.*?)\]/) {
@@ -161,7 +161,7 @@ ALTERNATE:	foreach my $alternate (split(/\s*\|\s*/, $dep)) {
 			push @possibles, $alternate;
 	
 			# Check version.
-			if (defined $rest && $rest=~m/\((..)\s*(.*?)\)/) {
+			if (defined $rest && $rest=~m/\(\s*([<>=]{1,2})\s*(.*?)\s*\)/) {
 				my $relation=$1;
 				my $version=$2;
 				

scripts/dpkg-divert.pl

@@ -220,13 +220,13 @@ sub checkrename {
     # (hopefully) wont overwrite anything. If it succeeds, we
     # assume a writable filesystem.
     foreach $file ($rsrc,$rdest) {
-	open (TMP, ">> ${file}.dpkg-devert.tmp") || $! == ENOENT ||
-		&quit("error checking \`$file': $!");
-	if ($!) {
-		$dorename = !$dorename;
-	} else {
+	if (open (TMP, ">> ${file}.dpkg-devert.tmp")) {
 		close TMP;
 		unlink ("${file}.dpkg-devert.tmp");
+	} elsif ($! == ENOENT) {
+		$dorename = !$dorename;
+	} else {
+		&quit("error checking \`$file': $!");
 	}
     }
     if (@ssrc && @sdest &&

scripts/dpkg-source.pl

@@ -8,7 +8,7 @@ my %dirincluded;
 my %notfileobject;
 my $fn;
 
-$diff_ignore_default_regexp = '^.*~$|^\..*\.swp|DEAD_JOE|(?:/CVS|/RCS|/.deps)(?:$|/.*$)';
+$diff_ignore_default_regexp = '^.*~$|^\..*\.swp|DEADJOE|(?:/CVS|/RCS|/.deps)(?:$|/.*$)';
 
 $sourcestyle = 'X';
 $dscformat = "1.0";

scripts/update-alternatives.pl

@@ -239,10 +239,10 @@ if ($mode eq 'auto') {
     $state= 'nonexistent';
     $manual= 'auto';
 } elsif ($state eq 'nonexistent') {
-    if ($mode eq 'manual') {
+    if ($manual eq 'manual') {
         &pr("$altdir/$name has been deleted, returning to automatic selection.")
           if $verbosemode > 0;
-        $mode= 'auto';
+        $manual= 'auto';
     }
 }