Merged Ryan Kavanagh's fixes for mk-sbuild-lv and new ubuild-rdeps.

debian/changelog

@@ -7,11 +7,17 @@ ubuntu-dev-tools (0.72) UNRELEASED; urgency=low
   [ Siegfried-Angel Gevatter Pujals ]
   * pbuilder-dist:
      - Add squeeze as a Debian distribution. Thanks to Marco Rodrigues.
+  
   [ Nathan Handler ]
   * pull-debian-source:
     - Add support for etch/oldstable
     - Make script work for codenames (etch, lenny, squeeze, sid)
   
+  [ Ryan Kavanagh ]
+  * Fixed mk-sbuild-lv (s/DEBOOTSTRAP_MIRRORS/DEBOOTSTRAP_MIRROR/).
+  * Ported devscripts' build-rdeps to Ubuntu and named it ubuild-rdeps.
+    Dropped reverse-build-depends. (LP: #272273)
+
  -- Nathan Handler <nhandler@ubuntu.com>  Sat, 28 Mar 2009 15:19:26 +0100
 
 ubuntu-dev-tools (0.71) jaunty; urgency=low

mk-sbuild-lv

@@ -250,7 +250,7 @@ sudo mount "$CHROOT_PATH" "$MNT"
 if [ $DEBIAN ]; then
     sudo cdebootstrap -f build $arch_opt $variant_opt "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://ftp.debian.org/debian}"
 else
-    sudo debootstrap $arch_opt $variant_opt "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}"
+    sudo debootstrap --variant=buildd $arch_opt $variant_opt "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}"
 fi
 # Update the package sources
 TEMP_SOURCES=`mktemp -t sources-XXXXXX`
@@ -263,8 +263,8 @@ else
     # Start DEBIAN
     if [ $DEBIAN ]; then
         cat > "$TEMP_SOURCES" << EOM
-deb ${DEBOOTSTRAP_MIRRORS:-http://ftp.debian.org/debian} RELEASE main non-free contrib
+deb ${DEBOOTSTRAP_MIRROR:-http://ftp.debian.org/debian} RELEASE main non-free contrib
-deb-src ${DEBOOTSTRAP_MIRRORS:-http://ftp.debian.org/debian} RELEASE main non-free contrib
+deb-src ${DEBOOTSTRAP_MIRROR:-http://ftp.debian.org/debian} RELEASE main non-free contrib
 EOM
         if [ "$RELEASE" != "sid" ]; then
         cat >> "$TEMP_SOURCES" << EOM

reverse-build-depends

@@ -1,70 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2007 Siegfried-A. Gevatter <rainct@ubuntu.com>
-# Based upon a short script by an unknown author
-#
-# ##################################################################
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# See file /usr/share/common-licenses/GPL for more details.
-#
-# ##################################################################
-#
-# This script is used to find the reverse build dependencies
-# that a package has.
-
-usage() {
-	echo "Usage: $0 [-c|-s] <package name>"
-	echo "Options:"
-	echo " -c: Print only the number of reverse dependencies."
-	echo " -s: Print all reverse dependencies in a single line."
-}
-
-if [ "$1" = '-c' ]
-then
-	count=1
-	shift
-fi
-
-if [ "$1" = '-s' ]
-then
-	single_line=1
-	shift
-fi
-
-if [ $# -ne 1 ];
-then
-	usage
-	exit 1
-fi
-
-if [ "$1" = '-h' ] || [ "$1" = '--help' ]
-then
-	usage
-	exit 0
-fi
-
-result=$(
-	grep-dctrl -sPackage -F Build-Depends,Build-Depends-Indep $1 \
-	/var/lib/apt/lists/*Sources | cut -d ' ' -f 2)
-
-if [ -z $count ] && [ -z $single_line ]
-then
-	echo "$result"
-else
-	if [ -z $count ]
-	then
-		echo $result
-	else 
-		echo "$result" | wc -l
-	fi
-fi

ubuild-rdeps

@@ -0,0 +1,269 @@
+#!/usr/bin/perl
+#   Copyright (C) Patrick Schoenfeld
+#   Copyright (C) 2009 Ryan Kavanagh
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+=head1 NAME
+
+build-rdeps - find packages that depend on a specific package to build (reverse build depends)
+
+=head1 SYNOPSIS
+
+B<build-rdeps> I<package>
+
+=head1 DESCRIPTION
+
+B<build-rdeps> searches for all packages that build-depend on the specified package.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-u> B<--update>
+
+Run apt-get update before searching for build-depends.
+
+=item B<-s> B<--sudo>
+
+Use sudo when running apt-get update. Has no effect if -u is ommitted.
+
+=item B<--distribution>
+
+Select another distribution, which is searched for build-depends.
+
+=item B<-m> B<--print-maintainer>
+
+Print the value of the maintainer field for each package.
+
+=item B<-d> B<--debug>
+
+Run the debug mode
+
+=item B<--help>
+
+Show the usage information.
+
+=item B<--version>
+
+Show the version information.
+
+=back
+
+=cut
+
+use warnings;
+use strict;
+use File::Basename;
+use File::Find;
+use Getopt::Long;
+use Pod::Usage;
+use Data::Dumper;
+my $progname = basename($0);
+my $version = '1.0';
+my $dctrl = "/usr/bin/grep-dctrl";
+my $sources_path = "/var/lib/apt/lists/";
+my $source_pattern = ".*_dists_jaunty_.*Sources\$";
+my @source_files;
+my $sources_count=0;
+my $opt_debug;
+my $opt_update;
+my $opt_sudo;
+my $opt_maintainer;
+my $opt_mainonly;
+my $opt_distribution;
+
+if (!(-x $dctrl)) {
+	die "$progname: Fatal error. grep-dctrl is not available.\nPlease install the 'dctrl-tools' package.\n";
+}
+
+sub version {
+	print <<"EOT";
+This is $progname $version, from the Debian devscripts package, v. ###VERSION###
+This code is copyright by Patrick Schoenfeld, all rights reserved.
+It comes with ABSOLUTELY NO WARRANTY. You are free to redistribute this code
+under the terms of the GNU General Public License, version 2 or later.
+EOT
+exit (0);
+}
+
+sub usage {
+	print <<"EOT";
+usage: $progname packagename
+       $progname --help
+       $progname --version
+
+Searches for all packages that build-depend on the specified package.
+
+Options:
+   -u, --update                  Run apt-get update before searching for build-depends.
+                                 (needs root privileges)
+   -s, --sudo                    Use sudo when running apt-get update
+                                 (has no effect when -u is ommitted)
+   -d, --debug                   Enable the debug mode
+   -m, --print-maintainer        Print the maintainer information (experimental)
+   --distribution distribution   Select a distribution to search for build-depends
+                                 (Default: jaunty)
+   --only-main                   Ignore universe and multiverse
+
+EOT
+version;
+}
+
+sub findsources {
+	if (/$source_pattern/ and $sources_count <= 3) {
+		unless ($opt_mainonly and /(universe|multiverse)/) {
+			push(@source_files, $_);
+			$sources_count+=1;
+			print STDERR "DEBUG: Added source file: $_ (#$sources_count)\n" if ($opt_debug);
+		}
+	}
+}
+
+sub findreversebuilddeps {
+	my ($package, $source_file) = @_;
+	my %packages;
+	my $depending_package;
+	my $count=0;
+	my $maintainer_info='';
+
+	open(PACKAGES, "$dctrl -F Build-Depends,Build-Depends-Indep $package -s Package,Build-Depends,Build-Depends-Indep,Maintainer $source_file|");
+
+	while(<PACKAGES>) {
+		chomp;
+		print STDERR "$_\n" if ($opt_debug);
+		if (/Package: (.*)$/) {
+			$depending_package = $1;
+			$packages{$depending_package}->{'Build-Depends'} = 0;
+		}
+
+		if (/Maintainer: (.*)$/) {
+			if ($depending_package) {
+				$packages{$depending_package}->{'Maintainer'} = $1;
+			}
+		}
+
+		if (/Build-Depends: (.*)$/ or /Build-Depends-Indep: (.*)$/) {
+			if ($depending_package) {
+				print STDERR "$1\n" if ($opt_debug);
+				if ($1 =~ /^(.*\s)?$package([\s,]|$)/) {
+					$packages{$depending_package}->{'Build-Depends'} = 1;
+				}
+			}
+
+		}
+	}
+
+	while($depending_package = each(%packages)) {
+		if ($packages{$depending_package}->{'Build-Depends'} != 1) {
+			print STDERR "Ignoring package $depending_package because its not really build depending on $package.\n" if ($opt_debug);
+			next;
+		}
+		if ($opt_maintainer) {
+			$maintainer_info = "($packages{$depending_package}->{'Maintainer'})";
+		}
+
+		$count+=1;
+		print "$depending_package $maintainer_info \n";
+
+	}
+
+	if ($count == 0) {
+		print "No reverse build-depends found for $package.\n\n"
+	}
+	else {
+		print "\nFound a total of $count reverse build-depend(s) for $package.\n\n";
+	}
+}
+
+if ($#ARGV < 0) { usage; exit(0); }
+
+
+Getopt::Long::Configure('bundling');
+GetOptions(
+	"u|update" => \$opt_update,
+	"s|sudo" => \$opt_sudo,
+	"m|print-maintainer" => \$opt_maintainer,
+	"distribution=s" => \$opt_distribution,
+	"only-main" => \$opt_mainonly,
+	"d|debug" => \$opt_debug,
+	"h|help" => sub { usage; },
+	"v|version" => sub { version; }
+);
+
+my $package = shift;
+
+if (!$package) {
+	die "$progname: missing argument. expecting packagename\n";
+}
+
+print STDERR "DEBUG: Package => $package\n" if ($opt_debug);
+
+if ($opt_update) {
+	print STDERR "DEBUG: Updating apt-cache before search\n" if ($opt_debug);
+	my @cmd;
+	if ($opt_sudo) {
+		print STDERR "DEBUG: Using sudo to become root\n" if ($opt_debug);
+		push(@cmd, 'sudo');
+	}
+	push(@cmd, 'apt-get', 'update');
+	system @cmd;
+}
+
+if ($opt_distribution) {
+	print STDERR "DEBUG: Setting distribution to $opt_distribution" if ($opt_debug);
+	$source_pattern = ".*_dists_" . $opt_distribution . "_.*Sources\$";
+}
+
+# Find sources files
+find(\&findsources, $sources_path);
+
+if (($#source_files+1) <= 0) {
+	die "$progname: unable to find sources files.\nDid you forget to run apt-get update (or add --update to this command)?";
+}
+
+foreach my $source_file (@source_files) {
+	if ($source_file =~ /main/) {
+		print "Reverse Build-depends in main:\n";
+		print "------------------------------\n\n";
+		findreversebuilddeps($package, "$sources_path/$source_file");
+	}
+
+	if ($source_file =~ /universe/) {
+		print "Reverse Build-depends in universe:\n";
+		print "---------------------------------\n\n";
+		findreversebuilddeps($package, "$sources_path/$source_file");
+	}
+
+	if ($source_file =~ /multiverse/) {
+		print "Reverse Build-depends in multiverse:\n";
+		print "----------------------------------\n\n";
+		findreversebuilddeps($package, "$sources_path/$source_file");
+	}
+}
+
+=head1 LICENSE
+
+This code is copyright by Patrick Schoenfeld
+<schoenfeld@in-medias-res.com>, all rights reserved.
+This program comes with ABSOLUTELEY NO WARRANTY.
+You are free to redistribute this code under the terms of the
+GNU General Public License, version 2 or later.
+
+=head1 AUTHOR
+
+Patrick Schoenfeld <schoenfeld@in-medias-res.com>
+
+=cut