summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--debian/changelog1
-rwxr-xr-xscripts/dpkg-source.pl2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bfaad72a..82bcdaf7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-20 Guillem Jover <guillem@debian.org>
+
+ * scripts/dpkg-source.pl ($diff_ignore_default_regexp): Add '.hg'.
+
2007-03-13 Guillem Jover <guillem@debian.org>
* scripts/controllib.pl (parsechangelog): Only binmode CDATA from the
diff --git a/debian/changelog b/debian/changelog
index 0818c3d61..87df913d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ dpkg (1.14.0) UNRELEASED; urgency=low
Thanks to Frank Lichtenheld.
* Add '.gitignore' to the default dpkg-source -i regex. Closes: #409566
Thanks to Julien Cristau.
+ * Add '.hg' to the default dpkg-source -i regex. Closes: #414794
* Use l10n-friendlier strings to describe dependencies. Closes: #390916
Thanks to Ian Jackson.
* Change priority for dpkg-dev from standard to optional to match the
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index d4dd94855..69b150f4b 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -20,7 +20,7 @@ $diff_ignore_default_regexp = '
# File-names that should be ignored (never directories)
(?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore|\.gitignore)$|
# File or directory names that should be ignored
-(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|_darcs|\.git|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
+(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
';
# Take out comments and newlines