Explorar el Código

Make dpkg-source work on empty diffs

Wichert Akkerman hace 27 años
padre
commit
938eb2f87c
Se han modificado 3 ficheros con 18 adiciones y 4 borrados
  1. 5 0
      ChangeLog
  2. 9 0
      debian/changelog
  3. 4 4
      scripts/dpkg-source.pl

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Tue Sep 28 13:38:50 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Make dpkg-source work again on empty diffs, patch from Roman Hodek
+    <Roman.Hodek@informatik.uni-erlangen.de>
+
 Tue Sep 28 01:14:14 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Fix typo in dpkg-buildpackage that broke signing if only -sgpg was given

+ 9 - 0
debian/changelog

@@ -1,3 +1,12 @@
+dpkg (1.4.1.13) unstable; urgency=low
+
+  * Non-maintainer release.
+  * NMU number 13, lets see what breaks :)
+  * update-alternatives works across filesystems now
+  * Make -sgpg work in dpkg-buildpackage (typo)
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Tue, 28 Sep 1999 01:26:19 +0200
+
 dpkg (1.4.1.12) unstable; urgency=low
 
   * Non-maintainer release.

+ 4 - 4
scripts/dpkg-source.pl

@@ -511,7 +511,7 @@ if ($opmode eq 'build') {
         &forkgzipread("$dscdir/$difffile");
         $/="\n";
 	$_ = <GZIP>;
-	do {
+        while ($_ || !eof(GZIP)) {
 	    # read file header (---/+++ pair)
 	    s/\n$// or &error("diff is missing trailing newline");
 	    /^--- / or &error("expected ^--- in line $. of diff");
@@ -550,10 +550,10 @@ if ($opmode eq 'build') {
 		    elsif (/^-/) { --$olines; }
 		    elsif (/^\+/) { --$nlines; }
 		    else { &error("expected [ +-] at start of line $. of diff"); }
-            }
-        }
+		}
+	    }
 	    $hunk or &error("expected ^\@\@ at line $. of diff");
-        } while ($_ || !eof(GZIP));
+        }
         close(GZIP);
         
         &reapgzip;