The following commit has been merged in the master branch: commit da0538290b7dbbfb3c537441470767fd0879c985 Author: Guillem Jover <guil...@debian.org> Date: Sun May 3 14:07:00 2009 +0200
Add '.hgtags' to the default dpkg-source -i regex and -I pattern Closes: #525854 diff --git a/debian/changelog b/debian/changelog index ea9597e..624d26c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,6 +74,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low * Detect the curses headers to use instead of hardcoding them. * Make dpkg-source do not set arch:any in .dsc on arch-restricted packages. Thanks to Philipp Kern <pk...@debian.org>. Closes: #526617 + * Add '.hgtags' to the default dpkg-source -i regex and -I pattern. + Closes: #525854 [ Frank Lichtenheld ] * Dpkg::Version: Remove unnecessary function next_elem which just diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm index d29294b..64f7fb4 100644 --- a/scripts/Dpkg/Source/Package.pm +++ b/scripts/Dpkg/Source/Package.pm @@ -48,7 +48,7 @@ our $diff_ignore_default_regexp = ' # File-names that should be ignored (never directories) (?:^|/)(?: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| +(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg(?:tags)?|_darcs|\.git| \.shelf|_MTN|\.be|\.bzr(?:\.backup|tags)?)(?:$|/.*$) '; # Take out comments and newlines @@ -77,6 +77,7 @@ our @tar_ignore_default_pattern = qw( .gitignore .hg .hgignore +.hgtags .shelf .svn CVS -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org