Просмотр исходного кода

Add .cvsignore to dpkg-source's default diff ignore regex. Also fix
missing \ escape for .deps.

Adam Heath лет назад: 23
Родитель
Сommit
a55cdcc755
3 измененных файлов с 9 добавлено и 1 удалено
  1. 5 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 1 1
      scripts/dpkg-source.pl

+ 5 - 0
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.

+ 3 - 0
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
 

+ 1 - 1
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";