From 5f9e407f94a137f589cf492d5a87ca666cff97cd Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Sat, 8 Nov 2008 17:09:08 +0000 Subject: [PATCH 1/4] * dch-repeat, pbuilder-dist, pull-lp-source: Add Jaunty to known releases * submittodebian: Set usertags to jaunty --- dch-repeat | 2 +- debian/changelog | 6 +++++- pbuilder-dist | 2 +- pull-lp-source | 2 +- submittodebian | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dch-repeat b/dch-repeat index 5c475d7..40ee3bb 100755 --- a/dch-repeat +++ b/dch-repeat @@ -47,7 +47,7 @@ EOM exit(0); } -my @releases = ('dapper', 'gutsy', 'hardy', 'intrepid'); +my @releases = ('dapper', 'gutsy', 'hardy', 'intrepid','jaunty'); #Getopt::Long::Configure("bundling", "no_ignore_case"); our $opt_build_tree = "/scratch/ubuntu/build"; diff --git a/debian/changelog b/debian/changelog index bada289..bdc03bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,11 @@ ubuntu-dev-tools (0.47) UNRELEASED; urgency=low [ Michael Casadevall ] * Fixed buildd rescore (tested by Sarah Hobbs) - -- Michael Casadevall Sat, 08 Nov 2008 06:33:00 -0500 + [ Iain Lane ] + * dch-repeat, pbuilder-dist, pull-lp-source: Add Jaunty to known releases + * submittodebian: Set usertags to jaunty + + -- Michael Casadevall Sat, 08 Nov 2008 17:07:48 +0000 ubuntu-dev-tools (0.46) intrepid; urgency=low diff --git a/pbuilder-dist b/pbuilder-dist index a86e49c..2ce38fd 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -183,7 +183,7 @@ fi # Check if the distribution exists, and fill the variables that change # depending on wheter the target distribution is Ubuntu or Debian. case $DISTRIBUTION in - dapper|edgy|feisty|gutsy|hardy|intrepid) + dapper|edgy|feisty|gutsy|hardy|intrepid|jaunty) distdata ubuntu ;; diff --git a/pull-lp-source b/pull-lp-source index 87f9641..e9fc787 100755 --- a/pull-lp-source +++ b/pull-lp-source @@ -59,7 +59,7 @@ class BackportFromLP: 'Ensure that the package specified is a valid source ' +\ 'package name and that Launchpad is not down.' -default_release = 'intrepid' +default_release = 'jaunty' if __name__ == '__main__': usage = "Usage: %prog [release]" diff --git a/submittodebian b/submittodebian index ddd8a9c..6f27ffc 100755 --- a/submittodebian +++ b/submittodebian @@ -83,7 +83,7 @@ def edit_debdiff(debdiff): run_cmd(cmd) def submit_bugreport(body, debdiff, changelog): - cmd = 'reportbug -P "User: ubuntu-devel@lists.ubuntu.com" -P "Usertags: origin-ubuntu intrepid ubuntu-patch" -T patch -A %s -B debian -i %s -V %s %s' % (debdiff, body, deb_version, changelog.package) + cmd = 'reportbug -P "User: ubuntu-devel@lists.ubuntu.com" -P "Usertags: origin-ubuntu jaunty ubuntu-patch" -T patch -A %s -B debian -i %s -V %s %s' % (debdiff, body, deb_version, changelog.package) run_cmd(cmd) def run_cmd(cmd): From 688bc29875062553779952ebf1504eb9b9cb1b59 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 3 Dec 2008 21:56:00 +0000 Subject: [PATCH 2/4] pbuilder-dist.new: Add "experimental" to known Debian releases --- debian/changelog | 3 ++- pbuilder-dist.new | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bdc03bd..38c7500 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,9 @@ ubuntu-dev-tools (0.47) UNRELEASED; urgency=low [ Iain Lane ] * dch-repeat, pbuilder-dist, pull-lp-source: Add Jaunty to known releases * submittodebian: Set usertags to jaunty + * pbuilder-dist.new: Add "experimental" to known Debian releases - -- Michael Casadevall Sat, 08 Nov 2008 17:07:48 +0000 + -- Iain Lane Wed, 03 Dec 2008 21:55:26 +0000 ubuntu-dev-tools (0.46) intrepid; urgency=low diff --git a/pbuilder-dist.new b/pbuilder-dist.new index 80a1e06..95b2d2b 100755 --- a/pbuilder-dist.new +++ b/pbuilder-dist.new @@ -31,7 +31,7 @@ import sys import os -debian_distros = ['etch', 'lenny', 'sid', 'stable', 'testing', 'unstable'] +debian_distros = ['etch', 'lenny', 'sid', 'stable', 'testing', 'unstable', 'experimental'] class pbuilder_dist: From 60f81e741b42e41bec0a01cabe2566f110d6d9a6 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Sun, 21 Dec 2008 23:07:44 +0000 Subject: [PATCH 3/4] pbuilder-dist.new: Add 'experimental' to list of known Debian releases --- debian/changelog | 6 +++++- pbuilder-dist.new | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2547aa1..63221d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,11 @@ ubuntu-dev-tools (0.50) UNRELEASED; urgency=low * Move perl-modules and libwww-perl to Recommends, as they are only necessary for a single script and Recommends are also installed by default. - -- Siegfried-Angel Gevatter Pujals Sun, 21 Dec 2008 11:45:56 +0100 + [ Iain Lane ] + * pbuilder-dist.new: Add 'experimental' to list of known Debian releases. + pbuilder-experimental works. + + -- Iain Lane Sun, 21 Dec 2008 23:06:39 +0000 ubuntu-dev-tools (0.49) jaunty; urgency=low diff --git a/pbuilder-dist.new b/pbuilder-dist.new index 80a1e06..95b2d2b 100755 --- a/pbuilder-dist.new +++ b/pbuilder-dist.new @@ -31,7 +31,7 @@ import sys import os -debian_distros = ['etch', 'lenny', 'sid', 'stable', 'testing', 'unstable'] +debian_distros = ['etch', 'lenny', 'sid', 'stable', 'testing', 'unstable', 'experimental'] class pbuilder_dist: From 933b8374b5f07bdec27a9b7569108755c50efc51 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 22 Dec 2008 14:36:13 +0000 Subject: [PATCH 4/4] Revert changelog entries so that I can push the branch again --- debian/changelog | 5 ----- 1 file changed, 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index c35538e..80d8d67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,11 +54,6 @@ ubuntu-dev-tools (0.47) jaunty; urgency=low * pull-lp-source: Made jaunty the default * dch-repeat: Added jaunty - [ Iain Lane ] - * dch-repeat, pbuilder-dist, pull-lp-source: Add Jaunty to known releases - * submittodebian: Set usertags to jaunty - * pbuilder-dist.new: Add "experimental" to known Debian releases - -- Iain Lane Wed, 03 Dec 2008 21:55:26 +0000 ubuntu-dev-tools (0.46) intrepid; urgency=low