Merge remote-tracking branch 'upstream/debian/sid' into debian/sid

[apt.git] / prepare-release

diff --git a/prepare-release b/prepare-release
index 6229ee1fdc64243dc6844ab30634e09c51849105..3c81a21cbdf5fa1246ea5d3cdf2dbfe5c05d1e04 100755 (executable)
--- a/prepare-release
+++ b/prepare-release
@@ -2,7 +2,6 @@
 set -e
 
 cd "$(readlink -f $(dirname $0))"
-dpkg-checkbuilddeps -d 'libxml2-utils'
 
 if [ -n "${GBP_BUILD_DIR}" ]; then
    cd "$GBP_BUILD_DIR"
@@ -11,7 +10,7 @@ fi
 VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p')
 DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p')
 
-LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')"
+LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/contrib/macros.h | sed 's/\.$//')"
 LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
 
 librarysymbolsfromfile() {
@@ -68,6 +67,8 @@ elif [ "$1" = 'post-build' ]; then
                echo >&2 'REMEMBER: Change to a valid distribution before release'
        fi
 
+       dpkg-checkbuilddeps -d 'libxml2-utils'
+
        # check the manpages with each vendor for vendor-specific errors…
        find vendor -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2 | while read DISTRO; do
                ln -sf ../vendor/${DISTRO}/apt-vendor.ent doc
@@ -102,6 +103,8 @@ elif [ "$1" = 'buildlog' ]; then
                librarysymbolsfromfile "$2"
                shift
        done
+elif [ "$1" = 'travis-ci' ]; then
+       apt-get install -q --no-install-recommends $(sed -n -e '/^Build-Depends: /,/^Build-Depends-Indep: / {p}' debian/control | sed -e 's#([^)]*)##g' -e 's#^Build-Depends\(-Indep\)\?: ##' | tr -d ',')
 else
        echo >&1 "Usage:\t$0 pre-export
 \t$0 post-build