Author: schoenfeld
Date: 2009-07-24 13:06:57 +0000 (Fri, 24 Jul 2009)
New Revision: 1940
Modified:
trunk/debian/changelog
trunk/scripts/debchange.pl
Log:
debchange: Implement a dist indication mechanism that parses
an 'Upload to $DIST' line and sets the distribution accordingly, when
the --release parameter is used. (Closes: #515346)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-07-24 12:36:37 UTC (rev 1939)
+++ trunk/debian/changelog 2009-07-24 13:06:57 UTC (rev 1940)
@@ -51,8 +51,11 @@
[email protected] and defaults to sending the mail
interactive to encourage writing explanations, why the bug
was closed. (Closes: #482751)
+ * debchange: Implement a dist indication mechanism that parses
+ an 'Upload to $DIST' line and sets the distribution accordingly, when
+ the --release parameter is used. (Closes: #515346)
- -- Adam D. Barratt <[email protected]> Fri, 24 Jul 2009 12:23:14 +0100
+ -- Patrick Schoenfeld <[email protected]> Fri, 24 Jul 2009 15:03:56 +0200
devscripts (2.10.52) unstable; urgency=low
Modified: trunk/scripts/debchange.pl
===================================================================
--- trunk/scripts/debchange.pl 2009-07-24 12:36:37 UTC (rev 1939)
+++ trunk/scripts/debchange.pl 2009-07-24 13:06:57 UTC (rev 1940)
@@ -1131,7 +1131,7 @@
# last entry, and determine whether there are existing
# multi-developer changes by the current maintainer.
$line=-1;
- my ($lastmaint, $nextmaint, $maintline, $count, $lastheader, $lastdist);
+ my ($lastmaint, $nextmaint, $maintline, $count, $lastheader, $lastdist,
$dist_indicator);
my $savedline = $line;;
while (<S>) {
$line++;
@@ -1157,6 +1157,9 @@
last;
}
}
+ elsif (/ \* Upload to (.*)$/) {
+ $dist_indicator = $1;
+ }
elsif (/^ --\s+([^<]+)\s+/) {
$lastmaint=$1;
# Remember where we are so we can skip back afterwards
@@ -1208,7 +1211,11 @@
if ($opt_r) {
# Change the distribution from UNRELEASED for release
if ($distribution eq "UNRELEASED") {
- $distribution = $opt_D || $lastdist || "unstable";
+ if ($dist_indicator and not $opt_D) {
+ $distribution = $dist_indicator;
+ } else {
+ $distribution = $opt_D || $lastdist || "unstable";
+ }
} elsif ($opt_D) {
warn "$progname warning: ignoring distribution passed to
--release as changelog has already been released\n";
}
--
To unsubscribe, send mail to [email protected].
