dpkg-source: Don't use \b to match the end

of the version in filenames, use (?=[.-]) and (?=\.) instead.
\b doesn't work in case the version ends with ~.

diff --git a/ChangeLog b/ChangeLog
index 9c62fc326c64ae0aee844673e049e0f6a90f000e..c858932bc3c38d51bc79e9cf53472ab29ed1434b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
        not necessarily available for biarch builds). Instead
        build an own representation of the search patch.
 
+       * scripts/dpkg-source.pl: Don't use \b to match the end
+       of the version in filenames, use (?=[.-]) and (?=\.) instead.
+       \b doesn't work in case the version ends with ~.
+
 2006-01-23  Guillem Jover  <guillem@debian.org>
 
        Support for architecture wildcards.

diff --git a/debian/changelog b/debian/changelog
index 12e5d210e73e07d5c243622e0a2530cf83f8df9e..b18c2c8cd310c713d49042f52b6bd1ac4b053c10 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ dpkg (1.13.12~) unstable; urgency=low
     Closes: #332826
   * Let dpkg-source -b warn about special permissions of files added
     in the diff since these will get lost. Closes: #306125
+  * dpkg-source -x didn't work in case the upstream version or
+    the Debian version ended with ~. Fixed.
 
   [ Christian Perrier ]
   * Updated Translations:

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 0b8e9dd664d63d11b57e37568eb2b20b480657eb..5641c1d2d2fb8bb219047840f62bb99162b1a6a5 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -624,9 +624,9 @@ if ($opmode eq 'build') {
        local $_ = $file;
 
        &error("Files field contains invalid filename `$file'")
-           unless s/^\Q$sourcepackage\E_\Q$baseversion\E\b// and
+           unless s/^\Q$sourcepackage\E_\Q$baseversion\E(?=[.-])// and
                   s/\.(gz|bz2)$//;
-       s/^-\Q$revision\E\b// if length $revision;
+       s/^-\Q$revision\E(?=\.)// if length $revision;
 
        &error("repeated file type - files `$seen{$_}' and `$file'") if $seen{$_};
        $seen{$_} = $file;