Author: ryan52-guest Date: 2009-08-30 04:36:28 +0000 (Sun, 30 Aug 2009) New Revision: 1974
Modified: trunk/debian/changelog trunk/scripts/debchange.1 trunk/scripts/debchange.pl Log: debchange: add support for using --package with -i to change the source package name (Closes: #515885) Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-08-28 06:33:52 UTC (rev 1973) +++ trunk/debian/changelog 2009-08-30 04:36:28 UTC (rev 1974) @@ -50,8 +50,10 @@ [ Ryan Niebur ] * uscan: add --download-current-version option (Closes: #539724) * Add myself to Uploaders + * debchange: add support for using --package with -i to change the + source package name (Closes: #515885) - -- Ryan Niebur <[email protected]> Thu, 27 Aug 2009 23:27:32 -0700 + -- Ryan Niebur <[email protected]> Sat, 29 Aug 2009 21:35:02 -0700 devscripts (2.10.53) unstable; urgency=low Modified: trunk/scripts/debchange.1 =================================================================== --- trunk/scripts/debchange.1 2009-08-28 06:33:52 UTC (rev 1973) +++ trunk/scripts/debchange.1 2009-08-30 04:36:28 UTC (rev 1974) @@ -204,7 +204,8 @@ .TP \fB\-\-package\fR \fIpackage\fR This specifies the package name to be used in the new changelog; this -may only be used in conjunction with the \fB\-\-create\fR option. +may only be used in conjunction with the \fB\-\-create\fR and +\fB\-\-increment\fR options. .TP .BR \-\-nmu ", " \-n Increment the Debian release number for a non-maintainer upload by Modified: trunk/scripts/debchange.pl =================================================================== --- trunk/scripts/debchange.pl 2009-08-28 06:33:52 UTC (rev 1973) +++ trunk/scripts/debchange.pl 2009-08-30 04:36:28 UTC (rev 1974) @@ -417,10 +417,11 @@ fatal "--closes should not be used with --news; put bug numbers in the changelog not the NEWS file" if $opt_news && @closes; - -fatal "--package can only be used with --create" - if $opt_package && ! $opt_create; +# hm, this can probably be used with more than just -i. +fatal "--package can only be used with --create and --increment" + if $opt_package && ! ($opt_create || $opt_i); + my $changelog_path = $opt_c || $ENV{'CHANGELOG'} || 'debian/changelog'; my $real_changelog_path = $changelog_path; if ($opt_news) { $changelog_path = $opt_news; } @@ -615,14 +616,6 @@ # don't know anything } } - if ($opt_package) { - if ($opt_package =~ m/^[a-z0-9][a-z0-9+\-\.]+$/) { - $PACKAGE=$opt_package; - } else { - warn "$progname warning: illegal package name used with --package: $opt_package\n"; - $warnings++; - } - } if ($opt_v) { $VERSION=$opt_v; } @@ -631,6 +624,15 @@ } } +if ($opt_package) { + if ($opt_package =~ m/^[a-z0-9][a-z0-9+\-\.]+$/) { + $PACKAGE=$opt_package; + } else { + warn "$progname warning: illegal package name used with --package: $opt_package\n"; + $warnings++; + } +} + # Clean up after old versions of debchange if (-f "debian/RELEASED") { unlink("debian/RELEASED"); -- To unsubscribe, send mail to [email protected].
