From 2f98cb7f73a2558cf5c1d8b044ec724f8193135c Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Mon, 23 Jan 2006 12:39:52 +0000 Subject: [PATCH] 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 ~. --- ChangeLog | 4 ++++ debian/changelog | 2 ++ scripts/dpkg-source.pl | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c62fc32..c858932b 100644 --- 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 Support for architecture wildcards. diff --git a/debian/changelog b/debian/changelog index 12e5d210..b18c2c8c 100644 --- 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 0b8e9dd6..5641c1d2 100755 --- 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; -- 2.39.5