Merge with trunk.

.bzrignore

@@ -0,0 +1 @@
+debian/pycompat

check-symbols

@@ -30,7 +30,7 @@ do
     for lib in `dpkg -L $pack | grep -E "\.so$" | sort -u`;
     do
         LIBNAME=$(basename $lib);
-        nm -D $lib | cut -d' ' -f3 | sort -u > /tmp/$LIBNAME.1;
+        nm -D $lib | cut -d' ' -f3 | sort -u > /tmp/$LIBNAME.old;
     done;
     DEBLINE="$DEBLINE $DEBDIR/$pack*.deb "; 
 done
@@ -58,9 +58,9 @@ do
     for lib in `dpkg -L $pack | grep -E "\.so$" | sort -u`;
     do
         LIBNAME=$(basename $lib);
-        nm -D $lib | cut -d' ' -f3 | sort -u > /tmp/$LIBNAME.2;
+        nm -D $lib | cut -d' ' -f3 | sort -u > /tmp/$LIBNAME.new;
         echo "Checking: $lib";
-        diff -u /tmp/$LIBNAME.{1,2};
-        rm /tmp/$LIBNAME.{1,2};
+        diff -u /tmp/$LIBNAME.{old,new};
+        rm /tmp/$LIBNAME.{old,new};
     done;
 done  

debian/changelog

@@ -1,9 +1,32 @@
-ubuntu-dev-tools (0.28) UNRELEASED; urgency=low
+ubuntu-dev-tools (0.30) UNRELEASED; urgency=low
 
   * pbuilder-dist-simple, doc/pbuilder-dist-simple.1, setup.py:
      - Add the original pbuilder-dist script as pbuilder-dist-simple.
+  * pbuilder-dist:
+     - Rewrite the script in Python to make it more robust and faster.
 
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Sun, 24 Feb 2008 19:52:06 +0100
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Wed, 12 Mar 2008 00:42:55 +0100
+
+ubuntu-dev-tools (0.29) hardy; urgency=low
+
+  * grab-attachments, setup.py: added grab-attachments tool. You give it bug
+    numbers, it gets you their attachments. Useful for sponsoring. 
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Mon, 10 Mar 2008 11:31:50 +0100
+
+ubuntu-dev-tools (0.28) hardy; urgency=low
+
+  [ Adrien Cunin ]
+  * pbuilder-dist:
+     - Fixed minor bash syntax error
+     - Removed quotes around the path when using --aptconfdir, otherwise
+       pbuilder create fails
+
+  [ Kees Cook ]
+  * mk-sbuild-lv: add --personality option from Jamie Strandboge (LP: #199181)
+  * check-symbols: rename temp files to avoid .so versioning confusion.
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 06 Mar 2008 11:05:02 -0800
 
 ubuntu-dev-tools (0.27) hardy; urgency=low
 

debian/copyright

@@ -20,14 +20,14 @@ Upstream Authors:
 
 Copyright:
 
-	Canonical Ltd. 2006-2007
+	Canonical Ltd. 2006-2008
 	Albert Damen <albrt@gmx.net> 2007
 	Albin Tonnerre <lut1n.tne@gmail.com> 2006-2007
 	Daniel Holbach <daniel.holbach@ubuntu.com> 2006-2007
 	Luke Yelavich <themuso@ubuntu.com> 2006-2007
 	Martin Pitt <martin.pitt@ubuntu.com> 2007
 	Michael Bienia <geser@ubuntu.com> 2006-2007
-	Kees Cook <kees@ubuntu.com> 2006-2007
+	Kees Cook <kees@ubuntu.com> 2006-2008
 	Pete Savage <petesavage@ubuntu.com> 2006-2007
 	Siegfried-A. Gevatter <rainct@ubuntu.com> 2007-2008
 	Terence Simpson <stdin@stdin.me.uk> 2007

grab-attachments

@@ -0,0 +1,37 @@
+#!/usr/bin/python
+#
+# Copyright 2007, Canonical, Daniel Holbach
+#
+# GPL 3
+#
+
+import os
+import sys
+import urllib
+import launchpadbugs.connector as Connector
+
+USAGE = "grab-attachments <bug numbers>"
+
+def main():
+    if len(sys.argv) == 1:
+        print >> sys.stderr, USAGE
+        sys.exit(1)
+
+    if sys.argv[1] in ["--help", "-h"]:
+        print USAGE
+        sys.exit(0)
+    Bug = Connector.ConnectBug(method="Text")
+    for arg in sys.argv[1:]:
+        try:
+            number = int(arg)
+        except:
+            print >> sys.stderr, "'%s' is not a valid bug number." % arg
+            sys.exit(1)
+        b = Bug(number)
+        for a in b.attachments:
+            filename = os.path.join(os.getcwd(), a.url.split("/")[-1])
+            urllib.urlretrieve(a.url, filename)
+
+if __name__ == '__main__':
+    main()
+

mk-sbuild-lv

@@ -20,7 +20,7 @@
 # detect the chroot architecture:
 #   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=392992
 #
-# Version: 0.11
+# Version: 0.12
 
 set -e
 
@@ -87,6 +87,7 @@ function usage()
     echo "Options:"
     echo "  --arch=ARCH                What architecture to select"
     echo "  --name=NAME                Base name for the schroot (arch is appended)"
+    echo "  --personality=PERSONALITY  What personality to use (defaults to match --arch)"
     echo "  --debug                    Turn on script debugging"
     echo "  --source-template=FILE     Use FILE as the sources.list template"
     echo "  --debootstrap-mirror=URL   Use URL as the debootstrap source"
@@ -97,7 +98,7 @@ function usage()
 if [ -z "$1" ]; then
     usage
 fi
-OPTS=`getopt -o '' --long "help,debug,arch:,name:,source-template:,debootstrap-mirror:" -- "$@"`
+OPTS=`getopt -o '' --long "help,debug,arch:,name:,source-template:,debootstrap-mirror:,personality:" -- "$@"`
 eval set -- "$OPTS"
 
 name=""
@@ -111,6 +112,14 @@ while :; do
             # By default, use the native architecture.
             arch_opt="--arch $2"
             arch_suffix="-$2"
+            if [ -z "$personality" -a "$2" = "i386" ]
+            then
+                personality="linux32"
+            fi
+            shift 2
+            ;;
+        --personality)
+            personality="$2"
             shift 2
             ;;
         --name)
@@ -223,6 +232,9 @@ run-setup-scripts=true
 run-exec-scripts=true
 EOM
 fi
+if [ ! -z "$personality" ]; then
+    echo "personality=$personality" >> "$TEMP_SCHROOTCONF"
+fi
 cat "$TEMP_SCHROOTCONF" | sed \
         -e "s|CHROOT_NAME|$CHROOT_NAME|g" \
         -e "s|CHROOT_PATH|$CHROOT_PATH|g" \

setup.py

@@ -31,7 +31,8 @@ setup(name='ubuntu-dev-tools',
                'massfile',
                'submittodebian',
                'get-build-deps',
-               'dgetlp'
+               'dgetlp',
+               'grab-attachments'
             ],
     packages=['ubuntutools'],
 )