diff options
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/control | 32 | ||||
-rwxr-xr-x | debian/rules | 56 | ||||
-rw-r--r-- | pbuilder-buildpackage-funcs | 2 | ||||
-rw-r--r-- | pbuilder-satisfydepends-gdebi | 11 | ||||
-rw-r--r-- | pdebuild | 4 |
6 files changed, 59 insertions, 52 deletions
diff --git a/debian/changelog b/debian/changelog index f7aa97f..56639e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pbuilder (0.182) UNRELEASED; urgency=low + + * UNRELEASED snapshot banner + + -- Loic Minier <lool@dooz.org> Fri, 27 Jun 2008 19:11:12 +0200 + pbuilder (0.181) unstable; urgency=low [ Esko Arajärvi ] diff --git a/debian/control b/debian/control index 567d0b8..4124285 100644 --- a/debian/control +++ b/debian/control @@ -2,17 +2,35 @@ Source: pbuilder Section: devel Priority: extra Maintainer: Debian pbuilder maintenance team <pbuilder-maint@lists.alioth.debian.org> -Uploaders: Junichi Uekawa <dancer@debian.org>, Matt Kraai <kraai@debian.org> -Build-Depends: debhelper (>= 4.1.16), docbook-xsl, ldp-docbook-xsl (>= 0.0.20040321-0.1), xsltproc, dpkg-dev (>= 1.13.19), dblatex, rootstrap [i386 amd64], debconf|debconf-2.0, po-debconf, po4a +Uploaders: Junichi Uekawa <dancer@debian.org>, + Matt Kraai <kraai@debian.org> +Build-Depends: debhelper (>= 4.1.16), + docbook-xsl, + ldp-docbook-xsl (>= 0.0.20040321-0.1), + xsltproc, + dpkg-dev (>= 1.13.19), + dblatex, + debconf|debconf-2.0, + po-debconf, + po4a Standards-Version: 3.7.2 Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git Package: pbuilder Architecture: all -Depends: cdebootstrap|debootstrap, wget, gcc, debianutils (>= 1.13.1), coreutils (>= 4.5.8-1), ${misc:Depends} -Recommends: fakeroot, sudo, devscripts, cowdancer -Suggests: pbuilder-uml +Depends: cdebootstrap | debootstrap, + wget, + gcc, + debianutils (>= 1.13.1), + coreutils (>= 4.5.8-1), + ${misc:Depends} +Recommends: fakeroot, + sudo, + devscripts, + cowdancer +Suggests: pbuilder-uml, + gdebi Description: personal package builder for Debian packages pbuilder constructs a chroot system, and builds a package inside the chroot. @@ -34,7 +52,9 @@ Description: personal package builder for Debian packages Package: pbuilder-uml Architecture: i386 amd64 -Depends: rootstrap (>= 0.3.9-1), user-mode-linux, pbuilder (= ${source:Version}) +Depends: rootstrap (>= 0.3.9-1), + user-mode-linux, + pbuilder (= ${source:Version}) Description: user-mode-linux version of pbuilder pbuilder-uml uses a User-mode-linux system, and builds Debian packages inside the UML image. It is an ideal system to use to check diff --git a/debian/rules b/debian/rules index 40d082e..acecdef 100755 --- a/debian/rules +++ b/debian/rules @@ -1,34 +1,15 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This is the debhelper compatability version to use. -ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - -build: configure-stamp build-stamp +build: build-stamp build-stamp: dh_testdir - - touch build-stamp + touch $@ clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. + rm -f build-stamp -$(MAKE) clean - dh_clean install: build @@ -36,13 +17,10 @@ install: build dh_testroot dh_clean -k dh_installdirs - - # Add here commands to install the package into debian/build-package. $(MAKE) check $(MAKE) install DESTDIR=$(CURDIR)/debian/pbuilder dh_movefiles -ppbuilder-uml --sourcedir=debian/pbuilder -# Build architecture-independent files here. binary-indep: build install dh_testdir -i dh_testroot -i @@ -58,23 +36,19 @@ binary-indep: build install dh_md5sums -i dh_builddeb -i -# Build architecture-dependent files here. binary-arch: build install -ifneq (,$(findstring ${ARCH},i386 amd64)) - dh_testdir -a - dh_testroot -a - dh_installdocs -a + dh_testdir -s + dh_testroot -s + dh_installdocs -s dh_installman -ppbuilder-uml pbuilder-user-mode-linux.1 pbuilder-uml.conf.5 pdebuild-user-mode-linux.1 - dh_installchangelogs -a - dh_link -a - dh_compress -a -X.pdf - dh_fixperms -a - dh_installdeb -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a -endif - + dh_installchangelogs -s + dh_link -s + dh_compress -s -X.pdf + dh_fixperms -s + dh_installdeb -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean binary-indep binary-arch binary install diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index a36fcb4..780ff21 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -37,7 +37,7 @@ function checkbuilddep () { yes) BUILDOPT="--binary-arch";; *) ;; esac - if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" ; then + if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --internal-chrootexec "${CHROOTEXEC}" --chroot "${BUILDPLACE}" "${BUILDOPT}" ; then : else # If asked to preserve the build place, and pbuilder-satisfydepends diff --git a/pbuilder-satisfydepends-gdebi b/pbuilder-satisfydepends-gdebi index 8bd9d5f..6e3ae06 100644 --- a/pbuilder-satisfydepends-gdebi +++ b/pbuilder-satisfydepends-gdebi @@ -24,8 +24,15 @@ set -e function checkbuilddep_internal () { $CHROOTEXEC apt-get -y --force-yes install gdebi-core - INSTALL=$($CHROOTEXEC /usr/bin/gdebi --quiet --apt-line $DEBIAN_CONTROL) - $CHROOTEXEC /usr/bin/apt-get install -y $INSTALL + NO_RECOMMENDS="" + if VERSION=$($CHROOTEXEC /usr/bin/gdebi --version 2>/dev/null); then + if dpkg --compare-versions $VERSION ge 0.3.9; then + NO_RECOMMENDS="-o APT::Install-Recommends=false" + fi + fi + + INSTALL=$($CHROOTEXEC /usr/bin/gdebi --quiet --apt-line $NO_RECOMMENDS $DEBIAN_CONTROL) + $CHROOTEXEC /usr/bin/apt-get install -y --force-yes $INSTALL } . /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams @@ -45,7 +45,7 @@ export BUILDRESULTUID=$(id -u) export BUILDRESULTGID=$(id -g) if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then - ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}" --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD" + ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) "$@" -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}" --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD" if [ -d "${BUILDRESULT}" ]; then for files in $(sed -rn '/^Files:/,${s/^ .* ([^ ]+)$/\1/p}' ../${CHANGES}); do cp -a ../"$files" "${BUILDRESULT}" @@ -60,7 +60,7 @@ else echo "W: Unmet build-dependency in source" >&2 fi echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | perl -pe 's/(^|\s)-[bB](\s|$)/$1$2/g' | /bin/bash - ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --build "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" --debbuildopts "${DEBBUILDOPTS}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc + ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --build ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" --debbuildopts "${DEBBUILDOPTS}" "$@" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc fi # do signing with optional key specifier |