Let dpkg-source ignore comments in the hunk header as used by

diff -p (Anand Kumria). Closes: #344880

diff --git a/ChangeLog b/ChangeLog
index 6ed025c860ca1718cbb8c711f15fba6cde01643e..59e9276b1ea91afef280791d24a6ed9ab6bd9f61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-29  Anand Kumria  <wildfire@progsoc.org>
+
+       * scripts/dpkg-source.pl (checkdiff): Ignore comments
+       hunk header line as used by diff -p.
+
 2006-01-29  Guillem Jover  <guillem@debian.org>
 
        * utils/start-stop-daemon.c (do_help): Print the proper version giving

diff --git a/debian/changelog b/debian/changelog
index e8786453a3eb7cf4cad066a59772fac1b8ffb559..f063c0743723357d42954f2660b3725ef00f4fcc 100644 (file)
--- 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 <guillem@debian.org>  Sun, 29 Jan 2006 06:02:58 +0200
 

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 5641c1d2d2fb8bb219047840f62bb99162b1a6a5..8b216d27849deea0bc0a80b2116c93e47cecf43d 100755 (executable)
--- 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;