dpkg-source: Add '.hgignore' to the default -i regex and -I pattern

Closes: #485365

diff --git a/ChangeLog b/ChangeLog
index fd000d02d9406eb9b3fec3c4d7ef41014fe07dae..7dbade8b042da8f3fc245c2b59b656011f25cb01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-09  Guillem Jover  <guillem@debian.org>
+
+       * scripts/Dpkg/Source/Package.pm ($diff_ignore_default_regexp): Add
+       '.hgignore'.
+       (@tar_ignore_default_pattern): Likewise.
+
 2008-06-09  Guillem Jover  <guillem@debian.org>
 
        * src/query.c (searchfiles): Use VARBUF_INIT to initialize path

diff --git a/debian/changelog b/debian/changelog
index d07c995e66e8896f414940c9655454e65040f9c2..cc6233ea002386942b77285644fe72814f41630f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
   * Replace realloc plus error checking usage with m_realloc.
   * Close --status-fd file descriptors on exec, so that they are not
     inherited by the childs. Closes: #471488
+  * Add '.hgignore' to the default dpkg-source -i regex and -I pattern.
+    Closes: #485365
 
   [ Raphael Hertzog ]
   * Enhance dpkg-shlibdeps's error message when a library can't be found to

diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index 4c253a7317ef448e89b05afab8d9ecb627a6e966..f9d7fe9951865b5ad6ec42e6975c3d09d4dfcbfd 100644 (file)
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -44,7 +44,7 @@ our $diff_ignore_default_regexp = '
 # Ignore baz-style junk files or directories
 (?:^|/),,.*(?:$|/.*$)|
 # File-names that should be ignored (never directories)
-(?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore|\.gitignore)$|
+(?:^|/)(?:DEADJOE|\.arch-inventory|\.(?:bzr|cvs|hg|git)ignore)$|
 # File or directory names that should be ignored
 (?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git|
 \.shelf|_MTN|\.be|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
@@ -74,6 +74,7 @@ our @tar_ignore_default_pattern = qw(
 .git
 .gitignore
 .hg
+.hgignore
 .shelf
 .svn
 CVS