From 938eb2f87c8b93f1fa00f73a387f71790a58438e Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Wed, 29 Sep 1999 03:36:29 +0000 Subject: [PATCH] Make dpkg-source work on empty diffs --- ChangeLog | 5 +++++ debian/changelog | 9 +++++++++ scripts/dpkg-source.pl | 8 ++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0caefc3..a2821b77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Sep 28 13:38:50 CEST 1999 Wichert Akkerman + + * Make dpkg-source work again on empty diffs, patch from Roman Hodek + + Tue Sep 28 01:14:14 CEST 1999 Wichert Akkerman * Fix typo in dpkg-buildpackage that broke signing if only -sgpg was given diff --git a/debian/changelog b/debian/changelog index 44a42beb..9f58a66c 100644 --- a/debian/changelog +++ b/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 Tue, 28 Sep 1999 01:26:19 +0200 + dpkg (1.4.1.12) unstable; urgency=low * Non-maintainer release. diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 6a1b269f..5544d734 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -511,7 +511,7 @@ if ($opmode eq 'build') { &forkgzipread("$dscdir/$difffile"); $/="\n"; $_ = ; - 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; -- 2.39.5