Author: schoenfeld
Date: 2009-11-16 15:10:15 +0000 (Mon, 16 Nov 2009)
New Revision: 2022
Modified:
trunk/debian/changelog
trunk/scripts/debchange.1
trunk/scripts/debchange.pl
Log:
* debchange:
+ Include patch from Mathieu Parent to allow --newversion to be mixed
together with --package. (Closes: #549469)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-11-16 05:32:34 UTC (rev 2021)
+++ trunk/debian/changelog 2009-11-16 15:10:15 UTC (rev 2022)
@@ -31,8 +31,13 @@
+ make trailing whitespace consistent with how 'normal'
.changes file are
- -- Ryan Niebur <[email protected]> Sun, 18 Oct 2009 14:31:42 -0700
+ [ Patrick Schoenfeld ]
+ * debchange:
+ + Include patch from Mathieu Parent to allow --newversion to be mixed
+ together with --package. (Closes: #549469)
+ -- Patrick Schoenfeld <[email protected]> Mon, 16 Nov 2009 16:08:05 +0100
+
devscripts (2.10.55) unstable; urgency=high
* Urgency "high" for security fix fix
Modified: trunk/scripts/debchange.1
===================================================================
--- trunk/scripts/debchange.1 2009-11-16 05:32:34 UTC (rev 2021)
+++ trunk/scripts/debchange.1 2009-11-16 15:10:15 UTC (rev 2022)
@@ -204,8 +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 and
-\fB\-\-increment\fR options.
+may only be used in conjunction with the \fB\-\-create\fR, \fB\-\-increment\fR
and
+\fB\-\-newversion\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-11-16 05:32:34 UTC (rev 2021)
+++ trunk/scripts/debchange.pl 2009-11-16 15:10:15 UTC (rev 2022)
@@ -419,8 +419,8 @@
if $opt_news && @closes;
# 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);
+fatal "--package can only be used with --create, --increment and --newversion"
+ if $opt_package && ! ($opt_create || $opt_i || $opt_v);
my $changelog_path = $opt_c || $ENV{'CHANGELOG'} || 'debian/changelog';
my $real_changelog_path = $changelog_path;
--
To unsubscribe, send mail to [email protected].
