The following commit has been merged in the master branch:
commit 7629c60a6b79f5ea02f8e6ec313dd6c5092f2b38
Author: James Vega <[email protected]>
Date: Sat Apr 3 19:37:54 2010 -0400
debchange: Treat trailing '+' like trailing '~' for `dch -i'
Closes: #521642
diff --git a/debian/changelog b/debian/changelog
index 48073e4..35d80e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,11 @@ devscripts (2.10.62) UNRELEASED; urgency=low
(Closes: #569062)
* Update descriptions of debcommit to include darcs as a supported VCS.
(Closes: #570138)
- * debchange: Add maverick as a valid distribution. Thanks to Benjamin Drung
- for the patch. (Closes: #576287)
+ * debchange:
+ + Add maverick as a valid distribution. Thanks to Benjamin Drung for the
+ patch. (Closes: #576287)
+ + Treat a trailing '+' like a trailing '~' when incrementing the version
+ number. (Closes: #521642)
* debuild: Expose two new variables (epoch-less source version, and upstream
version) to hooks. Thanks to gregor herrmann for the patch. (Closes:
573092)
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index fe461d5..b0fc8bf 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -995,7 +995,7 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_s ||
$opt_bpo || $opt_l || $
# including epochs.
if (! $NEW_VERSION) {
- if ($VERSION =~ /(.*?)([a-yA-Y][a-zA-Z]*|\d+)(~)?$/i) {
+ if ($VERSION =~ /(.*?)([a-yA-Y][a-zA-Z]*|\d+)([+~])?$/i) {
my $extra=$3 || '';
my $useextra = 0;
my $end=$2;
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
