diff -Nru pbuilder-0.229/debian/changelog pbuilder-0.229.1/debian/changelog --- pbuilder-0.229/debian/changelog 2017-10-28 13:57:24.000000000 +0000 +++ pbuilder-0.229.1/debian/changelog 2018-01-22 18:53:05.000000000 +0000 @@ -1,3 +1,25 @@ +pbuilder (0.229.1) unstable; urgency=medium + + [ Mattia Rizzolo ] + * d/control: Remove dependency on wget, unused. + * d/copyright: + + Bump copyright year for 2018. + + Use HTTPS in Format field. + + Remove Upstream contact pointing to Junichi. + * createbuildenv: + + Print a tail of debootstrap.log when debootstrap fails Closes: #870074 + * buildpackage: + + Ignore the R³ field if the installed dpkg is too old to appropriately + deal with it. + + [ James Clarke ] + * d/control: + + Change Vcs-* to point to salsa. + + Bump standards version to 4.1.3, no changes needed. + + Bump debhelper compat level to 11. + + -- Mattia Rizzolo Mon, 22 Jan 2018 19:53:05 +0100 + pbuilder (0.229) unstable; urgency=medium [ Mattia Rizzolo ] diff -Nru pbuilder-0.229/debian/compat pbuilder-0.229.1/debian/compat --- pbuilder-0.229/debian/compat 2016-12-26 14:49:57.000000000 +0000 +++ pbuilder-0.229.1/debian/compat 2018-01-22 18:50:45.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru pbuilder-0.229/debian/control pbuilder-0.229.1/debian/control --- pbuilder-0.229/debian/control 2017-10-27 20:51:53.000000000 +0000 +++ pbuilder-0.229.1/debian/control 2018-01-22 18:50:45.000000000 +0000 @@ -8,16 +8,16 @@ Build-Depends: dblatex, debconf | debconf-2.0, - debhelper (>= 10), + debhelper (>= 11~), docbook-xsl, ldp-docbook-xsl, po-debconf, po4a, xsltproc, -Standards-Version: 4.1.1 +Standards-Version: 4.1.3 Rules-Requires-Root: no -Vcs-Git: https://anonscm.debian.org/git/pbuilder/pbuilder.git -Vcs-Browser: https://anonscm.debian.org/git/pbuilder/pbuilder.git +Vcs-Git: https://salsa.debian.org/pbuilder-team/pbuilder.git +Vcs-Browser: https://salsa.debian.org/pbuilder-team/pbuilder Package: pbuilder Architecture: all @@ -25,7 +25,6 @@ Depends: debootstrap | cdebootstrap, dpkg-dev (>= 1.17.0), - wget, ${misc:Depends}, Recommends: devscripts, diff -Nru pbuilder-0.229/debian/copyright pbuilder-0.229.1/debian/copyright --- pbuilder-0.229/debian/copyright 2017-04-23 16:52:17.000000000 +0000 +++ pbuilder-0.229.1/debian/copyright 2018-01-22 18:53:05.000000000 +0000 @@ -1,11 +1,10 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: pbuilder -Upstream-Contact: Junichi Uekawa Files: * Copyright: 2001-2009 Junichi Uekawa 2007-2010 Loïc Minier - 2015-2017 Mattia Rizzolo + 2015-2018 Mattia Rizzolo License: GPL-2+ 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 diff -Nru pbuilder-0.229/pbuilder-buildpackage pbuilder-0.229.1/pbuilder-buildpackage --- pbuilder-0.229/pbuilder-buildpackage 2017-10-27 20:46:17.000000000 +0000 +++ pbuilder-0.229.1/pbuilder-buildpackage 2018-01-06 15:57:30.000000000 +0000 @@ -146,7 +146,8 @@ fi RRR="$(get822field Rules-Requires-Root "$BUILDPLACE/$BUILDDIR/$BUILDSUBDIR/debian/control")" -if [[ "${RRR,,}" != no ]]; then +if [[ "${RRR,,}" != no ]] || + dpkg --compare-versions $($CHROOTEXEC dpkg-query -W -f '${Version}' dpkg-dev) lt 1.19.0 ; then DEBBUILDOPTS="${DEBBUILDOPTS:+$DEBBUILDOPTS }-rfakeroot" EXTRAPACKAGES="${EXTRAPACKAGES} fakeroot" log.i "using fakeroot in build." diff -Nru pbuilder-0.229/pbuilder-createbuildenv pbuilder-0.229.1/pbuilder-createbuildenv --- pbuilder-0.229/pbuilder-createbuildenv 2016-12-26 14:49:57.000000000 +0000 +++ pbuilder-0.229.1/pbuilder-createbuildenv 2017-11-28 15:17:36.000000000 +0000 @@ -76,6 +76,9 @@ "$MIRRORSITE" \ $DEBOOTSTRAPSCRIPT ) ; then log.e "$DEBOOTSTRAP failed" + log.e "Tail of debootstrap.log:" + tail -n 50 "$BUILDPLACE/debootstrap/debootstrap.log" + log.e "End of debootstrap.log" exit 1 fi