diff -Nru pbuilder-0.208ubuntu1/Makefile pbuilder-0.213ubuntu0~ppa1/Makefile --- pbuilder-0.208ubuntu1/Makefile 2011-12-24 08:07:46.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/Makefile 2012-11-05 22:22:23.000000000 +0000 @@ -164,11 +164,7 @@ pbuilderrc.5 \ pdebuild.1 \ $(NULL) -NOINST_SCRIPTS += \ - debuild.sh \ - $(NULL) CHECK_MANPAGES += $(NOINST_MANPAGES) -CHECK_SCRIPTS += $(NOINST_SCRIPTS) # TODO: check subdirs etc. @@ -180,13 +176,14 @@ check: export PBUILDER_CHECKOUT := $(CURDIR) check: - # syntax check + # syntax check. $(foreach script,$(CHECK_SCRIPTS),bash -n $(script)$(newline)) $(foreach mp,$(CHECK_MANPAGES),LANG=C MANWIDTH=80 man --warnings -l $(mp) >/dev/null$(newline)) - # testsuite + # unit tests. $(foreach test,$(wildcard ./test_*),$(test)$(newline)) full-check: + # system tests that might take long. cd testsuite && ./run-test.sh clean: diff -Nru pbuilder-0.208ubuntu1/bash_completion.d/pbuilder pbuilder-0.213ubuntu0~ppa1/bash_completion.d/pbuilder --- pbuilder-0.208ubuntu1/bash_completion.d/pbuilder 2012-03-08 22:05:17.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/bash_completion.d/pbuilder 2012-11-05 22:22:23.000000000 +0000 @@ -53,13 +53,14 @@ ;; *) # Provide available flags - COMPREPLY=( $( compgen -W '--basetgz --buildplace --mirror --othermirror \ - --http-proxy --distribution --architecture --components --buildresult \ - --aptcache --removepackages --extrapackages --configfile --hookdir \ - --debemail --debbuildopts --logfile --pkgname-logfile --aptconfdir \ - --timeout --override-config --binary-arch --preserve-buildplace \ - --bindmounts --debug --twice --autocleanaptcache --compressprog \ - --debootstrapopts --save-after-login --save-after-exec --debootstrap' \ + COMPREPLY=( $( compgen -W '--allow-untrusted --basetgz --buildplace --mirror \ + --othermirror --http-proxy --distribution --architecture --components \ + --buildresult --aptcache --removepackages --extrapackages --configfile \ + --hookdir --debemail --debbuildopts --logfile --pkgname-logfile \ + --aptconfdir --timeout --override-config --binary-arch \ + --preserve-buildplace --bindmounts --debug --twice --autocleanaptcache \ + --compressprog --debootstrapopts --save-after-login --save-after-exec \ + --debootstrap' \ -- "$cur" ) ) if [[ $prev = @(--aptcache|--hookdir) ]]; then # Optionally provide a directory diff -Nru pbuilder-0.208ubuntu1/debian/changelog pbuilder-0.213ubuntu0~ppa1/debian/changelog --- pbuilder-0.208ubuntu1/debian/changelog 2012-03-14 14:44:35.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/debian/changelog 2012-11-05 23:22:12.000000000 +0000 @@ -1,3 +1,72 @@ +pbuilder (0.213ubuntu0~ppa1) quantal; 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 ] + * Bug#686004: [INTL: it] Italian translation of debconf messages - pbuilder + + [ David Martínez Moreno ] + * Bug#686410: pbuilder: [INTL:es] Spanish translation update of debconfmessages - pbuilder. + + [ Junichi Uekawa ] + * remove /etc/pbuilder/pbuilderrc -> etc/pbuilderrc. (closes: 689213) + + -- Junichi Uekawa Mon, 08 Oct 2012 08:30:04 +0900 + +pbuilder (0.212) unstable; urgency=low + + * update copyright file to be more machine-process-able, and move + homepage information to debian/control + * set ccachedir to default to off. It's a minor optimization that a + developer may choose to enable at the cost of incompatibility and some + bugs. (closes: #675691, #675843, #670651) + + -- Junichi Uekawa Fri, 24 Aug 2012 04:50:15 +0900 + +pbuilder (0.211) unstable; urgency=low + + [ Junichi Uekawa ] + * policy update: 3.9.1 + * For testsuite, do not depend on approx instance. It's not always + reliable and confusing. Just trust autoconfiguration result here. + * B90lintian requires bashism (closes: #604546) + + [ Sjoerd Simons ] + * Recognize armhf as an architecture on ubuntu-ports + * When testing mirror selection, force an architecture that we know is on that mirror + (closes: #671007) + + -- Junichi Uekawa Wed, 30 May 2012 19:01:25 +0900 + +pbuilder (0.210) unstable; urgency=low + + * move around echobacktime definition location. (closes: #666440) + * B92test-pkg: Having any test fail should make the regression test + suite to fail and exit with exit value of 1 instead of 0. + + -- Junichi Uekawa Sat, 31 Mar 2012 14:33:15 +0900 + +pbuilder (0.209) unstable; urgency=low + + * pbuilder: Auto completion is missing --allow-untrusted flag + (closes: #664323) + * Show current time in create / update operations too. + (closes: #613854) + + -- Junichi Uekawa Fri, 30 Mar 2012 03:44:30 +0900 + pbuilder (0.208ubuntu1) precise; urgency=low * Merge from Debian unstable (LP: #952938) diff -Nru pbuilder-0.208ubuntu1/debian/control pbuilder-0.213ubuntu0~ppa1/debian/control --- pbuilder-0.208ubuntu1/debian/control 2012-03-14 14:44:35.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/debian/control 2012-11-05 22:23:15.000000000 +0000 @@ -15,7 +15,7 @@ debconf|debconf-2.0, po-debconf, po4a -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 XS-Debian-Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git XS-Debian-Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git @@ -33,6 +33,7 @@ Suggests: pbuilder-uml, gdebi-core, cowdancer +Homepage: http://pbuilder.alioth.debian.org Description: personal package builder for Debian packages pbuilder constructs a chroot system, and builds a package inside the chroot. diff -Nru pbuilder-0.208ubuntu1/debian/copyright pbuilder-0.213ubuntu0~ppa1/debian/copyright --- pbuilder-0.208ubuntu1/debian/copyright 2009-06-22 23:37:40.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/debian/copyright 2012-11-05 22:22:23.000000000 +0000 @@ -1,31 +1,26 @@ -This package was debianized by Junichi Uekawa on -Sat, 28 Jul 2001 17:05:50 +0900. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: pbuilder +Upstream-Contact: Junichi Uekawa + +Files: * +Copyright: Copyright 2001-2007 Junichi Uekawa + Copyright (C) 2010 Loïc Minier + # pbuilder -- personal Debian package builder + # Copyright (C) 2001-2007 Junichi Uekawa + # + # 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 2 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. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +License: GPL-2+ -It was downloaded from http://www.netfort.gr.jp/~dancer/software/pbuilder.html -now from http://pbuilder.alioth.debian.org - -Upstream Author: - Junichi Uekawa and others. - - -Copyright: - -# pbuilder -- personal Debian package builder -# Copyright (C) 2001-2007 Junichi Uekawa -# -# 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 2 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -GPL version 2 or later. -See /usr/share/common-licenses/GPL-2 on Debian systems. + \ No newline at end of file diff -Nru pbuilder-0.208ubuntu1/debian/pbuilder-test/01_pbuilder_create pbuilder-0.213ubuntu0~ppa1/debian/pbuilder-test/01_pbuilder_create --- pbuilder-0.208ubuntu1/debian/pbuilder-test/01_pbuilder_create 2008-08-11 19:25:37.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/debian/pbuilder-test/01_pbuilder_create 2012-11-05 22:22:23.000000000 +0000 @@ -1,4 +1,3 @@ #!/bin/bash env -u COWDANCER_REUSE -u COWDANCER_ILISTFILE -u LD_PRELOAD \ - pbuilder create --distribution sid --debootstrap debootstrap \ - --mirror http://localhost:9999/debian + pbuilder create --distribution sid --debootstrap debootstrap diff -Nru pbuilder-0.208ubuntu1/debian/pbuilder.links pbuilder-0.213ubuntu0~ppa1/debian/pbuilder.links --- pbuilder-0.208ubuntu1/debian/pbuilder.links 2007-01-07 06:21:01.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/debian/pbuilder.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/etc/pbuilderrc /etc/pbuilder/pbuilderrc \ No newline at end of file diff -Nru pbuilder-0.208ubuntu1/debian/po/es.po pbuilder-0.213ubuntu0~ppa1/debian/po/es.po --- pbuilder-0.208ubuntu1/debian/po/es.po 2008-08-05 02:30:20.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/debian/po/es.po 2012-11-05 22:22:23.000000000 +0000 @@ -4,7 +4,7 @@ # Changes: # - Initial translation # Ignacio Mondino , 2008 -# Traductores, si no conoce el formato PO, merece la pena leer la +# Traductor, si no conoce el formato PO, merece la pena leer la # documentación de gettext, especialmente las secciones dedicadas a este # formato, por ejemplo ejecutando: # info -n '(gettext)PO Files' @@ -18,32 +18,33 @@ # - La guía de traducción de po's de debconf: # /usr/share/doc/po-debconf/README-trans # o http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# +# +# msgid "" msgstr "" "Project-Id-Version: pbuilder_0.181\n" "Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" "POT-Creation-Date: 2008-03-07 00:09+0900\n" -"PO-Revision-Date: 2008-08-03 18:50-0300\n" -"Last-Translator: Ignacio Mondino \n" +"PO-Revision-Date: 2012-08-31 22:35-0700\n" +"Last-Translator: David Martínez Moreno \n" "Language-Team: Debian Spanish team \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description #: ../pbuilder.templates:1001 msgid "Default mirror site:" -msgstr "Replica por omisión:" +msgstr "Réplica por omisión:" #. Type: string #. Description #: ../pbuilder.templates:1001 msgid "Please enter the default mirror you want to be used by pbuilder." -msgstr "Por favor ingrese la replica por omisión la cual desea que sea " -"utilizada por pbuilder." +msgstr "" +"Por favor, introduzca la réplica que desea utilizar por omisión en pbuilder." #. Type: string #. Description @@ -53,21 +54,21 @@ "information. If this attempt fails, you will be prompted again to insert " "some valid mirror information." msgstr "" -"Si deja este campo en blanco, se hará un intento para auto detectar esta " -"información. Si este intento falla, se le pedirá nuevamente que ingrese " -"información valida sobre la replica." +"Si deja este campo en blanco, se intentará autodetectar esta " +"información. Si esto falla, se le pedirá nuevamente que introduzca " +"información válida sobre una réplica." #. Type: string #. Description #: ../pbuilder.templates:1001 msgid "Here is a valid mirror example: http://cdn.debian.net/debian" -msgstr "He aquí un ejemplo de una replica valida: http://cdn.debian.net/debian" +msgstr "He aquí un ejemplo de una réplica válida: http://cdn.debian.net/debian" #. Type: error #. Description #: ../pbuilder.templates:2001 msgid "Default mirror not found" -msgstr "No se encontró la replica por omisión" +msgstr "No se encontró la réplica por omisión" #. Type: error #. Description @@ -76,14 +77,14 @@ "Mirror information detection failed and the user provided no mirror " "information." msgstr "" -"Ha fallado la auto detección de la información de la replica y el usuario no " -"ha ingreso ninguna información sobre la misma." +"Ha fallado la autodetección de la información de la réplica y el usuario no " +"ha introducido ninguna información sobre la misma." #. Type: error #. Description #: ../pbuilder.templates:2001 msgid "Please enter valid mirror information." -msgstr "Por favor ingrese información valida sobre una replica." +msgstr "Por favor, introduzca información válida sobre una réplica." #. Type: boolean #. Description @@ -98,7 +99,6 @@ "Your system seems to have already pbuilder configuration. Proceeding might " "discard or overwrite part or the entire pbuilder's configuration." msgstr "" -"Su sistema parece ya disponer de una configuración de pbuilder. El proseguir " -"puede descartar o sobreescribir parcial o totalmente la configuración de " +"Su sistema parece ya disponer de una configuración de pbuilder. Si prosigue " +"puede descartar o sobreescribir parcial o totalmente la configuración existente de " "pbuilder." - diff -Nru pbuilder-0.208ubuntu1/debian/po/it.po pbuilder-0.213ubuntu0~ppa1/debian/po/it.po --- pbuilder-0.208ubuntu1/debian/po/it.po 1970-01-01 00:00:00.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/debian/po/it.po 2012-11-05 22:22:23.000000000 +0000 @@ -0,0 +1,88 @@ +# Italian translation of pbuilder debconf messages. +# Copyright (C) 2012, pbuilder package copyright holder. +# This file is distributed under the same license as the pbuilder package. +# Beatrice Torracca , 2012. +msgid "" +msgstr "" +"Project-Id-Version: pbuilder\n" +"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-03-07 00:09+0900\n" +"PO-Revision-Date: 2012-08-27 16:19+0200\n" +"Last-Translator: Beatrice Torracca \n" +"Language-Team: Italian \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" + +#. Type: string +#. Description +#: ../pbuilder.templates:1001 +msgid "Default mirror site:" +msgstr "Sito mirror predefinito:" + +#. Type: string +#. Description +#: ../pbuilder.templates:1001 +msgid "Please enter the default mirror you want to be used by pbuilder." +msgstr "Inserire il mirror predefinito che deve essere usato da pbuilder." + +#. Type: string +#. Description +#: ../pbuilder.templates:1001 +msgid "" +"If you leave this field blank, there will be one attempt to autodetect this " +"information. If this attempt fails, you will be prompted again to insert " +"some valid mirror information." +msgstr "" +"Se questo campo viene lasciato vuoto, verrà fatto un tentativo di rilevare " +"automaticamente questa informazione. Se tale tentativo fallirà, verrà " +"chiesto nuovamente di inserire una qualche informazione valida per un " +"mirror." + +#. Type: string +#. Description +#: ../pbuilder.templates:1001 +msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgstr "Ecco un esempio di mirror valido: http://cdn.debian.net/debian" + +#. Type: error +#. Description +#: ../pbuilder.templates:2001 +msgid "Default mirror not found" +msgstr "Mirror predefinito non trovato" + +#. Type: error +#. Description +#: ../pbuilder.templates:2001 +msgid "" +"Mirror information detection failed and the user provided no mirror " +"information." +msgstr "" +"Il rilevamento delle informazioni sul mirror non è riuscito e l'utente non " +"ne ha fornita alcuna." + +#. Type: error +#. Description +#: ../pbuilder.templates:2001 +msgid "Please enter valid mirror information." +msgstr "Inserire delle informazioni sul mirror valide." + +#. Type: boolean +#. Description +#: ../pbuilder.templates:3001 +msgid "Overwrite current configuration?" +msgstr "Sovrascrivere la configurazione attuale?" + +#. Type: boolean +#. Description +#: ../pbuilder.templates:3001 +msgid "" +"Your system seems to have already pbuilder configuration. Proceeding might " +"discard or overwrite part or the entire pbuilder's configuration." +msgstr "" +"Il sistema sembra avere già una configurazione per pbuilder. Procedendo si " +"potrebbero perdere o sovrascrivere la configurazione di pbuilder in parte o " +"del tutto." diff -Nru pbuilder-0.208ubuntu1/debuild.sh pbuilder-0.213ubuntu0~ppa1/debuild.sh --- pbuilder-0.208ubuntu1/debuild.sh 2007-04-22 13:02:06.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/debuild.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -# run debuild with .git ignore. -debuild -us -uc -I.git -git push --tags -git push --all - diff -Nru pbuilder-0.208ubuntu1/elmo.txt pbuilder-0.213ubuntu0~ppa1/elmo.txt --- pbuilder-0.208ubuntu1/elmo.txt 2007-01-07 06:21:01.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/elmo.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ - - Hmm... DoBuildDep seems rather long - dancerj: python/perl apt can do that for you - elmo elmo_h - or presumably some C{++,} glue using libapt - (FWIW, etc.) - elmo_h: oh? that's nice to hear. I'm rather wishing to get pbuilder-satisfydepends fixed or replaced with something else; it works, but it's not quite correct all the time - yes, katie (or jennifer, technically) runs apt_pkg.ParseSrcDepends on .dscs in incoming to sanity check them.. - hmm.. - -29 Oct 2003. - diff -Nru pbuilder-0.208ubuntu1/examples/B90lintian pbuilder-0.213ubuntu0~ppa1/examples/B90lintian --- pbuilder-0.208ubuntu1/examples/B90lintian 2010-07-05 13:10:20.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/examples/B90lintian 2012-11-05 22:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff -Nru pbuilder-0.208ubuntu1/examples/B92test-pkg pbuilder-0.213ubuntu0~ppa1/examples/B92test-pkg --- pbuilder-0.208ubuntu1/examples/B92test-pkg 2010-07-05 13:08:34.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/examples/B92test-pkg 2012-11-05 22:22:23.000000000 +0000 @@ -8,15 +8,14 @@ set -e echo "Installing the prerequisites" -# ignore the failures since they are not the prime interest for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do - apt-get install -y "${APTGETOPT[@]}" "$PKG" || true + apt-get install -y --force-yes "$PKG" || true apt-get remove -y "$PKG" || true done +# ignore the failures since they are not the prime interest -# install the single package, then try to satisfy dependencies. dpkg -i /tmp/buildd/*.deb || true -apt-get install -y -f "${APTGETOPT[@]}" +apt-get install -y -f --force-yes if chmod a+x /tmp/buildd/*/debian/pbuilder-test/*; then : @@ -24,11 +23,11 @@ echo "W: no pbuilder-test script found, skipping" exit 0 fi - SUCCESS=0 COUNT=0 unset FAIL || true -NOFAIL=1 + +EXIT_CODE=0 # The current directory is the top of the source-tree. cd /tmp/buildd/*/debian/.. @@ -41,7 +40,7 @@ else echo FAIL FAIL[${#FAIL[@]}]="${SCRIPT##*/}" - NOFAIL=0 + EXIT_CODE=1 fi echo "--- END test: ${SCRIPT##*/}" ((COUNT=COUNT+1)) @@ -52,3 +51,4 @@ echo "${FAIL[@]/#/ failed }" echo "-- end of testsuite." +exit "${EXIT_CODE}" diff -Nru pbuilder-0.208ubuntu1/pbuilder-apt-config pbuilder-0.213ubuntu0~ppa1/pbuilder-apt-config --- pbuilder-0.208ubuntu1/pbuilder-apt-config 2010-06-20 03:49:52.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/pbuilder-apt-config 2012-11-05 22:22:23.000000000 +0000 @@ -67,7 +67,7 @@ amd64|i386) echo "ubuntu" ;; - armel|hppa|ia64|lpia|powerpc|sparc) + armel|armhf|hppa|ia64|lpia|powerpc|sparc) echo "ubuntu-ports" ;; *) diff -Nru pbuilder-0.208ubuntu1/pbuilder-buildpackage-funcs pbuilder-0.213ubuntu0~ppa1/pbuilder-buildpackage-funcs --- pbuilder-0.208ubuntu1/pbuilder-buildpackage-funcs 2011-08-07 05:37:15.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/pbuilder-buildpackage-funcs 2012-11-05 22:22:23.000000000 +0000 @@ -54,11 +54,6 @@ fi } -function echobacktime () { - log "I: Current time: $(date)" - log "I: pbuilder-time-stamp: $(date +%s)" -} - function showbuildbanner () { # show some banners for building log "I: pbuilder-buildpackage/"$(dpkg --print-architecture) diff -Nru pbuilder-0.208ubuntu1/pbuilder-createbuildenv pbuilder-0.213ubuntu0~ppa1/pbuilder-createbuildenv --- pbuilder-0.208ubuntu1/pbuilder-createbuildenv 2012-03-13 08:08:19.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/pbuilder-createbuildenv 2012-11-05 22:22:23.000000000 +0000 @@ -34,6 +34,9 @@ TRAP=trap fi +# show the current time before doing anything. +echobacktime + # first clean it. cleanbuildplace diff -Nru pbuilder-0.208ubuntu1/pbuilder-modules pbuilder-0.213ubuntu0~ppa1/pbuilder-modules --- pbuilder-0.208ubuntu1/pbuilder-modules 2012-03-13 08:09:46.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/pbuilder-modules 2012-11-05 22:22:23.000000000 +0000 @@ -459,6 +459,10 @@ mkdir -p "$BUILDPLACE/tmp/buildd" } +function echobacktime () { + log "I: Current time: $(date)" + log "I: pbuilder-time-stamp: $(date +%s)" +} function recover_aptcache() { local doit diff -Nru pbuilder-0.208ubuntu1/pbuilder-updatebuildenv pbuilder-0.213ubuntu0~ppa1/pbuilder-updatebuildenv --- pbuilder-0.208ubuntu1/pbuilder-updatebuildenv 2012-03-13 08:08:46.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/pbuilder-updatebuildenv 2012-11-05 22:22:23.000000000 +0000 @@ -21,7 +21,6 @@ . /usr/lib/pbuilder/pbuilder-checkparams . /usr/lib/pbuilder/pbuilder-runhooks - if [ -n "$DISTRIBUTION" ] && [ "$OVERRIDE_APTLINES" = "yes" ]; then log "I: Upgrading for distribution $DISTRIBUTION" fi @@ -31,6 +30,9 @@ TRAP=trap fi +# show the current time before doing anything. +echobacktime + extractbuildplace $TRAP umountproc_cleanbuildplace_trap exit sighup diff -Nru pbuilder-0.208ubuntu1/pbuilderrc pbuilder-0.213ubuntu0~ppa1/pbuilderrc --- pbuilder-0.208ubuntu1/pbuilderrc 2012-03-14 14:44:35.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/pbuilderrc 2012-11-05 22:32:07.000000000 +0000 @@ -14,7 +14,7 @@ BUILDRESULT=/var/cache/pbuilder/result/ # specifying the distribution forces the distribution on "pbuilder update" -DISTRIBUTION=precise +DISTRIBUTION=quantal # specifying the architecture passes --arch= to debootstrap; the default is # to use the architecture of the host #ARCHITECTURE=`dpkg --print-architecture` @@ -29,7 +29,8 @@ #HOOKDIR="/usr/lib/pbuilder/hooks" HOOKDIR="" # NB: this var is private to pbuilder; ccache uses "CCACHE_DIR" instead -CCACHEDIR="/var/cache/pbuilder/ccache" +# CCACHEDIR="/var/cache/pbuilder/ccache" +CCACHEDIR="" # make debconf not interact with user export DEBIAN_FRONTEND="noninteractive" diff -Nru pbuilder-0.208ubuntu1/test_pbuilder-apt-config pbuilder-0.213ubuntu0~ppa1/test_pbuilder-apt-config --- pbuilder-0.208ubuntu1/test_pbuilder-apt-config 2011-08-01 22:37:12.000000000 +0000 +++ pbuilder-0.213ubuntu0~ppa1/test_pbuilder-apt-config 2012-11-05 22:22:23.000000000 +0000 @@ -185,7 +185,7 @@ expect_output "sid" debootstrap_suite --profile sid expect_output "sid" debootstrap_suite --profile unstable -expect_output "ubuntu-mirror" debootstrap_mirror --profile lucid +expect_output "ubuntu-mirror" debootstrap_mirror --profile lucid --arch amd64 expect_output "ubuntu-ports-mirror" debootstrap_mirror --profile lucid --arch armel testlib_summary