Add .cvsignore to dpkg-source's default diff ignore regex. Also fix

missing \ escape for .deps.

diff --git a/ChangeLog b/ChangeLog
index ebd5cbcf1c9b79f318bb0bf0af244b56fdf7e44f..af03a04d46a0afed676e320a15d32283dea8d3f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 13 16:26:36 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-source.pl: Add .cvsignore to dpkg-source's default diff
+    ignore regex.  Also fix missing \ escape for .deps.
+
 Sat Sep 13 16:16:52 CDT 2003 Adam Heath <doogie@debian.org>
 
   * main/remove.c: Retry removing empty dirs during purge.

diff --git a/debian/changelog b/debian/changelog
index 8c3b8be81bb89f7b6b9446dfb183135d5bdf8357..43d2a087fcfececbb858a8f0f3501c853c879625 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ dpkg (1.10.11) unstable; urgency=low
     #179385
   * Anthony Towns <aj@azure.humbug.org.au>:
     Retry removing empty dirs during purge.  Closes: #112386
+  * Darren Salt <linux@youmustbejoking.demon.co.uk>:
+    Add .cvsignore to dpkg-source's default diff ignore regex.  Also fix
+    missing \ escape for .deps.  Closes: #174013
 
  -- Wichert Akkerman <debian@extern.wiggy.net>  UNRELEASED
 

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 57b47f307c8debc09bcc422cfb849f91f103949a..5b4eb3e565ccd016ea3d9bfbf5831b0eae6b7d1d 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -8,7 +8,7 @@ my %dirincluded;
 my %notfileobject;
 my $fn;
 
-$diff_ignore_default_regexp = '(?:^|/).*~$|(?:^|/)\..*\.swp|DEADJOE|(?:/CVS|/RCS|/.deps)(?:$|/.*$)';
+$diff_ignore_default_regexp = '(?:^|/).*~$|(?:^|/)\..*\.swp|DEADJOE|\.cvsignore|(?:/CVS|/RCS|/\.deps)(?:$|/.*$)';
 
 $sourcestyle = 'X';
 $dscformat = "1.0";