Merge with trunk, update changelog with my new changes

dch-repeat

@@ -1,5 +1,6 @@
 #!/usr/bin/perl
-# Copyright 2007 (C) Kees Cook <kees@ubuntu.com>
+# Copyright 2007-2008 (C) Canonical, Ltd
+# Author: Kees Cook <kees@ubuntu.com>
 # 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";

debian/changelog

@@ -1,14 +1,51 @@
-ubuntu-dev-tools (0.32) UNRELEASED; urgency=low
+ubuntu-dev-tools (0.35) intrepid; urgency=low
 
-  [ Kees Cook ]
+  [ Siegfried-Angel Gevatter Pujals ]
-  * [empty changelog for new bzr commits] 
+  * 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).
 
   [ Iain Lane ]
   * Add pull-lp-source: Get source packages from LP to avoid mirror lag.
+  * pull-lp-source.new:
+     - Set mirror and componente for debian distros
+     - Use local apt cache if available
+  * massfile:
+     - Modify to work with Firefox 3 cookies
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Mon, 04 Aug 2008 18:29:46 +0100
+
+ubuntu-dev-tools (0.34) intrepid; urgency=low
+
+  * update-maintainer: Remove dangling reference to --nochangelog
+    in usage function.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Mon, 28 Jul 2008 15:50:38 +1000
+
+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
+    noise.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 18 Jul 2008 12:29:57 +0100
+
+ubuntu-dev-tools (0.32) intrepid; urgency=low
+
+  [ Iain Lane ]
   * requestsync: Fix bug where requestsync would fall over when requesting
     sync for package with no local changes.
 
- -- Iain Lane <iain@orangesquash.org.uk>  Thu, 03 Jul 2008 17:44:19 +0100
+  [ 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.
+
+ -- Mario Limonciello <mario_limonciello@dell.com>  Thu, 17 Jul 2008 11:20:49 -0500
 
 ubuntu-dev-tools (0.31) intrepid; urgency=low
 

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=<PATH>\fR] [\fI\-\-section=<SECTION>\fR] [\fI\-\-nochangelog\fR]
+.B update\-maintainer [\fB\-\-path=<PATH>\fP] [\fB\-\-section=<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
+.SH SEE ALSO
-By default, \fBupdate\-maintainer\fP adds an entry to the changelog
+See https://wiki.ubuntu.com/DebianMaintainerField for more information.
-explaining that it changed the Maintainer field. If you don't want
-that to happen, use this option.
 
 .SH AUTHOR
 \fBupdate-maintainer\fP has been written by Albin Tonnerre <lut1n.tne@gmail.com>

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" <<EOM
-deb http://archive.ubuntu.com/ubuntu RELEASE main restricted universe multiverse
+deb ${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu} RELEASE main restricted universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu RELEASE main restricted universe multiverse
+deb-src ${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu} RELEASE main restricted universe multiverse
-deb http://archive.ubuntu.com/ubuntu RELEASE-updates main restricted universe multiverse
+deb ${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu} RELEASE-updates main restricted universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu RELEASE-updates main restricted universe multiverse
+deb-src ${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu} RELEASE-updates main restricted universe multiverse
 deb http://security.ubuntu.com/ubuntu RELEASE-security main restricted universe multiverse
 deb-src http://security.ubuntu.com/ubuntu RELEASE-security main restricted universe multiverse
 EOM

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
@@ -366,6 +373,9 @@ if __name__ == '__main__':
     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:

update-maintainer

@@ -7,11 +7,10 @@
 
 usage() {
 cat <<EOF
-Usage: $0 [--path=PATH] [--section=SECTION] [--nochangelog]
+Usage: $0 [--path=PATH] [--section=SECTION]
 --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."