Author: adam-guest
Date: 2008-03-15 23:15:14 +0000 (Sat, 15 Mar 2008)
New Revision: 1147
Modified:
trunk/debian/changelog
trunk/scripts/debchange.pl
Log:
+ Modify the version-handling code to generate NMU versions of the
for X+nmu1 for Debian-native packages
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-15 20:27:56 UTC (rev 1146)
+++ trunk/debian/changelog 2008-03-15 23:15:14 UTC (rev 1147)
@@ -19,6 +19,8 @@
--force-bad-version but allows a regular expression to be specified
which the new version must match. Based on a patch by Frank Küster
(Closes: #381159)
+ + Modify the version-handling code to generate NMU versions of the
+ for X+nmu1 for Debian-native packages
* checkbashisms:
+ Use Getopt::Long for option parsing
+ Add an option to force checking of scripts that would normally be
Modified: trunk/scripts/debchange.pl
===================================================================
--- trunk/scripts/debchange.pl 2008-03-15 20:27:56 UTC (rev 1146)
+++ trunk/scripts/debchange.pl 2008-03-15 23:15:14 UTC (rev 1147)
@@ -891,10 +891,18 @@
my $start=$1;
# If it's not already an NMU make it so
# otherwise we can be safe if we behave like dch -i
- if (($opt_n or $opt_s) and (not $start =~ /\.$/ or $VERSION eq
$UVERSION)) {
+
+ if (($opt_n or $opt_s) and (
+ ($VERSION eq $UVERSION and not $start =~ /\+nmu/)
+ or ($VERSION ne $UVERSION and not $start =~ /\.$/))) {
+
if ($VERSION eq $UVERSION) {
# First NMU of a Debian native package
- $end .= "-0.1";
+ if ($opt_n) {
+ $end .= "+nmu1";
+ } else {
+ $end .= "-0.1";
+ }
} else {
$end += 0.1;
}
--
To unsubscribe, send mail to [EMAIL PROTECTED]
