From db2c5f4fbe94c72f70d0f9ce9533fa0e8bd063b9 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sat, 10 Sep 2011 00:14:44 +0200 Subject: [PATCH] Removed get-build-deps, mk-build-deps -ir is equivalent (LP: #158108) --- debian/NEWS | 7 ++++ debian/changelog | 4 +- debian/control | 3 -- debian/copyright | 2 - doc/get-build-deps.1 | 60 --------------------------- get-build-deps | 96 -------------------------------------------- 6 files changed, 8 insertions(+), 164 deletions(-) delete mode 100644 doc/get-build-deps.1 delete mode 100755 get-build-deps diff --git a/debian/NEWS b/debian/NEWS index 9453b80..1915691 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,10 @@ +ubuntu-dev-tools (0.131) unstable; urgency=low + + get-build-deps was removed from ubuntu-dev-tools. The newer mk-build-deps in + devscripts is equivalent (with the -ir options). + + -- Stefano Rivera Sat, 10 Sep 2011 00:13:18 +0200 + ubuntu-dev-tools (0.129) unstable; urgency=low Several tools that worked against Launchpad but were not specific to Ubuntu diff --git a/debian/changelog b/debian/changelog index 1cd28c6..9ca1fb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,13 +18,11 @@ ubuntu-dev-tools (0.131) UNRELEASED; urgency=low (LP: #806633) * setup-packaging-environment: Software Sources isn't on the Administration menu, post Gnome 2 (LP: #841975) + * Removed get-build-deps, mk-build-deps -ir is equivalent (LP: #158108) [ Colin Watson ] * syncpackage: Fix typo. - [ Stefano Rivera ] - * - -- Stefano Rivera Thu, 08 Sep 2011 23:13:05 +0200 ubuntu-dev-tools (0.130) unstable; urgency=low diff --git a/debian/control b/debian/control index d20224d..f93c5b7 100644 --- a/debian/control +++ b/debian/control @@ -51,7 +51,6 @@ Recommends: bzr, debootstrap, genisoimage, libwww-perl, - pbulider | aptitude, pbuilder | cowdancer | sbuild, perl-modules, python-dns, @@ -76,8 +75,6 @@ Description: useful tools for Ubuntu developers - debian-distro-info - provides information about Debian's distributions. - dgetlp - download a source package from the Launchpad library. - distro-info - provides information about the distributions' releases. - - get-build-deps - install the build dependencies needed for a package - reading debian/control. - grab-merge - grabs a merge from merges.ubuntu.com easily. - grep-merges - search for pending merges from Debian. - harvest - grabs information about development opportunities from diff --git a/debian/copyright b/debian/copyright index 84445df..813fb0b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -117,13 +117,11 @@ License: GPL-3 Files: dch-repeat doc/dch-repeat.1 - doc/get-build-deps.1 doc/grep-merges.1 doc/mk-sbuild.1 doc/pull-lp-source.1 doc/pull-revu-source.1 doc/ubuntu-build.1 - get-build-deps grep-merges mk-sbuild pull-lp-source diff --git a/doc/get-build-deps.1 b/doc/get-build-deps.1 deleted file mode 100644 index 9f21e00..0000000 --- a/doc/get-build-deps.1 +++ /dev/null @@ -1,60 +0,0 @@ -.TH GET\-BUILD\-DEPS 1 "October 27, 2007" "ubuntu-dev-tools" - -.SH NAME -get\-build\-deps \- install build dependencies for one or more packages - -.SH SYNOPSIS -\fBget\-build\-deps\fP [\fIpackage name\fR] - -.SH DESCRIPTION -\fBget\-build\-deps\fP is a script to install the build dependencies for -either a local source package or one or more packages from the repositories. -.PP -In order to obtain all missing build dependencies for a package on -which source you are currently working, just run this script without -any argument, and it'll read its debian/control file to determine the -missing build dependencies. -.PP -Alternatively, you can call it with a list of space-separated package -names, or the name of a single file which contains the package names -each on a line. -Then it will install the missing dependencies for those packages using -"apt\-get build\-dep". - -.SH EXAMPLES -.TP -get\-build\-deps -Looks for a debian/control file in the current working directory and -installs the dependencies listed there. -.TP -get\-build\-deps geany -Installs the build dependencies for the version of \fBgeany\fP that's -in the repositories. -.TP -get\-build\-deps geany epiphany\-browser rhythmbox -Same as the previous example but also with the dependencies for -.B epiphany\-browser -and -.BR rhythmbox . -.TP -get\-build\-deps ./package_list.txt -Reads the file -.B package_list.txt -(relative to the current working directory), -where each line contains the name of a package, and installs the -dependencies for the versions of all those that are in the repositories. - -.SH KNOWN BUGS AND LIMITATIONS -When it's being used to install the missing dependencies for a local -source package (i.e., no arguments are passed to it) it doesn't check -for the dependencies to match the indicated versions, but just installs -the newest one available in the repositories. - -.SH SEE ALSO -.BR dpkg\-checkbuilddeps (1), -.BR apt\-get (8) - -.SH AUTHORS -\fBget\-build\-deps\fP and this manual page have been written by Siegfried-Angel -Gevatter Pujals . -They are released under the GNU General Public License, version 3 or later. diff --git a/get-build-deps b/get-build-deps deleted file mode 100755 index 60d4668..0000000 --- a/get-build-deps +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash -# -# Copyright 2007 (C) Siegfried-A. Gevatter -# -# ################################################################## -# -# 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 3 -# 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. -# -# ################################################################## -# -# If you don't pass it any argument, this script will check if -# there's a control (debian/control) file somewhere in the current -# directory, and if it's so, it'll install the build dependencies -# listed there. -# -# If it gets a single argument, and it's the name of a file, it will -# read it, supposing that each line contains the name of a package, -# and install the build dependencies for all those. -# -# Otherwise, if there is more than one argument, or the given argument -# isn't the name of an existing file, it will suppose that the each -# argument is the name of a package, and install the dependencies for -# all of them. - -if [ $# -eq 0 ]; then - ######################################################### - # Install the dependencies for the source package the - # user is working on. - - if [ -f ../debian/control ]; then - cd .. - elif [ ! -f ./debian/control ]; then - echo "\ -Couldn't find file debian/control. You have to be inside the \ -source directory of a Debian package or pass the name of the \ -package(s) whose build dependencies you want to install in order \ -to use this script." - exit 1 - fi - - filepath="`pwd`/debian/control" - missing_dependencies=$(dpkg-checkbuilddeps 2>&1) - - if [ -z "$missing_dependencies" ]; then - echo "The build dependencies described in «$filepath» are already satisfied." - exit 0 - fi - - if [ ! -x /usr/lib/pbuilder/pbuilder-satisfydepends -a -z "$(which aptitude)" ]; then - echo "Please install either «pbuilder» or «aptitude» in order to use this utility" - exit 1 - fi - - echo "Installing the build dependencies described in «$filepath»..." - - if [ -x /usr/lib/pbuilder/pbuilder-satisfydepends ]; then - sudo /usr/lib/pbuilder/pbuilder-satisfydepends - else - echo "Warning: «pbuilder» isn't installed, falling back to «dpkg-checkbuilddeps»." - sudo aptitude --without-recommends install $(echo $missing_dependencies | awk -F': ' '{ print $3 }' | sed 's/([^)]*)//g' | sed 's/|\s[^\s]*//g') - #' <--- Fix to avoid Geanys markup breaking - fi - exit 0 -elif [ $# -eq 1 ]; then - ######################################################### - # Check if the given argument is a file name, else - # continue after the if. - if [ -f $1 ]; then - packages='' - echo "Installing the build dependencies for the following packages:" - while read line - do - echo $line - packages="$packages $line" - done < $1 - echo - sudo apt-get build-dep $packages - exit 0 - fi -fi - -######################################################### -# All arguments should be package names, install -# their build dependencies. - -sudo apt-get build-dep $*