diff options
| author | Guillem Jover <guillem@debian.org> | 2008-05-19 06:56:45 +0300 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2008-05-19 07:35:53 +0300 |
| commit | bd6306ade9ebea5eb9e009f88b85c82b21d9befc (patch) | |
| tree | 3623ac1ef2ea07859235038292b00f8dc3504c67 | |
| parent | f6440068eaa56e5a4cda8c4e4ee1c09eec13a88d (diff) | |
| download | dpkg-bd6306ade9ebea5eb9e009f88b85c82b21d9befc.tar.gz | |
Add '.be' to the default dpkg-source -i regex and -I pattern
Based on a patch by Ben Finney. Closes: #481716
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | scripts/Dpkg/Source/Package.pm | 3 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2008-05-19 Guillem Jover <guillem@debian.org> + + * scripts/Dpkg/Source/Package.pm ($diff_ignore_default_regexp): Add + '.be'. + (@tar_ignore_default_pattern): Likewise. + 2008-05-12 Guillem Jover <guillem@debian.org> * scripts/dpkg-gencontrol.pl ($package_type): Rename to ... diff --git a/debian/changelog b/debian/changelog index 200d58a81..a3744cd5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low update-alternative's verbose mode. Closes: #412487 * Refactor subprocess signal setup. * Mark and coalesce similar strings for translation. + * Add '.be' to the default dpkg-source -i regex. Closes: #481716 + Based on a patch by Ben Finney. [ 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 f086e85b7..4c253a731 100644 --- a/scripts/Dpkg/Source/Package.pm +++ b/scripts/Dpkg/Source/Package.pm @@ -47,7 +47,7 @@ our $diff_ignore_default_regexp = ' (?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore|\.gitignore)$| # File or directory names that should be ignored (?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git| -\.shelf|_MTN|\.bzr(?:\.backup|tags)?)(?:$|/.*$) +\.shelf|_MTN|\.be|\.bzr(?:\.backup|tags)?)(?:$|/.*$) '; # Take out comments and newlines $diff_ignore_default_regexp =~ s/^#.*$//mg; @@ -64,6 +64,7 @@ our @tar_ignore_default_pattern = qw( .[#~]* .arch-ids .arch-inventory +.be .bzr .bzr.backup .bzr.tags |