[SRM] devscripts "squeeze-friendly" stable update?
Hi,
I'd like to propose a stable update for devscripts to add a few small
changes which will make things easier for maintainers during the squeeze
release cycle. Specifically, the changes are:
* bts: Recognise the "squeeze" and "squeeze-ignore" tags.
* debchange:
+ Modify --bpo to produce a changelog suitable for uploading to
lenny-backports rather than etch-backports by default. If the
latest changelog entry is for an etch backport, a new etch-backports
stanza will be produced instead.
+ Correctly increment backport version numbers.
* rc-alert: Modify the description of the "I" flag to refer to the
squeeze-ignore tag rather than etch-ignore.
I've attached a debdiff containing the above changes. The changes to
the three scripts are self-contained so any combination of them could be
included or excluded if required.
Thanks,
Adam
diff -Nru devscripts-2.10.35lenny3/debian/changelog devscripts-2.10.35lenny4/debian/changelog
--- devscripts-2.10.35lenny3/debian/changelog 2009-02-11 07:52:05.000000000 +0000
+++ devscripts-2.10.35lenny4/debian/changelog 2009-03-06 19:44:43.000000000 +0000
@@ -1,3 +1,17 @@
+devscripts (2.10.35lenny4) stable; urgency=low
+
+ * bts: Recognise the "squeeze" and "squeeze-ignore" tags.
+ * debchange:
+ + Modify --bpo to produce a changelog suitable for uploading to
+ lenny-backports rather than etch-backports by default. If the
+ latest changelog entry is for an etch backport, a new etch-backports
+ stanza will be produced instead.
+ + Correctly increment backport version numbers.
+ * rc-alert: Modify the description of the "I" flag to refer to the
+ squeeze-ignore tag rather than etch-ignore.
+
+ -- Adam D. Barratt <adam@adam-barratt.org.uk> Fri, 06 Mar 2009 18:38:49 +0000
+
devscripts (2.10.35lenny3) testing; urgency=low
* debchange: Recognise lenny-backports and lenny-volatile as valid Debian
diff -Nru devscripts-2.10.35lenny3/po4a/po/devscripts.pot devscripts-2.10.35lenny4/po4a/po/devscripts.pot
--- devscripts-2.10.35lenny3/po4a/po/devscripts.pot 2008-12-12 18:26:23.000000000 +0000
+++ devscripts-2.10.35lenny4/po4a/po/devscripts.pot 2009-03-06 19:01:09.000000000 +0000
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-07-15 19:19+0100\n"
+"POT-Creation-Date: 2009-03-06 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3951,8 +3951,8 @@
# type: Plain text
#: ../scripts/debchange.1:223
msgid ""
-"Increment the Debian release number for a upload to etch-backports, and add "
-"a backport upload changelog comment."
+"Increment the Debian release number for an upload to lenny-backports, and "
+"add a backport upload changelog comment."
msgstr ""
# type: TP
diff -Nru devscripts-2.10.35lenny3/po4a/po/fr.po devscripts-2.10.35lenny4/po4a/po/fr.po
--- devscripts-2.10.35lenny3/po4a/po/fr.po 2008-07-15 22:46:53.000000000 +0100
+++ devscripts-2.10.35lenny4/po4a/po/fr.po 2009-03-06 19:02:30.000000000 +0000
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: devscripts\n"
-"POT-Creation-Date: 2008-07-15 19:19+0100\n"
+"POT-Creation-Date: 2009-03-06 19:01+0000\n"
"PO-Revision-Date: 2008-07-15 23:07+0200\n"
"Last-Translator: Nicolas François <nicolas.francois@centraliens.net>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -5156,11 +5156,11 @@
# type: Plain text
#: ../scripts/debchange.1:223
msgid ""
-"Increment the Debian release number for a upload to etch-backports, and add "
-"a backport upload changelog comment."
+"Increment the Debian release number for an upload to lenny-backports, and "
+"add a backport upload changelog comment."
msgstr ""
"Incrémente le numéro de publication de Debian pour un envoi d'un "
-"rétroportage pour Etch, et ajoute un commentaire pour l'envoi du "
+"rétroportage pour Lenny, et ajoute un commentaire pour l'envoi du "
"rétroportage dans le changelog."
# type: TP
diff -Nru devscripts-2.10.35lenny3/scripts/bts.pl devscripts-2.10.35lenny4/scripts/bts.pl
--- devscripts-2.10.35lenny3/scripts/bts.pl 2008-06-29 13:36:17.000000000 +0100
+++ devscripts-2.10.35lenny4/scripts/bts.pl 2009-03-06 18:23:17.000000000 +0000
@@ -120,7 +120,7 @@
"pending", "sarge", "sarge-ignore", "experimental", "d-i",
"confirmed", "ipv6", "lfs", "fixed-in-experimental",
"fixed-upstream", "l10n", "etch", "etch-ignore",
- "lenny", "lenny-ignore",
+ "lenny", "lenny-ignore", "squeeze", "squeeze-ignore",
);
*valid_tags = \@gTags;
diff -Nru devscripts-2.10.35lenny3/scripts/debchange.1 devscripts-2.10.35lenny4/scripts/debchange.1
--- devscripts-2.10.35lenny3/scripts/debchange.1 2008-07-09 23:39:48.000000000 +0100
+++ devscripts-2.10.35lenny4/scripts/debchange.1 2009-03-06 18:33:32.000000000 +0000
@@ -218,7 +218,7 @@
upload, and add a Security Team upload changelog comment.
.TP
.B \-\-bpo
-Increment the Debian release number for a upload to etch-backports,
+Increment the Debian release number for an upload to lenny-backports,
and add a backport upload changelog comment.
.TP
.B \-\-local ", " \-l \fIsuffix\fR
diff -Nru devscripts-2.10.35lenny3/scripts/debchange.pl devscripts-2.10.35lenny4/scripts/debchange.pl
--- devscripts-2.10.35lenny3/scripts/debchange.pl 2009-02-11 07:48:12.000000000 +0000
+++ devscripts-2.10.35lenny4/scripts/debchange.pl 2009-03-06 19:40:15.000000000 +0000
@@ -110,7 +110,7 @@
Increment the Debian release number for a Debian Security Team upload
--bpo
Increment the Debian release number for a Backports.org upload
- to "etch-backports"
+ to "lenny-backports"
-l, --local <suffix>
Add a suffix to the Debian version number for a local build
-b, --force-bad-version
@@ -484,6 +484,8 @@
my $EMAIL = 'EMAIL';
my $DISTRIBUTION = 'UNRELEASED';
my $bpo_dist = '';
+my %bpo_dists = ( '40', 'etch', '50', 'lenny' );
+my $latest_bpo_dist = '50';
my $CHANGES = '';
if (! $opt_create || ($opt_create && $opt_news)) {
@@ -985,10 +987,10 @@
$debian_revision++;
$start = "$upstream_version-$debian_revision";
$end = "";
- } elsif ($opt_bpo and not $start =~ /~bpo\.$/) {
+ } elsif ($opt_bpo and not $start =~ /~bpo[0-9]+\+$/) {
# If it's not already a backport make it so
# otherwise we can be safe if we behave like dch -i
- $end .= "~bpo40+1";
+ $end .= "~bpo$latest_bpo_dist+1";
} elsif ($opt_l and not $start =~ /\Q$opt_l\E/) {
# If it's not already a local package make it so
# otherwise we can be safe if we behave like dch -i
@@ -997,7 +999,22 @@
# Don't bump the version of a NEWS file in this case as we're
# using the version from the changelog
$end++;
+
+ # Attempt to set the distribution for a backport correctly
+ # based on the version of the previous backport
+ if ($opt_bpo) {
+ my $previous_dist = $start;
+ $previous_dist =~ s/^.*~bpo([0-9]+)\+$/$1/;
+ if (defined $previous_dist and defined
+ $bpo_dists{$previous_dist}) {
+ $bpo_dist = $bpo_dists{$previous_dist} . '-backports';
+ } else {
+ # Fallback to using the previous distribution
+ $bpo_dist = $changelog{'Distribution'};
+ }
+ }
}
+
$NEW_VERSION = "$start$end";
($NEW_SVERSION=$NEW_VERSION) =~ s/^\d+://;
($NEW_UVERSION=$NEW_SVERSION) =~ s/-[^-]*$//;
@@ -1014,7 +1031,7 @@
}
if ($opt_bpo) {
- $bpo_dist='etch-backports';
+ $bpo_dist ||= $bpo_dists{$latest_bpo_dist} . '-backports';
}
my $distribution = $opt_D || $bpo_dist || (($opt_release_heuristic eq 'changelog') ? "UNRELEASED" : $DISTRIBUTION);
@@ -1042,7 +1059,7 @@
print O " * Non-maintainer upload by the Security Team.\n";
$line = 1;
} elsif ($opt_bpo && ! $opt_news) {
- print O " * Rebuild for etch-backports.\n";
+ print O " * Rebuild for $bpo_dist.\n";
$line = 1;
}
if (@closes_text or $TEXT) {
diff -Nru devscripts-2.10.35lenny3/scripts/rc-alert.pl devscripts-2.10.35lenny4/scripts/rc-alert.pl
--- devscripts-2.10.35lenny3/scripts/rc-alert.pl 2008-06-24 21:12:37.000000000 +0100
+++ devscripts-2.10.35lenny4/scripts/rc-alert.pl 2009-03-06 18:23:36.000000000 +0000
@@ -43,7 +43,7 @@
'....(R)' => "unreproducible",
'.....(S)' => "security",
'......(U)' => "upstream",
- '.......(I)' => "etch-ignore or lenny-ignore",
+ '.......(I)' => "lenny-ignore or squeeze-ignore",
);
# A little hacky but allows us to sort the list by length
my %distmap = ( '(O)' => "oldstable",
Reply to: