diffstat for pbuilder-0.221ubuntu1 pbuilder-0.221ubuntu2 0001-Merge-with-Debian-packaging-and-add-Ubuntu-delta.patch | 1185 ------------ debian/changelog | 11 debian/control | 6 pbuilder-apt-config | 8 4 files changed, 18 insertions(+), 1192 deletions(-) diff -Nru pbuilder-0.221ubuntu1/0001-Merge-with-Debian-packaging-and-add-Ubuntu-delta.patch pbuilder-0.221ubuntu2/0001-Merge-with-Debian-packaging-and-add-Ubuntu-delta.patch --- pbuilder-0.221ubuntu1/0001-Merge-with-Debian-packaging-and-add-Ubuntu-delta.patch 2015-11-24 08:35:32.000000000 +0000 +++ pbuilder-0.221ubuntu2/0001-Merge-with-Debian-packaging-and-add-Ubuntu-delta.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1185 +0,0 @@ -From 9aed3c8e62bf5755fde47be168535b0e550ff6aa Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Sat, 31 Oct 2015 11:31:41 +0100 -Subject: [PATCH] Merge with Debian packaging and add Ubuntu delta - ---- - debian/changelog | 583 ++++++++++++++++++++++++++++++++++++++++++++++ - debian/control | 9 +- - debian/pbuilder.config | 2 +- - debian/pbuilder.templates | 2 +- - debian/po/ca.po | 4 +- - debian/po/cs.po | 4 +- - debian/po/da.po | 4 +- - debian/po/de.po | 2 +- - debian/po/es.po | 4 +- - debian/po/eu.po | 4 +- - debian/po/fi.po | 4 +- - debian/po/fr.po | 4 +- - debian/po/gl.po | 4 +- - debian/po/it.po | 4 +- - debian/po/ja.po | 4 +- - debian/po/nl.po | 2 +- - debian/po/pt.po | 4 +- - debian/po/pt_BR.po | 4 +- - debian/po/ro.po | 4 +- - debian/po/ru.po | 4 +- - debian/po/sk.po | 4 +- - debian/po/sr.po | 2 +- - debian/po/sr@latin.po | 2 +- - debian/po/sv.po | 4 +- - debian/po/templates.pot | 7 +- - debian/po/tr.po | 2 +- - pbuilderrc | 5 +- - 27 files changed, 633 insertions(+), 49 deletions(-) - -diff --git a/debian/changelog b/debian/changelog -index 7b562a3..3d54381 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,3 +1,13 @@ -+pbuilder (0.220ubuntu1) xenial; urgency=medium -+ -+ * Merge from debian unstable, remaining changes: -+ - pbuilderrc, debian/pbuilder.config, debian/po/*: Set default archive -+ mirror to "archive.ubuntu.com/ubuntu". -+ - Remove --keyring override from default pbuilderrc -+ - Set default distribution to "xenial" -+ -+ -- Gianfranco Costamagna Wed, 28 Oct 2015 09:59:36 +0100 -+ - pbuilder (0.220) unstable; urgency=medium - - [ Ritesh Raj Sarraf ] -@@ -186,6 +196,23 @@ pbuilder (0.216) experimental; urgency=medium - - -- Mattia Rizzolo Wed, 26 Aug 2015 12:56:57 +0000 - -+pbuilder (0.215+nmu4ubuntu1) wily; urgency=low -+ -+ * Merge from Debian unstable (LP #1469735). Remaining changes: -+ - Added basic DEP-8 autopkgtest -+ - debian/control: Recommend aptitude since it's needed by -+ pbuilder-satisfydepends -+ - pbuilderrc, debian/pbuilder.config: Set default archive mirror -+ to "archive.ubuntu.com/ubuntu". -+ - debian/rules: install temporary locale so man page tests don't -+ cause FTBFS. -+ - Add build-dependency on locales, which was always used but -+ appears to have previously been preinstalled in the build chroots. -+ - Remove --keyring override from default pbuilderrc -+ - Set default distribution to "wily" -+ -+ -- Scott Howard Tue, 07 Jul 2015 14:53:39 -0400 -+ - pbuilder (0.215+nmu4) unstable; urgency=low - - * Non-maintainer upload. -@@ -260,6 +287,99 @@ pbuilder (0.215+nmu1) unstable; urgency=low - - -- Thorsten Glaser Thu, 22 May 2014 20:37:51 +0200 - -+pbuilder (0.215ubuntu12) wily; urgency=medium -+ -+ * pbuilderrc: Set default distribution to "wily" -+ -+ -- Hans Joachim Desserud Sat, 27 Jun 2015 13:18:57 +0200 -+ -+pbuilder (0.215ubuntu11) vivid; urgency=medium -+ -+ * pbuilderrc: Set default distribution to "vivid" -+ -+ -- Hans Joachim Desserud Sat, 28 Feb 2015 16:40:27 +0100 -+ -+pbuilder (0.215ubuntu10) utopic; urgency=medium -+ -+ * Remove --keyring override from default pbuilderrc (LP: #599695) -+ -+ -- Phillip Susi Wed, 11 Jun 2014 13:37:37 -0400 -+ -+pbuilder (0.215ubuntu9) utopic; urgency=medium -+ -+ * pbuilderrc: Set default distribution to "utopic" (lp: #1316423) -+ -+ -- B. Clausius Sun, 25 May 2014 09:14:44 +0200 -+ -+pbuilder (0.215ubuntu8) utopic; urgency=medium -+ -+ * debian/tests/control: Updated Depends to allow more capable procenv to be -+ built. -+ -+ -- James Hunt Wed, 04 Jun 2014 11:27:10 +0200 -+ -+pbuilder (0.215ubuntu7) trusty; urgency=medium -+ -+ * debian/tests/control: build-depend on libcap-dev since procenv 0.33 now -+ uses that. -+ -+ -- James Hunt Tue, 18 Mar 2014 13:57:11 +0100 -+ -+pbuilder (0.215ubuntu6) trusty; urgency=medium -+ -+ * debian/tests/build_procenv: Use first remote url from sources.list -+ rather than hard-coding the set of architectures that use particular -+ ubuntu archives (since the latter strategy does not require -+ maintenance). -+ * debian/tests/control: -+ - Depend on haveged for entropy. -+ - Add architecture-specific depends on libnuma1 for the test package that -+ is built (procenv). -+ -+ -- James Hunt Wed, 05 Mar 2014 14:40:22 +0100 -+ -+pbuilder (0.215ubuntu5) trusty; urgency=medium -+ -+ * Add build-dependency on locales, which was always used but appears to -+ have previously been preinstalled in the build chroots. -+ -+ -- Steve Langasek Wed, 05 Mar 2014 03:54:08 +0000 -+ -+pbuilder (0.215ubuntu4) trusty; urgency=medium -+ -+ * debian/tests/build_procenv: on Ubuntu, select the correct archive mirror -+ for the build architecture. -+ -+ -- Steve Langasek Tue, 04 Mar 2014 17:07:16 -0800 -+ -+pbuilder (0.215ubuntu3) trusty; urgency=low -+ -+ * debian/tests/build_procenv: Add component universe for Ubuntu to make -+ procenv buildable (LP: #1247420) -+ -+ -- Jean-Baptiste Lallement Sun, 03 Nov 2013 18:46:58 +0100 -+ -+pbuilder (0.215ubuntu2) saucy; urgency=low -+ -+ * Fix typo in pbuilderrc -+ -+ -- Jonathan Riddell Fri, 16 Aug 2013 10:57:52 +0100 -+ -+pbuilder (0.215ubuntu1) saucy; urgency=low -+ -+ * Merge from Debian unstable. Remaining changes: -+ - pbuilderrc, debian/pbuilder.config: Set default archive mirror to -+ "archive.ubuntu.com/ubuntu". -+ - pbuilderrc: Set default keyring to the Ubuntu one. -+ - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS -+ - debian/rules: install temporary locale so man page tests don't cause -+ FTBFS. -+ - Added basic DEP-8 autopkgtest -+ - debian/control: Recommend aptitude since it's needed by pbuilder-satisfydepends -+ * pbuilderrc: Set default distribution to "saucy" -+ -+ -- Jackson Doak Fri, 16 Aug 2013 08:14:54 +1000 -+ - pbuilder (0.215) unstable; urgency=low - - * Do not try to use /dev/shm if /run/shm is not present. (closes: #702811, #702102) -@@ -278,6 +398,32 @@ pbuilder (0.214) unstable; urgency=low - - -- Junichi Uekawa Sat, 02 Mar 2013 16:47:04 +0900 - -+pbuilder (0.213ubuntu3) saucy; urgency=low -+ -+ * Recommend aptitude since it's needed by pbuilder-satisfydepends -+ -+ -- Jonathan Riddell Tue, 04 Jun 2013 15:58:28 +0100 -+ -+pbuilder (0.213ubuntu2) saucy; urgency=low -+ -+ * Added basic DEP-8 autopkgtest. -+ -+ -- James Hunt Mon, 27 May 2013 10:14:45 +0200 -+ -+pbuilder (0.213ubuntu1) raring; urgency=low -+ -+ * Merge from Debian unstable (LP: #1075347, LP: #1060101) -+ Remaining changes: -+ - pbuilderrc, debian/pbuilder.config: Set default archive mirror to -+ "archive.ubuntu.com/ubuntu". -+ - pbuilderrc: Set default keyring to the Ubuntu one. -+ - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS -+ - debian/rules: install temporary locale so man page tests don't cause -+ FTBFS. -+ * pbuilderrc: Set default distribution to "quantal" -+ -+ -- Maarten Bezemer Mon, 05 Nov 2012 23:27:25 +0100 -+ - pbuilder (0.213) unstable; urgency=low - - [ Beatrice Torracca ] -@@ -333,6 +479,20 @@ pbuilder (0.209) unstable; urgency=low - - -- Junichi Uekawa Fri, 30 Mar 2012 03:44:30 +0900 - -+pbuilder (0.208ubuntu1) precise; urgency=low -+ -+ * Merge from Debian unstable (LP: #952938) -+ Remaining changes: -+ - pbuilderrc, debian/pbuilder.config: Set default archive mirror to -+ "archive.ubuntu.com/ubuntu". -+ - pbuilderrc: Set default distribution to "precise" and the default -+ keyring to the Ubuntu one. -+ - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS -+ - debian/rules: install temporary locale so man page tests don't cause -+ FTBFS. -+ -+ -- Maarten Bezemer Wed, 14 Mar 2012 14:54:09 +0100 -+ - pbuilder (0.208) unstable; urgency=low - - [ Guido Günther ] -@@ -368,6 +528,28 @@ pbuilder (0.207) unstable; urgency=low - - -- Junichi Uekawa Sat, 10 Mar 2012 09:40:35 +0900 - -+pbuilder (0.206ubuntu2) precise; urgency=low -+ -+ * Auto complete flags and required file/directory names (Closes: #933339) -+ -+ -- Maarten Bezemer Sun, 19 Feb 2012 22:30:48 +0100 -+ -+pbuilder (0.206ubuntu1) precise; urgency=low -+ -+ * Merge from Debian testing. (LP: #931936, LP: #788768) -+ Remaining changes: -+ - pbuilderrc, debian/pbuilder.config: Set default archive mirror to -+ "archive.ubuntu.com/ubuntu". -+ - pbuilderrc: Set default distribution to "precise" and the default -+ keyring to the Ubuntu one. -+ - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS -+ - debian/rules: install temporary locale so man page tests don't cause -+ FTBFS. -+ - Auto complete filenames not working when not adding -- to the command -+ - Add directories to filename auto completion -+ -+ -- Maarten Bezemer Tue, 14 Feb 2012 10:45:14 +0100 -+ - pbuilder (0.206) unstable; urgency=low - - [ Matthew Palmer ] -@@ -405,6 +587,29 @@ pbuilder (0.205) unstable; urgency=low - - -- Junichi Uekawa Sun, 25 Dec 2011 16:22:00 +0900 - -+pbuilder (0.204ubuntu2) precise; urgency=low -+ -+ * Auto complete filenames not working when not adding -- to the command -+ (Closes: #659581, LP: #770529) -+ * Add directories to filename auto completion -+ -+ -- Maarten Bezemer Sun, 12 Feb 2012 15:19:43 +0100 -+ -+pbuilder (0.204ubuntu1) precise; urgency=low -+ -+ * Merge from Debian testing. Remaining changes: -+ - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set -+ default archive mirror to "archive.ubuntu.com/ubuntu". -+ - pbuilderrc: Set default distribution to "precise" and the default -+ keyring to the Ubuntu one. -+ - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS -+ - debian/rules: install temporary locale so man page tests don't cause -+ FTBFS. -+ - pbuilder-buildpackage: use env PATH=$PATH when calling -+ dpkg-source and dpkg-buildpackage -+ -+ -- Michael Vogt Tue, 20 Dec 2011 10:02:44 +0100 -+ - pbuilder (0.204) unstable; urgency=low - - [ Slavko ] -@@ -484,6 +689,33 @@ pbuilder (0.199+nmu4) unstable; urgency=low - - -- Thorsten Glaser Thu, 26 May 2011 20:49:04 +0000 - -+pbuilder (0.199+nmu3ubuntu3) oneiric; urgency=low -+ -+ * pbuilder: -+ - Rename the /run script from --execute to /runscript (LP: #811016). -+ -+ -- Alberto Milone Wed, 05 Oct 2011 12:31:52 +0100 -+ -+pbuilder (0.199+nmu3ubuntu2) oneiric; urgency=low -+ -+ * Apply patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606687 -+ (Matthew Palmer) so ccache and icecc work again (LP: #826031) -+ -+ -- Philip Muškovac Wed, 07 Sep 2011 10:51:21 +0100 -+ -+pbuilder (0.199+nmu3ubuntu1) oneiric; urgency=low -+ -+ * Merge from debian unstable (LP: #776279), remaining changes: -+ - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set -+ default archive mirror to "archive.ubuntu.com/ubuntu". -+ - pbuilderrc: Set default distribution to "oneiric" and the default -+ keyring to the Ubuntu one. -+ - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS -+ - debian/rules: install temporary locale so man page tests don't cause -+ FTBFS. -+ -+ -- Lorenzo De Liso Tue, 03 May 2011 12:20:24 +0200 -+ - pbuilder (0.199+nmu3) unstable; urgency=low - - * Non-Maintainer Upload. -@@ -504,6 +736,19 @@ pbuilder (0.199+nmu2) unstable; urgency=low - - -- Emilio Pozuelo Monfort Sat, 19 Feb 2011 19:02:34 +0000 - -+pbuilder (0.199+nmu1ubuntu1) natty; urgency=low -+ -+ * Merge from debian unstable. Remaining changes: -+ - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set -+ default archive mirror to "archive.ubuntu.com/ubuntu". -+ - pbuilderrc: Set default distribution to "natty" and the default keyring -+ to the Ubuntu one. -+ - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS -+ - debian/rules: install temporary locale so man page tests don't cause -+ FTBFS. -+ -+ -- Marc Deslauriers Thu, 06 Jan 2011 08:29:47 -0500 -+ - pbuilder (0.199+nmu1) unstable; urgency=low - - * Non-Maintainer Upload. -@@ -514,6 +759,35 @@ pbuilder (0.199+nmu1) unstable; urgency=low - - -- Steve M. Robbins Tue, 28 Dec 2010 10:19:37 -0600 - -+pbuilder (0.199ubuntu4) natty; urgency=low -+ -+ * debian/rules: properly clean up temporary locale directory. -+ -+ -- Marc Deslauriers Tue, 23 Nov 2010 12:56:07 -0500 -+ -+pbuilder (0.199ubuntu3) natty; urgency=low -+ -+ * debian/rules: install temporary locale so man page tests don't cause -+ FTBFS. -+ -+ -- Marc Deslauriers Tue, 23 Nov 2010 11:22:24 -0500 -+ -+pbuilder (0.199ubuntu2) natty; urgency=low -+ -+ * pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS (LP: #671126) -+ -+ -- Alex Chiang Thu, 04 Nov 2010 13:23:04 -0600 -+ -+pbuilder (0.199ubuntu1) natty; urgency=low -+ -+ * Merge with Debian; remaining changes: -+ - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set -+ default archive mirror to "archive.ubuntu.com/ubuntu". -+ - pbuilderrc: Set default distribution to "natty" and the default keyring -+ to the Ubuntu one. -+ -+ -- Loïc Minier Wed, 13 Oct 2010 19:14:46 +0200 -+ - pbuilder (0.199) unstable; urgency=low - - * add a more useful message for pbuilder-runhooks when hookdir cannot -@@ -524,6 +798,24 @@ pbuilder (0.199) unstable; urgency=low - - -- Junichi Uekawa Mon, 05 Jul 2010 22:35:40 +0900 - -+pbuilder (0.198ubuntu2) maverick; urgency=low -+ -+ * pbuilderrc: Use /usr/share/keyrings/ubuntu-archive-keyring.gpg by default -+ instead of debian-archive-keyring.gpg; this should really be set on a -+ per-distro way since it breaks creation of Debian chroots from Ubuntu and -+ vice-versa; LP: #599394. -+ -+ -- Loïc Minier Mon, 28 Jun 2010 21:56:54 +0200 -+ -+pbuilder (0.198ubuntu1) maverick; urgency=low -+ -+ * Merge from debian unstable; LP: #597980. Remaining changes: -+ - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set -+ default archive mirror to "archive.ubuntu.com/ubuntu". -+ - pbuilderrc: Set default distribution to "maverick". -+ -+ -- Bhavani Shankar Fri, 25 Jun 2010 13:06:57 +0530 -+ - pbuilder (0.198) unstable; urgency=low - - * add --keyring option as default parameter to DEBOOTSTRAPOPTS -@@ -580,6 +872,21 @@ pbuilder (0.197) unstable; urgency=low - - -- Junichi Uekawa Wed, 23 Jun 2010 07:21:11 +0900 - -+pbuilder (0.196ubuntu2) maverick; urgency=low -+ -+ * Update the default dist to maverick. -+ -+ -- Loïc Minier Sat, 08 May 2010 13:54:39 +0200 -+ -+pbuilder (0.196ubuntu1) lucid; urgency=low -+ -+ * Merge with Debian unstable (lp: #502135). Remaining changes: -+ - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set -+ default archive mirror to "archive.ubuntu.com". -+ - pbuilderrc: Set default distribution to "lucid". -+ -+ -- Michael Bienia Sat, 02 Jan 2010 14:30:46 +0100 -+ - pbuilder (0.196) unstable; urgency=low - - [ Loïc Minier ] -@@ -664,6 +971,29 @@ pbuilder (0.193) unstable; urgency=low - - -- Junichi Uekawa Sun, 29 Nov 2009 18:25:40 +0900 - -+pbuilder (0.192ubuntu1) lucid; urgency=low -+ -+ * Merge from debian testing, remaining changes: -+ - debian/control, pbuilderrc: Prefer debootstrap over cdebootstrap. -+ - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set -+ default archive mirror to "archive.ubuntu.com". -+ - pbuilderrc: -+ + Set default distribution to "lucid". -+ + Set Ubuntu components, but comment them out, so that it still defaults -+ to "main". -+ + Use "sudo -E" for PBUILDERROOTCMD. (LP #175776, Debian #361362) -+ - pbuilder-satisfydepends-gdebi: gdebi needs to be called from outside the -+ chroot as the .dsc file isn't copied yet into the chroot. -+ (Debian #472407, LP #242449). -+ - pbuilder-buildpackage, pbuilder.8, pbuilder-checkparams, -+ pbuilder-modules: Add support for building twice in a row. -+ (Debian #493538) -+ - pbuilder-satisfydepends-checkparams: -+ Re-add the CHROOT variable which got lost during the merge. -+ It's needed for pbuilder-satisfydepends-gdebi to work (lp: #384284). -+ -+ -- Michael Vogt Wed, 25 Nov 2009 11:37:25 +0100 -+ - pbuilder (0.192) unstable; urgency=low - - * quote-escape debemail so that email with space can be handled -@@ -687,6 +1017,29 @@ pbuilder (0.190) unstable; urgency=low - - -- Junichi Uekawa Tue, 25 Aug 2009 22:24:03 +0900 - -+pbuilder (0.189ubuntu1) karmic; urgency=low -+ -+ * Merge from debian unstable, remaining changes: LP: #402255 -+ - debian/control, pbuilderrc: Prefer debootstrap over cdebootstrap. -+ - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set -+ default archive mirror to "archive.ubuntu.com". -+ - pbuilderrc: -+ + Set default distribution to "karmic". -+ + Set Ubuntu components, but comment them out, so that it still defaults -+ to "main". -+ + Use "sudo -E" for PBUILDERROOTCMD. (LP #175776, Debian #361362) -+ - pbuilder-satisfydepends-gdebi: gdebi needs to be called from outside the -+ chroot as the .dsc file isn't copied yet into the chroot. -+ (Debian #472407, LP #242449). -+ - pbuilder-buildpackage, pbuilder.8, pbuilder-checkparams, -+ pbuilder-modules: Add support for building twice in a row. -+ (Debian #493538) -+ - pbuilder-satisfydepends-checkparams: -+ Re-add the CHROOT variable which got lost during the merge. -+ It's needed for pbuilder-satisfydepends-gdebi to work (lp: #384284). -+ -+ -- Bhavani Shankar Wed, 22 Jul 2009 13:42:01 +0530 -+ - pbuilder (0.189) unstable; urgency=low - - [ Junichi Uekawa ] -@@ -716,6 +1069,34 @@ pbuilder (0.188) unstable; urgency=low - - -- Junichi Uekawa Sun, 31 May 2009 10:44:05 +0900 - -+pbuilder (0.187ubuntu2) karmic; urgency=low -+ -+ * pbuilder-satisfydepends-checkparams: -+ Re-add the CHROOT variable which got lost during the merge. -+ It's needed for pbuilder-satisfydepends-gdebi to work (lp: #384284). -+ -+ -- Michael Bienia Sat, 06 Jun 2009 16:03:23 +0200 -+ -+pbuilder (0.187ubuntu1) karmic; urgency=low -+ -+ * Merge with Debian unstable; remaining Ubuntu changes: -+ - debian/control, pbuilderrc: Prefer debootstrap over cdebootstrap. -+ - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set -+ default archive mirror to "archive.ubuntu.com". -+ - pbuilderrc: -+ + Set default distribution to "karmic". -+ + Set Ubuntu components, but comment them out, so that it still defaults -+ to "main". -+ + Use "sudo -E" for PBUILDERROOTCMD. (LP #175776, Debian #361362) -+ - pbuilder-satisfydepends-gdebi: gdebi needs to be called from outside the -+ chroot as the .dsc file isn't copied yet into the chroot. -+ (Debian #472407, LP #242449). -+ - pbuilder-buildpackage, pbuilder.8, pbuilder-checkparams, -+ pbuilder-modules: Add support for building twice in a row. -+ (Debian #493538) -+ -+ -- Martin Pitt Mon, 04 May 2009 12:49:29 +0200 -+ - pbuilder (0.187) unstable; urgency=low - - [ Junichi Uekawa ] -@@ -777,6 +1158,35 @@ pbuilder (0.184) unstable; urgency=low - - -- Junichi Uekawa Thu, 27 Nov 2008 21:22:11 +0900 - -+pbuilder (0.183ubuntu1) jaunty; urgency=low -+ -+ * Merge with Debian unstable. Remaining Ubuntu changes: -+ - debian/control: Prefer debootstrap over cdebootstrap. -+ - debian/control: Demote cowdancer from Recommends to Suggests. This fits -+ Suggests semantics. (Forwarded to Debian #504594) -+ - debian/doc-base: Fix section. (Forwarded to Debian #504596) -+ - pbuilderrc: -+ + Set default archive to "archive.ubuntu.com". -+ + Set default distribution to "jaunty". -+ + Set Ubuntu components, but comment them out, so that it still defaults -+ to "main". -+ + Use debootstrap rather than cdebootstrap. -+ + Use "sudo -E" for PBUILDERROOTCMD. (LP #175776, Debian #361362) -+ - debian/pbuilder.config: add explanation header on new install that the -+ new /etc/pbuilderrc uses the default values from -+ /usr/share/pbuilder/pbuilderrc. (Forwarded to Debian #504599) -+ - debian/pbuilder.templates, debian/pbuilder.config: Use Ubuntu mirror by -+ default. -+ - pbuilder-satisfydepends-checkparams, pbuilder-satisfydepends-gdebi: Fix -+ pbuilder-satisfydepends-gdebi: gdebi needs to be called from outside the -+ chroot as the .dsc file isn't copied yet into the chroot. -+ (Debian #472407, LP #242449). -+ - pbuilder-buildpackage, pbuilder.8, pbuilder-checkparams, -+ pbuilder-modules: Add support for building twice in a row. -+ (Debian #493538) -+ -+ -- Martin Pitt Wed, 05 Nov 2008 15:29:10 +0100 -+ - pbuilder (0.183) unstable; urgency=low - - [ Junichi Uekawa ] -@@ -817,6 +1227,81 @@ pbuilder (0.182) unstable; urgency=low - - -- Junichi Uekawa Tue, 12 Aug 2008 01:56:28 +0900 - -+pbuilder (0.181ubuntu7) intrepid; urgency=low -+ -+ * Demote cowdancer from Recommends to Suggests. This fits Suggests -+ semantics, and avoids pulling in qemu, bochs, gcc-3.4, and other stuff -+ into main. -+ -+ -- Martin Pitt Fri, 17 Oct 2008 10:20:45 +0200 -+ -+pbuilder (0.181ubuntu6) intrepid; urgency=low -+ -+ * Fix: correctly handle multiple --debbuildopts (LP: #278213). -+ -+ -- TJ Sat, 4 Oct 2008 18:30:00 +0200 -+ -+pbuilder (0.181ubuntu5) intrepid; urgency=low -+ -+ * Fix condition that makes build twice in a row the default behavior. -+ (LP: #258808) -+ -+ -- Nicolas Valcárcel Mon, 18 Aug 2008 00:54:57 -0500 -+ -+pbuilder (0.181ubuntu4) intrepid; urgency=low -+ -+ [ Nicolas Valcárcel ] -+ * Make pbuilder lintian clean (LP: #254305): -+ - Edit debian/rules to not ignore make clean errors -+ - Modified Standars version -+ - Update debconf templates -+ - Modified doc-base Section to Debian according to new schema -+ - Added interpreter to pbuildd/hookdir/A10dpkg-l.sh due lintian error -+ * Added --twice build option (LP: #196008) -+ - Edited manpage with the new option -+ - Added option information on built-in help message -+ -+ [ Michael Vogt ] -+ * Added gdebi-core to Suggests (LP: #131153) -+ -+ -- Nicolas Valcárcel Sun, 03 Aug 2008 23:23:48 -0400 -+ -+pbuilder (0.181ubuntu3) intrepid; urgency=low -+ -+ * Fix pbuilder-satisfydepends-gdebi: -+ gdebi needs to be called from outside the chroot as the .dsc file isn't -+ copied yet into the chroot (Closes: #472407, LP: #242449). -+ -+ -- Michael Bienia Mon, 23 Jun 2008 21:17:53 +0200 -+ -+pbuilder (0.181ubuntu2) intrepid; urgency=low -+ -+ * debian/rules: s/ -a/ -s/ to fix FTBFS on powerpc (LP: #184218) -+ -+ -- Daniel Hahler Fri, 20 Jun 2008 11:01:15 +0100 -+ -+pbuilder (0.181ubuntu1) intrepid; urgency=low -+ -+ * Merge from debian unstable, remaining changes: -+ * debian/control: -+ - Prefer debootstrap over cdebootstrap. -+ - Remove rootstrap build-dependency. -+ * pbuilderrc: -+ - Set default archive to "archive.ubuntu.com". -+ - Set default distribution to "intrepid". -+ - Set Ubuntu components. -+ - Don't create a buildd variant by default. -+ - Use debootstrap rather than cdebootstrap. -+ - pbuilderrc: use "sudo -E" for PBUILDERROOTCMD (LP: #175776) -+ * pdebuild: Move "$@" to end of "arg chain" for PDEBUILD_BUILDER -+ calls, so that "--buildresult" option gets passed to pbuilder -+ (LP: #129586) -+ * debian/pbuilder.config: -+ - add explaination header on new install that the new /etc/pbuilderrc -+ uses the default values from /usr/share/pbuilder/pbuilderrc -+ -+ -- Michael Vogt Thu, 29 May 2008 10:51:09 +0200 -+ - pbuilder (0.181) unstable; urgency=low - - [ Esko Arajärvi ] -@@ -914,6 +1399,44 @@ pbuilder (0.177) unstable; urgency=low - - -- Junichi Uekawa Wed, 26 Dec 2007 20:53:24 +0900 - -+pbuilder (0.176ubuntu2) hardy; urgency=low -+ -+ [ Daniel Hahler ] -+ * pbuilderrc: use "sudo -E" for PBUILDERROOTCMD (LP: #175776) -+ * pbuilder-satisfydepends-gdebi: add "--force-yes" to apt-get call -+ (LP: #123068) -+ * pdebuild: Move "$@" to end of "arg chain" for PDEBUILD_BUILDER -+ calls, so that "--buildresult" option gets passed to pbuilder -+ (LP: #129586) -+ -+ -- Michael Vogt Fri, 29 Feb 2008 12:49:35 +0100 -+ -+pbuilder (0.176ubuntu1) hardy; urgency=low -+ -+ * Merge from debian unstable, remaining changes: -+ * debian/control: -+ - Prefer debootstrap over cdebootstrap. -+ - DebianMaintainerField. -+ - Remove rootstrap build-dependency. -+ - add missing po4a build-dep -+ * Makefile: -+ - Addded pbuilder-satisfydepends-gdebi -+ * pbuilder-buildpackage-funcs: -+ - always pass --chroot to the pbuilder-satisfydepends (needed for -+ pbuilder-satisfydepends-gdebi) -+ * pbuilderrc: -+ - Set default archive to "archive.ubuntu.com". -+ - Set default distribution to "hardy". -+ - Set Ubuntu components. -+ - Don't create a buildd variant by default. -+ - Use debootstrap rather than cdebootstrap. -+ * pbuilder-satisfydepends-gdebi: -+ - added alternative b-d resolver that should should speed up b-d -+ resolution quite a bit. -+ * Support for specifying components is now included in Debian. -+ -+ -- Michael Vogt Thu, 29 Nov 2007 10:16:12 +0100 -+ - pbuilder (0.176) unstable; urgency=low - - [ Loic Minier ] -@@ -940,6 +1463,38 @@ pbuilder (0.175) unstable; urgency=low - - -- Junichi Uekawa Wed, 21 Nov 2007 19:22:00 +0900 - -+pbuilder (0.174ubuntu2) hardy; urgency=low -+ -+ * Fix sed for pdebuild-internal to stop matching Original-Maintainer -+ field as an output file name. -+ -+ -- John Dong Sat, 27 Oct 2007 15:30:13 -0400 -+ -+pbuilder (0.174ubuntu1) hardy; urgency=low -+ -+ * Merge from Debian unstable. Remaining Ubuntu changes: -+ * debian/control: -+ - Prefer debootstrap over cdebootstrap. -+ - DebianMaintainerField. -+ - Remove rootstrap build-dependency. -+ * Makefile: -+ - Addded pbuilder-satisfydepends-gdebi -+ * pbuilder-buildpackage-funcs: -+ - always pass --chroot to the pbuilder-satisfydepends (needed for -+ pbuilder-satisfydepends-gdebi) -+ * pbuilderrc: -+ - Set default archive to "archive.ubuntu.com". -+ - Set default distribution to "hardy". -+ - Set Ubuntu components. -+ - Don't create a buildd variant by default. -+ - Use debootstrap rather than cdebootstrap. -+ * pbuilder-satisfydepends-gdebi: -+ - added alternative b-d resolver that should should speed up b-d -+ resolution quite a bit. -+ * Support for specifying components is now included in Debian. -+ -+ -- Adrien Cunin Sat, 27 Oct 2007 13:58:41 +0200 -+ - pbuilder (0.174) unstable; urgency=low - - [ Junichi Uekawa ] -@@ -956,6 +1511,34 @@ pbuilder (0.174) unstable; urgency=low - - -- Junichi Uekawa Thu, 25 Oct 2007 20:18:09 +0900 - -+pbuilder (0.173ubuntu1) hardy; urgency=low -+ -+ * Merge from debian unstable, remaining changes: -+ * debian/control: -+ - Prefer debootstrap over cdebootstrap. -+ - DebianMaintainerField. -+ - Remove rootstrap build-dependency. -+ * Makefile: -+ - Addded pbuilder-satisfydepends-gdebi -+ * pbuilder-buildpackage-funcs: -+ - always pass --chroot to the pbuilder-satisfydepends (needed for -+ pbuilder-satisfydepends-gdebi) -+ * pbuilder-modules: -+ - Add support for multiple components. -+ * pbuilderrc: -+ - Set default archive to "archive.ubuntu.com". -+ - Set default distribution to "gutsy". -+ - Add comment about components. -+ - Don't create a buildd variant by default. -+ - Use debootstrap rather than cdebootstrap. -+ * pbuilderrc.5: -+ - Document support for multiple components. -+ * pbuilder-satisfydepends-gdebi: -+ - added alternative b-d resolver that should should speed up b-d -+ resolution quite a bit. -+ -+ -- Soren Hansen Fri, 19 Oct 2007 17:55:29 +0200 -+ - pbuilder (0.173) unstable; urgency=low - - * documentation update: add svn-buildpackage example. -diff --git a/debian/control b/debian/control -index 6bb5f65..691b6b9 100644 ---- a/debian/control -+++ b/debian/control -@@ -1,7 +1,8 @@ - Source: pbuilder - Section: devel - Priority: extra --Maintainer: Debian pbuilder maintenance team -+Maintainer: Ubuntu Developers -+XSBC-Original-Maintainer: Debian pbuilder maintenance team - Uploaders: Junichi Uekawa , - Loïc Minier , - Matt Kraai , -@@ -16,9 +17,9 @@ Build-Depends: dblatex, - po4a, - xsltproc - Standards-Version: 3.9.6 --Vcs-Git: git://anonscm.debian.org/pbuilder/pbuilder.git --Vcs-Browser: https://anonscm.debian.org/cgit/pbuilder/pbuilder.git --Testsuite: autopkgtest -+XS-Debian-Vcs-Git: git://anonscm.debian.org/pbuilder/pbuilder.git -+XS-Debian-Vcs-Browser: https://anonscm.debian.org/cgit/pbuilder/pbuilder.git -+XS-Testsuite: autopkgtest - - Package: pbuilder - Architecture: all -diff --git a/debian/pbuilder.config b/debian/pbuilder.config -index b07a40d..ec1452d 100755 ---- a/debian/pbuilder.config -+++ b/debian/pbuilder.config -@@ -72,7 +72,7 @@ EOF - - # if the interface is non-interactive, still set a valid mirror - if [ $RETCODE = 30 ] ; then -- MIRRORSITE="http://httpredir.debian.org/debian" -+ MIRRORSITE="http://archive.ubuntu.com/ubuntu" - else - db_get pbuilder/mirrorsite - MIRRORSITE="$RET" -diff --git a/debian/pbuilder.templates b/debian/pbuilder.templates -index 90f6eba..318297b 100644 ---- a/debian/pbuilder.templates -+++ b/debian/pbuilder.templates -@@ -7,7 +7,7 @@ _Description: Default mirror site: - this information. If this attempt fails, you will be prompted again - to insert some valid mirror information. - . -- Here is a valid mirror example: http://httpredir.debian.org/debian -+ Here is a valid mirror example: http://archive.ubuntu.com/ubuntu - - Template: pbuilder/nomirror - Type: error -diff --git a/debian/po/ca.po b/debian/po/ca.po -index dd4eaf3..be84a5a 100644 ---- a/debian/po/ca.po -+++ b/debian/po/ca.po -@@ -45,8 +45,8 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" --msgstr "Un exemple de rèplica vàlida seria: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" -+msgstr "Un exemple de rèplica vàlida seria: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/cs.po b/debian/po/cs.po -index 68368b5..5389871 100644 ---- a/debian/po/cs.po -+++ b/debian/po/cs.po -@@ -42,8 +42,8 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" --msgstr "Příklad platného zrcadla: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" -+msgstr "Příklad platného zrcadla: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/da.po b/debian/po/da.po -index f8e4938..9ba1cf1 100644 ---- a/debian/po/da.po -+++ b/debian/po/da.po -@@ -43,8 +43,8 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" --msgstr "Her er et gyldigt spejleksempel: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" -+msgstr "Her er et gyldigt spejleksempel: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/de.po b/debian/po/de.po -index ad50f4f..517f50a 100644 ---- a/debian/po/de.po -+++ b/debian/po/de.po -@@ -43,7 +43,7 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "" - "Ein Beispiel fr einen gltigen Spiegelserver: http://httpredir.debian.org/" - "debian" -diff --git a/debian/po/es.po b/debian/po/es.po -index 15da46a..60d2e9b 100644 ---- a/debian/po/es.po -+++ b/debian/po/es.po -@@ -61,8 +61,8 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" --msgstr "He aquí un ejemplo de una réplica válida: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" -+msgstr "He aquí un ejemplo de una réplica válida: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/eu.po b/debian/po/eu.po -index f509566..e5d8f34 100644 ---- a/debian/po/eu.po -+++ b/debian/po/eu.po -@@ -45,9 +45,9 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "" --"Hau da baliozko ispilu baten adibidea: http://httpredir.debian.org/debian" -+"Hau da baliozko ispilu baten adibidea: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/fi.po b/debian/po/fi.po -index fcc3a62..be69884 100644 ---- a/debian/po/fi.po -+++ b/debian/po/fi.po -@@ -40,8 +40,8 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" --msgstr "Esimerkki kelvollisesta peilistä: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" -+msgstr "Esimerkki kelvollisesta peilistä: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/fr.po b/debian/po/fr.po -index dfd8924..3b95aee 100644 ---- a/debian/po/fr.po -+++ b/debian/po/fr.po -@@ -44,8 +44,8 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" --msgstr "Exemple de miroir valable : http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" -+msgstr "Exemple de miroir valable : http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/gl.po b/debian/po/gl.po -index d0fd89e..5564255 100644 ---- a/debian/po/gl.po -+++ b/debian/po/gl.po -@@ -42,9 +42,9 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "" --"Velaquí un exemplo dunha réplica válida: http://httpredir.debian.org/debian" -+"Velaquí un exemplo dunha réplica válida: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/it.po b/debian/po/it.po -index c8d5276..e2cb2d7 100644 ---- a/debian/po/it.po -+++ b/debian/po/it.po -@@ -45,8 +45,8 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" --msgstr "Ecco un esempio di mirror valido: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" -+msgstr "Ecco un esempio di mirror valido: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/ja.po b/debian/po/ja.po -index 025128d..71d7f72 100644 ---- a/debian/po/ja.po -+++ b/debian/po/ja.po -@@ -43,8 +43,8 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" --msgstr "正しいミラーの例としては： http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" -+msgstr "正しいミラーの例としては： http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/nl.po b/debian/po/nl.po -index 6cc68d1..39bac2d 100644 ---- a/debian/po/nl.po -+++ b/debian/po/nl.po -@@ -43,7 +43,7 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "" - "Dit is een geldig voorbeeld van een spiegelserver: http://cdn.debian.net/" - "debian" -diff --git a/debian/po/pt.po b/debian/po/pt.po -index 7fe4d10..4721626 100644 ---- a/debian/po/pt.po -+++ b/debian/po/pt.po -@@ -46,9 +46,9 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "" --"Aqui está um exemplo de mirror válido: http://httpredir.debian.org/debian" -+"Aqui está um exemplo de mirror válido: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po -index 840ec4c..3cc935f 100644 ---- a/debian/po/pt_BR.po -+++ b/debian/po/pt_BR.po -@@ -47,9 +47,9 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "" --"Este é um exemplo válido de espelho de rede: http://httpredir.debian.org/debian" -+"Este é um exemplo válido de espelho de rede: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/ro.po b/debian/po/ro.po -index ecc53b5..e8353c4 100644 ---- a/debian/po/ro.po -+++ b/debian/po/ro.po -@@ -49,9 +49,9 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "" --"Iată un exemplu valid de sait-oglindă: http://httpredir.debian.org/debian" -+"Iată un exemplu valid de sait-oglindă: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/ru.po b/debian/po/ru.po -index 1c9c299..cdd64ed 100644 ---- a/debian/po/ru.po -+++ b/debian/po/ru.po -@@ -47,8 +47,8 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" --msgstr "Пример задания сервера-зеркала: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" -+msgstr "Пример задания сервера-зеркала: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/sk.po b/debian/po/sk.po -index b8a06f0..86320d3 100644 ---- a/debian/po/sk.po -+++ b/debian/po/sk.po -@@ -47,8 +47,8 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" --msgstr "Tu je príklad platného zrkadla: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" -+msgstr "Tu je príklad platného zrkadla: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/sr.po b/debian/po/sr.po -index 8f1d8a9..58a174f 100644 ---- a/debian/po/sr.po -+++ b/debian/po/sr.po -@@ -44,7 +44,7 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "" - "Овдје је примјер валидне интернет локације: http://httpredir.debian.org/" - "debian" -diff --git a/debian/po/sr@latin.po b/debian/po/sr@latin.po -index cdf0988..38163fe 100644 ---- a/debian/po/sr@latin.po -+++ b/debian/po/sr@latin.po -@@ -44,7 +44,7 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "" - "Ovdje je primjer validne internet lokacije: http://httpredir.debian.org/" - "debian" -diff --git a/debian/po/sv.po b/debian/po/sv.po -index 6bd76d6..455e645 100644 ---- a/debian/po/sv.po -+++ b/debian/po/sv.po -@@ -44,9 +44,9 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "" --"Exempelvis kan denna spegel användas: http://httpredir.debian.org/debian" -+"Exempelvis kan denna spegel användas: http://archive.ubuntu.com/ubuntu" - - #. Type: error - #. Description -diff --git a/debian/po/templates.pot b/debian/po/templates.pot -index a3b4442..767438f 100644 ---- a/debian/po/templates.pot -+++ b/debian/po/templates.pot -@@ -6,12 +6,13 @@ - #, fuzzy - msgid "" - msgstr "" --"Project-Id-Version: PACKAGE VERSION\n" -+"Project-Id-Version: pbuilder\n" - "Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" --"POT-Creation-Date: 2008-03-07 00:09+0900\n" -+"POT-Creation-Date: 2015-10-09 11:23+0200\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -+"Language: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=CHARSET\n" - "Content-Transfer-Encoding: 8bit\n" -@@ -40,7 +41,7 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "" - - #. Type: error -diff --git a/debian/po/tr.po b/debian/po/tr.po -index 4fc59f5..2318988 100644 ---- a/debian/po/tr.po -+++ b/debian/po/tr.po -@@ -46,7 +46,7 @@ msgstr "" - #. Type: string - #. Description - #: ../pbuilder.templates:1001 --msgid "Here is a valid mirror example: http://httpredir.debian.org/debian" -+msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" - msgstr "Geçerli bir yansı örneği şu şekildedir: http://http.debian.net/debian" - - #. Type: error -diff --git a/pbuilderrc b/pbuilderrc -index b4ab567..08c1522 100644 ---- a/pbuilderrc -+++ b/pbuilderrc -@@ -12,7 +12,7 @@ BUILDDIR=/build - # Debian buildds too. You can set it to $BUILDDIR to get a working HOME, if - # you need to. - BUILD_HOME=/nonexistent --MIRRORSITE=http://httpredir.debian.org/debian -+MIRRORSITE=http://archive.ubuntu.com/ubuntu - #OTHERMIRROR="deb http://www.home.com/updates/ ./" - #export http_proxy=http://your-proxy:8080/ - USEPROC=yes -@@ -23,7 +23,7 @@ USEDEVFS=no - BUILDRESULT=/var/cache/pbuilder/result/ - - # specifying the distribution forces the distribution on "pbuilder update" --#DISTRIBUTION=sid -+DISTRIBUTION=xenial - # specifying the architecture passes --arch= to debootstrap; the default is - # to use the architecture of the host - #ARCHITECTURE=`dpkg --print-architecture` -@@ -101,7 +101,6 @@ BINDMOUNTS="" - # Set the debootstrap variant to 'buildd' type. - DEBOOTSTRAPOPTS=( - '--variant=buildd' -- '--keyring' '/usr/share/keyrings/debian-archive-keyring.gpg' - ) - # or unset it to make it not a buildd type. - # unset DEBOOTSTRAPOPTS --- -2.1.4 - diff -Nru pbuilder-0.221ubuntu1/debian/changelog pbuilder-0.221ubuntu2/debian/changelog --- pbuilder-0.221ubuntu1/debian/changelog 2015-11-24 16:51:16.000000000 +0000 +++ pbuilder-0.221ubuntu2/debian/changelog 2015-11-25 01:37:02.000000000 +0000 @@ -1,3 +1,14 @@ +pbuilder (0.221ubuntu2) xenial; urgency=medium + + [ Gianfranco Costamagna ] + * Remove XS-* prefix from debian control file, useless after dpkg 1.17.10. + + [ Mattia Rizzolo ] + * cherry-pick change from Debian VCS to update pbuilder-apt-config and fix + autopkgtest. + + -- Mattia Rizzolo Wed, 25 Nov 2015 01:36:53 +0000 + pbuilder (0.221ubuntu1) xenial; urgency=medium * Merge from debian unstable, remaining changes: diff -Nru pbuilder-0.221ubuntu1/debian/control pbuilder-0.221ubuntu2/debian/control --- pbuilder-0.221ubuntu1/debian/control 2015-11-24 16:50:41.000000000 +0000 +++ pbuilder-0.221ubuntu2/debian/control 2015-11-25 01:32:17.000000000 +0000 @@ -17,9 +17,9 @@ po4a, xsltproc Standards-Version: 3.9.6 -XS-Debian-Vcs-Git: git://anonscm.debian.org/pbuilder/pbuilder.git -XS-Debian-Vcs-Browser: https://anonscm.debian.org/cgit/pbuilder/pbuilder.git -XS-Testsuite: autopkgtest +Vcs-Git: git://anonscm.debian.org/pbuilder/pbuilder.git +Vcs-Browser: https://anonscm.debian.org/cgit/pbuilder/pbuilder.git +Testsuite: autopkgtest Package: pbuilder Architecture: all diff -Nru pbuilder-0.221ubuntu1/pbuilder-apt-config pbuilder-0.221ubuntu2/pbuilder-apt-config --- pbuilder-0.221ubuntu1/pbuilder-apt-config 2015-10-31 10:28:00.000000000 +0000 +++ pbuilder-0.221ubuntu2/pbuilder-apt-config 2015-11-25 01:35:37.000000000 +0000 @@ -59,15 +59,15 @@ etch|lenny|squeeze|sid|oldstable|stable|testing|unstable|experimental) echo "debian" ;; - buzz|rex|bo|hamm|slink|potato|woody|sarge|etch|lenny|squeeze) + buzz|rex|bo|hamm|slink|potato|woody|sarge|etch|lenny|squeeze|wheezy|jessie|stretch|buster) echo "debian-archive" ;; - dapper|hardy|intrepid|jaunty|karmic|lucid) + lucid|precise|trusty|vivid|wily|xenial) case "$arch" in amd64|i386) echo "ubuntu" ;; - armel|armhf|hppa|ia64|lpia|powerpc|sparc) + arm64|armel|armhf|hppa|ia64|lpia|powerpc|ppc64el|sparc) echo "ubuntu-ports" ;; *) @@ -75,7 +75,7 @@ ;; esac ;; - warty|hoary|breezy|edgy|feisty|gutsy) + warty|hoary|breezy|edgy|feisty|gutsy|dapper|hardy|intrepid|jaunty|karmic|maverick|natty|oneiric|quantal|raring|saucy|utopic) echo "ubuntu-old" ;; *)