From dca732d355742af781a6d33a9b1c3f1e9b91e6c4 Mon Sep 17 00:00:00 2001 From: Siegfried-Angel Gevatter Pujals Date: Thu, 3 Jul 2008 19:26:25 +0200 Subject: [PATCH 01/10] Merge the requestsync fix from Iain Lane (~laney/ubuntu-dev-tools/dev). --- debian/changelog | 6 ++++-- requestsync | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 69601a2..756254a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ ubuntu-dev-tools (0.32) UNRELEASED; urgency=low - * [empty changelog for new bzr commits] + [ Iain Lane ] + * requestsync: Fix bug where requestsync would fall over when requesting + sync for package with no local changes. - -- Kees Cook Fri, 13 Jun 2008 11:55:24 -0700 + -- Siegfried-Angel Gevatter Pujals (RainCT) Thu, 03 Jul 2008 19:24:46 +0200 ubuntu-dev-tools (0.31) intrepid; urgency=low diff --git a/requestsync b/requestsync index 4b9f6a0..41f8ff4 100755 --- a/requestsync +++ b/requestsync @@ -419,21 +419,21 @@ if __name__ == '__main__': report += debian_changelog(srcpkg, debiancomponent, base_ver) + '\n' if need_interaction: - (_, bug_text) = edit_report(title, report, changes_required=True) + (_, report) = edit_report(title, report, changes_required=True) # Post sync request using Launchpad interface: srcpkg = not newsource and srcpkg or None if use_lp_bugs: # Map status to the values expected by lp-bugs mapping = {'new': 'New', 'confirmed': 'Confirmed'} - if post_bug(srcpkg, subscribe, mapping[status], title, bug_text): + if post_bug(srcpkg, subscribe, mapping[status], title, report): sys.exit(0) # Abort on error: print 'Something went wrong. No sync request filed.' sys.exit(1) # Mail sync request: - if mail_bug(srcpkg, subscribe, status, title, bug_text, keyid): + if mail_bug(srcpkg, subscribe, status, title, report, keyid): sys.exit(0) print 'Something went wrong. No sync request filed.' From cdad605101a3113c60917c80afbec8b0e913a8ca Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 9 Jul 2008 09:51:33 -0700 Subject: [PATCH 02/10] dch-repeat: drop edgy, add intrepid. Update Copyright years. --- dch-repeat | 5 +++-- debian/changelog | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dch-repeat b/dch-repeat index 705aafb..ba831f0 100755 --- a/dch-repeat +++ b/dch-repeat @@ -1,5 +1,6 @@ #!/usr/bin/perl -# Copyright 2007 (C) Kees Cook +# Copyright 2007-2008 (C) Canonical, Ltd +# Author: Kees Cook # License: GPLv2 # # This script is used to repeat a change log into an older release. It @@ -30,7 +31,7 @@ EOM exit(0); } -my @releases = ('dapper', 'edgy', 'feisty', 'gutsy', 'hardy'); +my @releases = ('dapper', 'feisty', 'gutsy', 'hardy', 'intrepid'); #Getopt::Long::Configure("bundling", "no_ignore_case"); our $opt_build_tree = "/scratch/ubuntu/build"; diff --git a/debian/changelog b/debian/changelog index 756254a..95566fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,10 @@ ubuntu-dev-tools (0.32) UNRELEASED; urgency=low * requestsync: Fix bug where requestsync would fall over when requesting sync for package with no local changes. - -- Siegfried-Angel Gevatter Pujals (RainCT) Thu, 03 Jul 2008 19:24:46 +0200 + [ Kees Cook ] + * dch-repeat: drop edgy, add intrepid. Update Copyright years. + + -- Kees Cook Wed, 09 Jul 2008 09:49:26 -0700 ubuntu-dev-tools (0.31) intrepid; urgency=low From 7170f5d99b7cc2a58be3afb25bffec9da2978ff6 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Wed, 16 Jul 2008 17:18:10 -0500 Subject: [PATCH 03/10] add lpia support to mk-sbuild-lv --- debian/changelog | 4 ++++ mk-sbuild-lv | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 95566fd..3655d6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ ubuntu-dev-tools (0.32) UNRELEASED; urgency=low [ Kees Cook ] * dch-repeat: drop edgy, add intrepid. Update Copyright years. + [ Mario Limonciello ] + * mk-sbuild-lv: Add lpia build support. + * mk-sbuild-lv: Copy mirror used for debootstrap into chroot too. + -- Kees Cook Wed, 09 Jul 2008 09:49:26 -0700 ubuntu-dev-tools (0.31) intrepid; urgency=low diff --git a/mk-sbuild-lv b/mk-sbuild-lv index f13f070..51ad04c 100755 --- a/mk-sbuild-lv +++ b/mk-sbuild-lv @@ -119,7 +119,7 @@ while :; do # By default, use the native architecture. arch_opt="--arch $2" arch_suffix="-$2" - if [ -z "$personality" -a "$2" = "i386" ] + if [ "$2" = "i386" ] || [ "$2" = "lpia" ] && [ -z "$personality" ]; then personality="linux32" fi @@ -191,6 +191,11 @@ else variant_opt="--variant=buildd" fi +# are we doing an lpia build? +if [ -z "$DEBOOTSTRAP_MIRROR" ] && [ "$arch_opt" = "--arch lpia" ]; then + DEBOOTSTRAP_MIRROR="http://ports.ubuntu.com/" +fi + # Allocate the "golden" chroot LV sudo lvcreate -n "$CHROOT_LV" -L "$LV_SIZE" "$VG" sudo mkfs -t ext3 "$CHROOT_PATH" @@ -208,10 +213,10 @@ if [ -r "$TEMPLATE_SOURCES" ]; then cat "$TEMPLATE_SOURCES" > "$TEMP_SOURCES" else cat > "$TEMP_SOURCES" < Date: Thu, 17 Jul 2008 11:23:56 -0500 Subject: [PATCH 04/10] release to intrepid --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3655d6c..0d247d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ubuntu-dev-tools (0.32) UNRELEASED; urgency=low +ubuntu-dev-tools (0.32) intrepid; urgency=low [ Iain Lane ] * requestsync: Fix bug where requestsync would fall over when requesting @@ -11,7 +11,7 @@ ubuntu-dev-tools (0.32) UNRELEASED; urgency=low * mk-sbuild-lv: Add lpia build support. * mk-sbuild-lv: Copy mirror used for debootstrap into chroot too. - -- Kees Cook Wed, 09 Jul 2008 09:49:26 -0700 + -- Mario Limonciello Thu, 17 Jul 2008 11:20:49 -0500 ubuntu-dev-tools (0.31) intrepid; urgency=low From 2e64af4a346d9660529d875aa58ce427b2ade4e9 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 18 Jul 2008 12:32:58 +0100 Subject: [PATCH 05/10] update-maintainer: Stop mentioning "Modify Maintainer: value blabla" since it is a required global policy anyway and totally pointless changelog noise. --- debian/changelog | 8 ++++++++ update-maintainer | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d247d7..692ebeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ubuntu-dev-tools (0.33) UNRELEASED; urgency=low + + * update-maintainer: Stop mentioning "Modify Maintainer: value blabla" since + it is a required global policy anyway and totally pointless changelog + noise. + + -- Martin Pitt Fri, 18 Jul 2008 12:29:57 +0100 + ubuntu-dev-tools (0.32) intrepid; urgency=low [ Iain Lane ] diff --git a/update-maintainer b/update-maintainer index 808ee7b..9d3cdda 100755 --- a/update-maintainer +++ b/update-maintainer @@ -11,7 +11,6 @@ Usage: $0 [--path=PATH] [--section=SECTION] [--nochangelog] --path=PATH Specify the path of the source directory. --section=SECTION Specify the section of the package (if the package is not yet in the archive. ---nochangelog Do not add to the changelog, only alter debian/control. EOF } @@ -29,9 +28,6 @@ for argv in "$@"; do [ "$value" != "multiverse" ] && echo "Invalid section. Valid sections: main restricted universe multiverse" >&2 && exit 1 section=$value ;; - "--nochangelog"|"--no-changelog") - nochangelog=1 - ;; "--help") usage exit 0 @@ -87,6 +83,3 @@ esac for file in control{,.in,.real}; do [ -f $DEBIANDIR/$file ] && sed -ri "s/(^Maintainer:) (.*)/\1 $email\nXSBC-Original-\1 \2/" $DEBIANDIR/$file done - -[ -z "$nochangelog" ] && dch --changelog $DEBIANDIR/changelog "Modify Maintainer value to match the DebianMaintainerField specification." -echo "Maintainer changed to $email." From 133caaf59bc05a9a96eb0f5dc78cca06c08b15f1 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 18 Jul 2008 12:33:49 +0100 Subject: [PATCH 06/10] release as 0.33 to intrepid --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 692ebeb..0fb2259 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ubuntu-dev-tools (0.33) UNRELEASED; urgency=low +ubuntu-dev-tools (0.33) intrepid; urgency=low * update-maintainer: Stop mentioning "Modify Maintainer: value blabla" since it is a required global policy anyway and totally pointless changelog From 029266ffddc60b910b8a7877667a781b73a13fbc Mon Sep 17 00:00:00 2001 From: Luke Yelavich Date: Fri, 18 Jul 2008 13:30:50 +0100 Subject: [PATCH 07/10] * update-maintainer: Remove dangling reference to --nochangelog in usage function. --- debian/changelog | 7 +++++++ update-maintainer | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0fb2259..5c5998f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ubuntu-dev-tools (0.34) UNRELEASED; urgency=low + + * update-maintainer: Remove dangling reference to --nochangelog + in usage function. + + -- Luke Yelavich Fri, 18 Jul 2008 13:29:53 +0100 + ubuntu-dev-tools (0.33) intrepid; urgency=low * update-maintainer: Stop mentioning "Modify Maintainer: value blabla" since diff --git a/update-maintainer b/update-maintainer index 9d3cdda..ce03185 100755 --- a/update-maintainer +++ b/update-maintainer @@ -7,7 +7,7 @@ usage() { cat < Date: Mon, 28 Jul 2008 15:51:05 +1000 Subject: [PATCH 08/10] releasing version 0.34 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c5998f..514e353 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -ubuntu-dev-tools (0.34) UNRELEASED; urgency=low +ubuntu-dev-tools (0.34) intrepid; urgency=low * update-maintainer: Remove dangling reference to --nochangelog in usage function. - -- Luke Yelavich Fri, 18 Jul 2008 13:29:53 +0100 + -- Luke Yelavich Mon, 28 Jul 2008 15:50:38 +1000 ubuntu-dev-tools (0.33) intrepid; urgency=low From 27605a77a2f7a39cb4bf6f5c5158a422bceac740 Mon Sep 17 00:00:00 2001 From: Siegfried-Angel Gevatter Pujals Date: Mon, 4 Aug 2008 14:56:15 +0200 Subject: [PATCH 09/10] Remove --no-changelog from update-maintainer's manpage. --- debian/changelog | 7 +++++++ doc/update-maintainer.1 | 16 ++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 514e353..8eacd13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ubuntu-dev-tools (0.35) intrepid; urgency=low + + * doc/update-maintainer.1: + - Remove the reference to the --no-changelog option from the manpage. + + -- Siegfried-Angel Gevatter Pujals Mon, 04 Aug 2008 14:50:15 +0200 + ubuntu-dev-tools (0.34) intrepid; urgency=low * update-maintainer: Remove dangling reference to --nochangelog diff --git a/doc/update-maintainer.1 b/doc/update-maintainer.1 index 351656a..13b56d4 100644 --- a/doc/update-maintainer.1 +++ b/doc/update-maintainer.1 @@ -1,16 +1,14 @@ -.TH UPDATE\-MAINTAINER "1" "February 17, 2008" "ubuntu-dev-tools" +.TH UPDATE\-MAINTAINER "1" "August 04, 2008" "ubuntu-dev-tools" .SH NAME -update\-maintainer \- change Maintainer field in a Debian source package +update\-maintainer \- change the Maintainer field in a Debian source package .SH SYNOPSIS -.B update\-maintainer [\fI\-\-path=\fR] [\fI\-\-section=
\fR] [\fI\-\-nochangelog\fR] +.B update\-maintainer [\fB\-\-path=\fP] [\fB\-\-section=
\fP] .SH DESCRIPTION \fBupdate\-maintainer\fP updates the Maintainer field in the source of an Ubuntu package to match the DebianMaintainerField specification. -.PP -See https://wiki.ubuntu.com/DebianMaintainerField for more information. .SH OPTIONS .TP @@ -21,11 +19,9 @@ This option allows you to specify the path to the source directory. Manually specify the section of the package. This is necessary if the package is not yet in the archive or if you don't have an Internet connection available when you run \fBupdate\-maintainer\fP. -.TP -\fB\-\-nochangelog\fP, \fB\-\-no\-changelog\fP -By default, \fBupdate\-maintainer\fP adds an entry to the changelog -explaining that it changed the Maintainer field. If you don't want -that to happen, use this option. + +.SH SEE ALSO +See https://wiki.ubuntu.com/DebianMaintainerField for more information. .SH AUTHOR \fBupdate-maintainer\fP has been written by Albin Tonnerre From 7d89c91b82d5db6d7562e17bd68f6a6b3979e10b Mon Sep 17 00:00:00 2001 From: Siegfried-Angel Gevatter Pujals Date: Mon, 4 Aug 2008 15:16:07 +0200 Subject: [PATCH 10/10] requestsync: If the email interface is used, check if DEBEMAIL is set before anything else (LP: #254632). --- debian/changelog | 3 +++ requestsync | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8eacd13..66988a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ ubuntu-dev-tools (0.35) intrepid; urgency=low * doc/update-maintainer.1: - Remove the reference to the --no-changelog option from the manpage. + * requestsync: + - If the email interface is used, check if DEBEMAIL is set before anything + else (LP: #254632). -- Siegfried-Angel Gevatter Pujals Mon, 04 Aug 2008 14:50:15 +0200 diff --git a/requestsync b/requestsync index 41f8ff4..4cfde41 100755 --- a/requestsync +++ b/requestsync @@ -123,6 +123,14 @@ Options: ''' sys.exit(1) +def get_email_address(): + '''Get the DEBEMAIL environment variable or give an error.''' + myemailaddr = os.getenv('DEBEMAIL') + if not myemailaddr: + print >> sys.stderr, 'The environment variable DEBEMAIL needs to be ' +\ + ' set to make use of this script, unless you use option --lp.' + return myemailaddr + def mail_bug(source_package, subscribe, status, bugtitle, bugtext, keyid = None): '''Submit the sync request per email. Return True if email successfully send, otherwise False.''' @@ -132,9 +140,8 @@ def mail_bug(source_package, subscribe, status, bugtitle, bugtext, keyid = None) to = 'new@bugs.launchpad.net' - myemailaddr = os.getenv('DEBEMAIL') + myemailaddr = get_email_address() if not myemailaddr: - print >> sys.stderr, 'The environment variable DEBEMAIL needs to be set to make use of this script.' return False # generate initial mailbody @@ -362,10 +369,13 @@ if __name__ == '__main__': if o == '-s': sponsorship = True if o == '-k': keyid = a if o == '--lp': use_lp_bugs = True - + if len(args) not in (2, 3): usage() + if not use_lp_bugs and not get_email_address(): + sys.exit(1) + (srcpkg, release) = args[:2] force_base_ver = None if len(args) == 3: