Author: ryan52-guest
Date: 2009-08-30 05:07:29 +0000 (Sun, 30 Aug 2009)
New Revision: 1976
Modified:
trunk/debian/changelog
trunk/scripts/debchange.pl
Log:
remove NMU version when -i is ran without -n or auto nmu (Closes:
487323)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-08-30 04:39:55 UTC (rev 1975)
+++ trunk/debian/changelog 2009-08-30 05:07:29 UTC (rev 1976)
@@ -54,8 +54,10 @@
source package name (Closes: #515885)
* debcheckout: use bzr+ssh instead of sftp, thanks to Colin Watson for
the patch (Closes: #526068)
+ * remove NMU version when -i is ran without -n or auto nmu (Closes:
+ 487323)
- -- Ryan Niebur <[email protected]> Sat, 29 Aug 2009 21:39:38 -0700
+ -- Ryan Niebur <[email protected]> Sat, 29 Aug 2009 22:07:02 -0700
devscripts (2.10.53) unstable; urgency=low
Modified: trunk/scripts/debchange.pl
===================================================================
--- trunk/scripts/debchange.pl 2009-08-30 04:39:55 UTC (rev 1975)
+++ trunk/scripts/debchange.pl 2009-08-30 05:07:29 UTC (rev 1976)
@@ -1049,6 +1049,17 @@
}
}
+ if(! ($opt_s or $opt_n)) {
+ if ($start =~/(.*?)-(\d+)\.$/) {
+ # Drop NMU revision
+ my $upstream_version = $1;
+ my $debian_revision = $2;
+ $debian_revision++;
+ $start = "$upstream_version-$debian_revision";
+ $end = "";
+ }
+ }
+
if (! ($opt_qa or $opt_bpo or $opt_l)) {
$useextra = 1;
}
--
To unsubscribe, send mail to [email protected].
