From a099d1b237018d05ba677d860761903a5d8006a3 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sun, 29 Jan 2006 15:06:52 +0000 Subject: [PATCH] Let dpkg-source ignore comments in the hunk header as used by diff -p (Anand Kumria). Closes: #344880 --- ChangeLog | 5 +++++ debian/changelog | 4 ++++ scripts/dpkg-source.pl | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6ed025c8..59e9276b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-29 Anand Kumria + + * scripts/dpkg-source.pl (checkdiff): Ignore comments + hunk header line as used by diff -p. + 2006-01-29 Guillem Jover * utils/start-stop-daemon.c (do_help): Print the proper version giving diff --git a/debian/changelog b/debian/changelog index e8786453..f063c074 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ dpkg (1.13.14~) UNRELEASED; urgency=low [ Guillem Jover ] * Make start-stop-daemon print the proper version instead of 'VERSION'. + + [ Frank Lichtenheld ] + * Let dpkg-source ignore comments in the hunk header as used by + diff -p (Anand Kumria). Closes: #344880 -- Guillem Jover Sun, 29 Jan 2006 06:02:58 +0200 diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 5641c1d2..8b216d27 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -1130,7 +1130,7 @@ sub checkdiff # read hunk header (@@) s/\n$// or &error("diff `$diff' is missing trailing newline"); next if /^\\ No newline/; - /^@@ -\d+(,(\d+))? \+\d+(,(\d+))? @\@$/ or + /^@@ -\d+(,(\d+))? \+\d+(,(\d+))? @\@ .*$/ or &error("Expected ^\@\@ in line $. of diff `$diff'"); my ($olines, $nlines) = ($1 ? $2 : 1, $3 ? $4 : 1); ++$hunk; -- 2.39.5