From f9d4d3f62cdb273d6bf75ce9c54a6a1713db8e73 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 9 Jun 2008 06:11:12 +0300 Subject: [PATCH] dpkg-source: Add '.hgignore' to the default -i regex and -I pattern Closes: #485365 --- ChangeLog | 6 ++++++ debian/changelog | 2 ++ scripts/Dpkg/Source/Package.pm | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fd000d02..7dbade8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-09 Guillem Jover + + * scripts/Dpkg/Source/Package.pm ($diff_ignore_default_regexp): Add + '.hgignore'. + (@tar_ignore_default_pattern): Likewise. + 2008-06-09 Guillem Jover * src/query.c (searchfiles): Use VARBUF_INIT to initialize path diff --git a/debian/changelog b/debian/changelog index d07c995e..cc6233ea 100644 --- 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 4c253a73..f9d7fe99 100644 --- 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 -- 2.39.5