Author: adam-guest
Date: 2008-03-07 19:10:29 +0000 (Fri, 07 Mar 2008)
New Revision: 1112
Modified:
trunk/debian/changelog
trunk/scripts/debchange.pl
Log:
+ Add non-maintainer uploads (including security and QA uploads),
backports and the use of local version strings to the list of
cases where debchange doesn't have to guess the user's intentions
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-07 18:11:37 UTC (rev 1111)
+++ trunk/debian/changelog 2008-03-07 19:10:29 UTC (rev 1112)
@@ -12,6 +12,9 @@
whether the previous stanza is also UNRELEASED and, if so, merge
them (assuming the "changelog" release heuristic is in use)
(Closes: #458130)
+ + Add non-maintainer uploads (including security and QA uploads),
+ backports and the use of local version strings to the list of
+ cases where debchange doesn't have to guess the user's intentions
* 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-07 18:11:37 UTC (rev 1111)
+++ trunk/scripts/debchange.pl 2008-03-07 19:10:29 UTC (rev 1112)
@@ -736,7 +736,8 @@
# Are we going to have to figure things out for ourselves?
if (! $opt_i && ! $opt_v && ! $opt_d && ! $opt_a && ! $opt_e && ! $opt_r &&
- ! $opt_create) {
+ ! $opt_n && ! $opt_bn && ! $opt_qa && ! $opt_s && ! $opt_bpo &&
+ ! $opt_l && ! $opt_create) {
# Yes, we are
if ($opt_release_heuristic eq 'log') {
my @UPFILES = glob("../$PACKAGE\_$SVERSION\_*.upload");
@@ -934,8 +935,7 @@
my $urgency = $opt_u || 'low';
- if (($opt_v or ($opt_i and not ($opt_n or $opt_bn or $opt_s or $opt_qa)))
- and $opt_release_heuristic eq "changelog" and
+ if (($opt_v or $opt_i or $opt_l) and $opt_release_heuristic eq "changelog"
and
$changelog{'Distribution'} eq "UNRELEASED" and
$distribution eq "UNRELEASED") {
@@ -973,8 +973,6 @@
# Copy the old changelog file to the new one
local $/ = undef;
print O <S>;
-
- $opt_a = 0;
}
}
if (($opt_r || $opt_a || $merge) && ! $opt_create) {
--
To unsubscribe, send mail to [EMAIL PROTECTED]
