From 36cd6cd7425c1a9b068970f509f4b0b20d2bb9c8 Mon Sep 17 00:00:00 2001
From: Kees Cook <kees@outflux.net>
Date: Mon, 21 Jan 2008 09:45:16 -0800
Subject: [PATCH]   * what-patch: change default operation back to quiet mode
 -- script is used     in automated tools, so default behavior is best to
 leave unchanged.   * check-symbols: check for binary list very carefully.   *
 dch-repeat: add Hardy to distro list.   * mk-sbuild-lv: use -r instead of -f
 for possible debootstrap symlinks.

---
 check-symbols    |  6 +++++-
 dch-repeat       |  2 +-
 debian/changelog |  9 ++++++++-
 debian/control   |  2 +-
 mk-sbuild-lv     |  2 +-
 what-patch       | 36 ++++++++++++++++++++----------------
 6 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/check-symbols b/check-symbols
index ef5ed05..5498107 100755
--- a/check-symbols
+++ b/check-symbols
@@ -6,7 +6,9 @@
 # This script is used to get a diff of the exported symbols of all .so files in
 # every binary package of package $1.
 
-PACKAGES="`apt-cache showsrc $1 | grep ^Binary | sed 's/Binary\:\ //g;s/\,//g' | sort -u`"
+DISTRO=$(lsb_release -c -s)
+VERSION=$(apt-cache madison "$1" | grep -- "$DISTRO"'/.*Sources$' | awk '{print $3}')
+PACKAGES=$(apt-cache showsrc "$1" | grep-dctrl -s Binary -F Version "$VERSION" | sed 's/Binary\:\ //g;s/\,//g' | sort -u)
 DEBLINE=""
 DEBUG=False
 
@@ -21,6 +23,8 @@ else
     DEBDIR="$2";
 fi
 
+sudo apt-get install $PACKAGES
+
 for pack in $PACKAGES;
 do
     for lib in `dpkg -L $pack | grep -E "\.so$" | sort -u`;
diff --git a/dch-repeat b/dch-repeat
index 07bfa53..705aafb 100755
--- a/dch-repeat
+++ b/dch-repeat
@@ -30,7 +30,7 @@ EOM
     exit(0);
 }
 
-my @releases = ('dapper', 'edgy', 'feisty', 'gutsy');
+my @releases = ('dapper', 'edgy', 'feisty', 'gutsy', 'hardy');
 
 #Getopt::Long::Configure("bundling", "no_ignore_case");
 our $opt_build_tree = "/scratch/ubuntu/build";
diff --git a/debian/changelog b/debian/changelog
index c53551c..2b7e971 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,7 +37,14 @@ ubuntu-dev-tools (0.25) UNRELEASED; urgency=low
   [ Daniel Holbach ]
   * hugdaylist: drop one Ubuntu filter statement.
 
- -- Daniel Holbach <daniel.holbach@ubuntu.com>  Mon, 21 Jan 2008 10:43:52 +0100
+  [ Kees Cook ]
+  * what-patch: change default operation back to quiet mode -- script is used
+    in automated tools, so default behavior is best to leave unchanged.
+  * check-symbols: check for binary list very carefully.
+  * dch-repeat: add Hardy to distro list.
+  * mk-sbuild-lv: use -r instead of -f for possible debootstrap symlinks.
+
+ -- Kees Cook <kees@ubuntu.com>  Mon, 21 Jan 2008 09:20:05 -0800
 
 ubuntu-dev-tools (0.24) hardy; urgency=low
 
diff --git a/debian/control b/debian/control
index 0742bab..5e18b06 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Standards-Version: 3.7.3
 Package: ubuntu-dev-tools
 Architecture: all
 Section: devel
-Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.25), reportbug (>= 3.39ubuntu1), python-debian
+Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.25), reportbug (>= 3.39ubuntu1), python-debian, dctrl-tools, lsb-release
 Recommends: bzr, pbuilder
 Conflicts: devscripts (<< 2.10.7ubuntu5)
 Replaces: devscripts (<< 2.10.7ubuntu5)
diff --git a/mk-sbuild-lv b/mk-sbuild-lv
index 18d7c46..51b1829 100755
--- a/mk-sbuild-lv
+++ b/mk-sbuild-lv
@@ -163,7 +163,7 @@ if [ `sudo vgdisplay -c "$VG" | wc -l` -eq 0 ]; then
 fi
 
 # Is the specified release known to debootstrap?
-if [ ! -f "/usr/share/debootstrap/scripts/$RELEASE" ]; then
+if [ ! -r "/usr/share/debootstrap/scripts/$RELEASE" ]; then
     echo "Specified release not known to debootstrap" >&2
     exit 1
 else
diff --git a/what-patch b/what-patch
index 49f1a15..1af34ef 100755
--- a/what-patch
+++ b/what-patch
@@ -4,28 +4,32 @@
 # Modified by Daniel Hahler <ubuntu@thequod.de>
 # License: GPLv2
 
-if [ "$1" ] && ( [ $1 = '-h' ] || [ $1 = '--help' ] )
+# Default operation reports only the patch system.  Verbose mode can be
+# enabled with -v
+if [ "$1" = "-h" ] || [ "$1" = "--help" ]
 then
-	echo "Usage: $0 [-q]"
-	echo
-	echo "Run this inside the source directory of a Debian package and it will detect the patch system that it uses."
-	echo
-	echo "Additionally, it will try to print a list of all those files outside the debian/ directory that have been modified (if any); if you don't want this, use the -q option."
+	cat <<EOM
+Usage: $0 [-v]
+
+Run this inside the source directory of a Debian package and it will detect
+the patch system that it uses.
+
+ -v: Print a list of all those files outside the debian/ directory that have
+     been modified (if any).
+EOM
 	exit 0
 fi
 
-if [[ -d debian ]]; then
-	cd . # pass
-elif [[ -d ../debian ]]; then
+while [ ! -r debian/rules ];
+do
+	if [ "$PWD" = "/" ]; then
+		echo "Can't find debian/rules."
+		exit 1
+	fi
 	cd ..
-elif [[ -d ../patches ]]; then
-	cd ../.. 
-else
-	echo "Can't find debian/rules."
-	exit 1
-fi
+done
 
-if [ "$1" != "-q" ]
+if [ "$1" = "-v" ]
 then
 	files=`lsdiff -z ../$(dpkg-parsechangelog | grep ^Source: | sed -e "s/^Source: //")_$(dpkg-parsechangelog | grep ^Version: | sed -e "s/^Version: //").diff.gz 2>/dev/null | grep -v 'debian/'`
 	if [ -n "$files" ]