diffstat for pbuilder-0.213 pbuilder-0.213ubuntu1co1 Documentation/pbuilder-doc.fr.po | 122 +++++++++ Documentation/pbuilder-doc.ja.po | 103 ++++++++ debian/changelog | 476 +++++++++++++++++++++++++++++++++++++++ debian/control | 36 -- debian/pbuilder.config | 2 debian/pbuilder.templates | 2 debian/rules | 11 pbuilder-apt-config | 2 pbuilderrc | 6 9 files changed, 723 insertions(+), 37 deletions(-) diff -Nru pbuilder-0.213/Documentation/pbuilder-doc.fr.po pbuilder-0.213ubuntu1co1/Documentation/pbuilder-doc.fr.po --- pbuilder-0.213/Documentation/pbuilder-doc.fr.po 2011-08-02 23:53:05.000000000 +0000 +++ pbuilder-0.213ubuntu1co1/Documentation/pbuilder-doc.fr.po 2013-02-16 16:56:45.000000000 +0000 @@ -3778,6 +3778,128 @@ "instantanés LVM, cowloop ou cowdancer permettront sans doute d'améliorer " "cette situation." +# type: Content of: +#. type: Content of: +#: pbuilder-doc.xml:123 +msgid "" +"pbuilder update will update the base.tgz. It will " +"extract the chroot, invoke apt-get update and " +"apt-get dist-upgrade inside the chroot, and then recreate " +"the base.tgz (the base tar-ball.)" +msgstr "" +"pbuilder update permet de mettre à jour le fichier base." +"tgz. Le contenu de ce dernier sera extrait, apt-get update et apt-get dist-upgrade seront invoqués à " +"l'intérieur de l'environnement obtenu et le fichier base.tgz sera recréé." + +# type: Content of: +#. type: Content of: +#: pbuilder-doc.xml:271 +msgid "" +"pbuilder requires full root privilege when it is " +"satisfying the build-dependencies, but most packages do not need root " +"privilege to build, or even refused to build when they are built as root. " +"pbuilder can create a user which is only used inside " +"pbuilder and use that user id when building, and use the " +"fakeroot command when root privilege is required." +msgstr "" +"pbuilder nécessite les privilèges du super-utilisateur " +"pour satisfaire les dépendances de compilation mais la plupart des paquets " +"n'ont pas besoin de ces privilèges pour se construire, voire peuvent refuser " +"de se construire. pbuilder peut créer un utilisateur qui " +"sera utilisé uniquement pour pbuilder et effectuer la " +"construction des paquets sous cette identité. fakeroot " +"sera utilisé lorsque les privilèges du super-utilisateur seront requis." + +# type: Content of: +#. type: Content of: +#: pbuilder-doc.xml:426 +msgid "" +"Automatic install-remove-upgrade-remove-install-purge-upgrade-purge test-" +"suite (distributed as an example, B91dpkg-i), or just " +"check that everything installs somewhat (execute_installtest.sh)." +msgstr "" +"Tester automatiquement la séquence install-remove-upgrade-remove-install-" +"purge-upgrade-purge test-suite (un exemple est fourni : B91dpkg-i) ou juste vérifier que quelque chose est effectivement installé " +"(execute_installtest.sh)." + +# type: Content of: +#. type: Content of: +#: pbuilder-doc.xml:442 +#, fuzzy +msgid "" +"To use B92test-pkg script, first, add it to your hook directory. " +". The test files are shell scripts " +"placed in debian/pbuilder-test/NN_name (where NN is " +"number) following run-parts standard for file names. After a successful build, packages are first tested for " +"installation and removal, and then each test is ran inside the chroot. The " +"current directory is the top directory of the source-code. This means you " +"can expect to be able to use ./debian/ directory from inside your scripts." +msgstr "" +" pour les noms de fichiers. Après une construction réussie, les " +"paquets sont d'abord testés en les installant et en les retirant puis chaque " +"test est exécuté dans l'image de base. Le répertoire courant est le " +"répertoire contenant les sources. Cela signifie que vous pouvez vous " +"attendre à pouvoir utiliser le répertoire ./debian/ depuis vos scripts." + +# type: Content of: +#. type: Content of: +#: pbuilder-doc.xml:463 +msgid "" +"Example scripts for use with pbuilder-test can be found in /usr/" +"share/doc/pbuilder/examples/pbuilder-test" +msgstr "" +"Des scripts d'exemples pour pbuilder-test ont été placés dans /usr/" +"share/doc/pbuilder/examples/pbuilder-test" + +# type: Content of: +#. type: Content of: +#: pbuilder-doc.xml:788 +msgid "" +"It is possible to invoke a shell session after a build failure. Example " +"hook script are provided as C10shell and " +"C11screen scripts. C10shell script will start bash " +"inside chroot, and C11screen script will start GNU screen inside the chroot." +msgstr "" +"Il est possible d'obtenir un shell après un problème de construction. Des " +"crochets d'exemple sont fournis sous les noms C10shell " +"et C11screen. Le script C10shell lancera bash dans " +"l'environnement de base tandis que C11screen utilisera GNU screen." + +# type: Content of: +#. type: Content of: <book><chapter><title> +#: pbuilder-doc.xml:1409 +msgid "Experimental or wish-list features of pbuilder" +msgstr "Fonctionnalités expérimentales ou souhaitées de pbuilder" + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:1417 +msgid "" +"LVM2 has a useful snapshot function that features Copy-on-write images. " +"That could be used for <command>pbuilder</command> just as it can be used " +"for the user-mode-linux <command>pbuilder</command> port. lvmpbuilder " +"script in the examples directory implements such port. The scripts and " +"documentation can be found under <filename>/usr/share/doc/pbuilder/examples/" +"lvmpbuilder/</filename>" +msgstr "" +"LVM2 permet de créer des instantanés sous forme d'images « Copy-on-write ». " +"Cette fonctionnalité peut être utilisée aussi bien pour <command>pbuilder</" +"command> que pour le port pour user-mode-linux. Le script lvmpbuilder dans " +"le répertoire des exemples exploite une telle fonctionnalité. Les scripts et " +"la documentation associée se trouvent dans <filename>/usr/share/doc/pbuilder/" +"examples/lvmpbuilder/</filename>" + +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> +#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> +#: pbuilder-doc.xml:1612 +#, fuzzy +msgid "<filename>/run</filename>" +msgstr "Lien symbolique vers <filename>/proc/mounts</filename>." + # type: Content of: <book><chapter><sect1><title> #~ msgid "How to use ccache" #~ msgstr "Comment utiliser ccache" diff -Nru pbuilder-0.213/Documentation/pbuilder-doc.ja.po pbuilder-0.213ubuntu1co1/Documentation/pbuilder-doc.ja.po --- pbuilder-0.213/Documentation/pbuilder-doc.ja.po 2011-08-02 23:52:47.000000000 +0000 +++ pbuilder-0.213ubuntu1co1/Documentation/pbuilder-doc.ja.po 2013-02-16 16:56:45.000000000 +0000 @@ -3188,6 +3188,109 @@ "cowloop, or cowdancer is hoped to improve the situation somewhat." msgstr "" +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:123 +msgid "" +"<command>pbuilder update</command> will update the base.tgz. It will " +"extract the chroot, invoke <command>apt-get update</command> and " +"<command>apt-get dist-upgrade</command> inside the chroot, and then recreate " +"the base.tgz (the base tar-ball.)" +msgstr "" +"<command>pbuilder update</command> コマンドが base.tgz を更新します。 chroot " +"を展開し、 <command>apt-get update</command> と <command>apt-get dist-" +"upgrade</command> を chroot 内部で実行し、base.tgz （ベースの tar 玉） を作成" +"します。" + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:271 +msgid "" +"<command>pbuilder</command> requires full root privilege when it is " +"satisfying the build-dependencies, but most packages do not need root " +"privilege to build, or even refused to build when they are built as root. " +"<command>pbuilder </command> can create a user which is only used inside " +"<command>pbuilder </command> and use that user id when building, and use the " +"<command>fakeroot</command> command when root privilege is required." +msgstr "" +"<command>pbuilder</command> は依存関係を充足させる際には root 権限を必要とし" +"ます、しかしほとんどのパッケージはビルド時に root 権限を必要とはせず、rootで" +"はビルドできないパッケージも一部存在します。<command>pbuilder </command> は " +"<command>pbuilder </command> 内部専用のユーザを作成し、そのユーザIDを利用して" +"ビルドを実行することができます。root権限が必要な時には<command>fakeroot</" +"command> コマンドを利用します。" + +# type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> +#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> +#: pbuilder-doc.xml:426 +msgid "" +"Automatic install-remove-upgrade-remove-install-purge-upgrade-purge test-" +"suite (distributed as an example, <filename>B91dpkg-i</filename>), or just " +"check that everything installs somewhat (<filename>execute_installtest.sh</" +"filename>)." +msgstr "" +"自動的にインストール・アップグレード・削除・インストール・パージ・アップグ" +"レード・パージするようなテスト(例として、<filename>B91dpkg-i</filename>が配布" +"されています)、もしくは全部インストールできることを確認する" +"(<filename>execute_installtest.sh</filename>)。" + +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:442 +msgid "" +"To use B92test-pkg script, first, add it to your hook directory. " +"<placeholder type=\"footnote\" id=\"0\"/>. The test files are shell scripts " +"placed in <filename>debian/pbuilder-test/NN_name</filename> (where NN is " +"number) following run-parts standard<placeholder type=\"footnote\" id=\"1\"/" +"> for file names. After a successful build, packages are first tested for " +"installation and removal, and then each test is ran inside the chroot. The " +"current directory is the top directory of the source-code. This means you " +"can expect to be able to use ./debian/ directory from inside your scripts." +msgstr "" + +# type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:463 +msgid "" +"Example scripts for use with pbuilder-test can be found in <filename>/usr/" +"share/doc/pbuilder/examples/pbuilder-test</filename>" +msgstr "" +"pbuilder-test を利用するスクリプト例は <filename>/usr/share/doc/pbuilder/" +"examples/pbuilder-test</filename>以下に配布されている。" + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:788 +msgid "" +"It is possible to invoke a shell session after a build failure. Example " +"hook script are provided as <filename>C10shell</filename> and " +"<filename>C11screen</filename> scripts. C10shell script will start bash " +"inside chroot, and C11screen script will start GNU screen inside the chroot." +msgstr "" + +# type: Content of: <book><chapter><title> +#. type: Content of: <book><chapter><title> +#: pbuilder-doc.xml:1409 +msgid "Experimental or wish-list features of pbuilder" +msgstr "実験的な pbuilder の wish-list 的な機能" + +# type: Content of: <book><chapter><sect1><para> +#. type: Content of: <book><chapter><sect1><para> +#: pbuilder-doc.xml:1417 +msgid "" +"LVM2 has a useful snapshot function that features Copy-on-write images. " +"That could be used for <command>pbuilder</command> just as it can be used " +"for the user-mode-linux <command>pbuilder</command> port. lvmpbuilder " +"script in the examples directory implements such port. The scripts and " +"documentation can be found under <filename>/usr/share/doc/pbuilder/examples/" +"lvmpbuilder/</filename>" +msgstr "" + +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> +#. type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry> +#: pbuilder-doc.xml:1612 +msgid "<filename>/run</filename>" +msgstr "<filename>/run</filename>" + # type: Content of: <book><bookinfo><date> #~ msgid "2007-5-27" #~ msgstr "2007年5月27日" diff -Nru pbuilder-0.213/debian/changelog pbuilder-0.213ubuntu1co1/debian/changelog --- pbuilder-0.213/debian/changelog 2012-10-07 23:30:05.000000000 +0000 +++ pbuilder-0.213ubuntu1co1/debian/changelog 2013-02-25 09:06:07.000000000 +0000 @@ -1,3 +1,29 @@ +pbuilder (0.213ubuntu1co1) earlgrey; urgency=low + + [ Merge-o-Matic for Chaiwala ] + * Merge from Ubuntu raring. Remaining changes: + - debian/control: + drop cdebootstrap from debpends. + drop pbuilder-uml, gdebi-core from suggests. + drop pbuilder-uml binary package. + - pbuilder-apt-config: added armhf. + + -- Andrew Lee (李健秋) <andrew.lee@collabora.co.uk> Mon, 25 Feb 2013 17:03:23 +0800 + +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 <maarten.bezemer@gmail.com> Mon, 05 Nov 2012 23:27:25 +0100 + pbuilder (0.213) unstable; urgency=low [ Beatrice Torracca ] @@ -53,6 +79,32 @@ -- Junichi Uekawa <dancer@debian.org> Fri, 30 Mar 2012 03:44:30 +0900 +pbuilder (0.208ubuntu1co2) ceylong; urgency=low + + * Added armhf to pbuilder-apt-config. + + -- Konstantinos Margaritis <konstantinos.margaritis@collabora.com> Wed, 10 Oct 2012 21:46:26 +0300 + +pbuilder (0.208ubuntu1co1) ceylon; urgency=low + + * Removed suggested packages that do not exist in chaiwala, also remove pbuilder-uml entirely. + + -- Konstantinos Margaritis <konstantinos.margaritis@collabora.com> Fri, 28 Sep 2012 17:17:19 +0300 + +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 <maarten.bezemer@gmail.com> Wed, 14 Mar 2012 14:54:09 +0100 + pbuilder (0.208) unstable; urgency=low [ Guido Günther ] @@ -88,6 +140,28 @@ -- Junichi Uekawa <dancer@debian.org> 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 <maarten.bezemer@gmail.com> 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 <maarten.bezemer@gmail.com> Tue, 14 Feb 2012 10:45:14 +0100 + pbuilder (0.206) unstable; urgency=low [ Matthew Palmer ] @@ -125,6 +199,29 @@ -- Junichi Uekawa <dancer@debian.org> 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 <maarten.bezemer@gmail.com> 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 <michael.vogt@ubuntu.com> Tue, 20 Dec 2011 10:02:44 +0100 + pbuilder (0.204) unstable; urgency=low [ Slavko ] @@ -204,6 +301,33 @@ -- Thorsten Glaser <tg@mirbsd.de> 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 <alberto.milone@canonical.com> 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 <yofel@kubuntu.org> 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 <blackz@ubuntu.com> Tue, 03 May 2011 12:20:24 +0200 + pbuilder (0.199+nmu3) unstable; urgency=low * Non-Maintainer Upload. @@ -224,6 +348,19 @@ -- Emilio Pozuelo Monfort <pochu@debian.org> 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 <marc.deslauriers@ubuntu.com> Thu, 06 Jan 2011 08:29:47 -0500 + pbuilder (0.199+nmu1) unstable; urgency=low * Non-Maintainer Upload. @@ -234,6 +371,35 @@ -- Steve M. Robbins <smr@debian.org> Tue, 28 Dec 2010 10:19:37 -0600 +pbuilder (0.199ubuntu4) natty; urgency=low + + * debian/rules: properly clean up temporary locale directory. + + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> 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 <marc.deslauriers@ubuntu.com> 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 <achiang@canonical.com> 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 <loic.minier@ubuntu.com> 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 @@ -244,6 +410,24 @@ -- Junichi Uekawa <dancer@debian.org> 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 <loic.minier@ubuntu.com> 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 <bhavi@ubuntu.com> Fri, 25 Jun 2010 13:06:57 +0530 + pbuilder (0.198) unstable; urgency=low * add --keyring option as default parameter to DEBOOTSTRAPOPTS @@ -300,6 +484,21 @@ -- Junichi Uekawa <dancer@debian.org> Wed, 23 Jun 2010 07:21:11 +0900 +pbuilder (0.196ubuntu2) maverick; urgency=low + + * Update the default dist to maverick. + + -- Loïc Minier <loic.minier@ubuntu.com> 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 <geser@ubuntu.com> Sat, 02 Jan 2010 14:30:46 +0100 + pbuilder (0.196) unstable; urgency=low [ Loïc Minier ] @@ -384,6 +583,29 @@ -- Junichi Uekawa <dancer@debian.org> 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 <michael.vogt@ubuntu.com> 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 @@ -407,6 +629,29 @@ -- Junichi Uekawa <dancer@debian.org> 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 <right2bhavi@gmail.com> Wed, 22 Jul 2009 13:42:01 +0530 + pbuilder (0.189) unstable; urgency=low [ Junichi Uekawa ] @@ -436,6 +681,34 @@ -- Junichi Uekawa <dancer@debian.org> 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 <geser@ubuntu.com> 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 <martin.pitt@ubuntu.com> Mon, 04 May 2009 12:49:29 +0200 + pbuilder (0.187) unstable; urgency=low [ Junichi Uekawa ] @@ -497,6 +770,35 @@ -- Junichi Uekawa <dancer@debian.org> 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 <martin.pitt@ubuntu.com> Wed, 05 Nov 2008 15:29:10 +0100 + pbuilder (0.183) unstable; urgency=low [ Junichi Uekawa ] @@ -537,6 +839,81 @@ -- Junichi Uekawa <dancer@debian.org> 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 <martin.pitt@ubuntu.com> Fri, 17 Oct 2008 10:20:45 +0200 + +pbuilder (0.181ubuntu6) intrepid; urgency=low + + * Fix: correctly handle multiple --debbuildopts (LP: #278213). + + -- TJ <ubuntu@tjworld.net> 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 <nvalcarcel@ubuntu.com> 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 <nvalcarcel@ubuntu.com> 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 <geser@ubuntu.com> 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 <ubuntu@thequod.de> 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 <michael.vogt@ubuntu.com> Thu, 29 May 2008 10:51:09 +0200 + pbuilder (0.181) unstable; urgency=low [ Esko Arajärvi ] @@ -634,6 +1011,44 @@ -- Junichi Uekawa <dancer@debian.org> 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 <michael.vogt@ubuntu.com> 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 <michael.vogt@ubuntu.com> Thu, 29 Nov 2007 10:16:12 +0100 + pbuilder (0.176) unstable; urgency=low [ Loic Minier ] @@ -660,6 +1075,38 @@ -- Junichi Uekawa <dancer@debian.org> 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 <jdong@ubuntu.com> 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 <adri2000@ubuntu.com> Sat, 27 Oct 2007 13:58:41 +0200 + pbuilder (0.174) unstable; urgency=low [ Junichi Uekawa ] @@ -676,6 +1123,34 @@ -- Junichi Uekawa <dancer@debian.org> 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 <soren@ubuntu.com> Fri, 19 Oct 2007 17:55:29 +0200 + pbuilder (0.173) unstable; urgency=low * documentation update: add svn-buildpackage example. @@ -2635,3 +3110,4 @@ * Initial Release. -- Junichi Uekawa <dancer@debian.org> Mon, 27 Aug 2001 18:50:06 +0900 + diff -Nru pbuilder-0.213/debian/control pbuilder-0.213ubuntu1co1/debian/control --- pbuilder-0.213/debian/control 2012-05-30 22:20:36.000000000 +0000 +++ pbuilder-0.213ubuntu1co1/debian/control 2013-02-25 09:02:31.000000000 +0000 @@ -1,7 +1,8 @@ Source: pbuilder Section: devel Priority: extra -Maintainer: Debian pbuilder maintenance team <pbuilder-maint@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian pbuilder maintenance team <pbuilder-maint@lists.alioth.debian.org> Uploaders: Junichi Uekawa <dancer@debian.org>, Loïc Minier <lool@dooz.org>, Matt Kraai <kraai@debian.org> @@ -15,13 +16,13 @@ po-debconf, po4a Standards-Version: 3.9.1 -Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git -Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git +XS-Debian-Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git +XS-Debian-Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git Package: pbuilder Architecture: all Depends: coreutils (>= 4.5.8-1), - debootstrap | cdebootstrap, + debootstrap, dpkg-dev, debianutils (>= 1.13.1), wget, @@ -29,9 +30,7 @@ Recommends: fakeroot, sudo, devscripts -Suggests: pbuilder-uml, - gdebi-core, - cowdancer +Suggests: 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 @@ -51,26 +50,3 @@ . pdebuild is a wrapper for Debian Developers, to allow running pbuilder just like "debuild", as a normal user. - -Package: pbuilder-uml -Architecture: i386 amd64 -Depends: rootstrap (>= 0.3.9-1), - user-mode-linux, - pbuilder (= ${source:Version}), - ${misc:Depends} -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 - that a package has correct build-dependencies. - It uses apt extensively, and a local mirror, or a fast connection - to a Debian mirror is ideal, but not necessary. - . - Requires user-mode-linux to function correctly - . - "pbuilder-user-mode-linux create" uses rootstrap to create UML image - . - "pbuilder-user-mode-linux update" updates the image to the current state of - testing/unstable/whatever - . - "pbuilder-user-mode-linux build" takes a *.dsc file and builds a binary - in the UML diff -Nru pbuilder-0.213/debian/pbuilder.config pbuilder-0.213ubuntu1co1/debian/pbuilder.config --- pbuilder-0.213/debian/pbuilder.config 2012-01-26 22:06:36.000000000 +0000 +++ pbuilder-0.213ubuntu1co1/debian/pbuilder.config 2013-02-16 16:56:50.000000000 +0000 @@ -70,7 +70,7 @@ # if the interface is non-interactive, still set a valid mirror if [ $RETCODE = 30 ] ; then - MIRRORSITE="http://cdn.debian.net/debian" + MIRRORSITE="http://archive.ubuntu.com/ubuntu" else db_get pbuilder/mirrorsite MIRRORSITE="$RET" diff -Nru pbuilder-0.213/debian/pbuilder.templates pbuilder-0.213ubuntu1co1/debian/pbuilder.templates --- pbuilder-0.213/debian/pbuilder.templates 2012-01-26 22:06:36.000000000 +0000 +++ pbuilder-0.213ubuntu1co1/debian/pbuilder.templates 2013-02-16 16:56:50.000000000 +0000 @@ -7,7 +7,7 @@ this information. If this attempt fails, you will be prompted again to insert some valid mirror information. . - Here is a valid mirror example: http://cdn.debian.net/debian + Here is a valid mirror example: http://archive.ubuntu.com/ubuntu Template: pbuilder/nomirror Type: error diff -Nru pbuilder-0.213/debian/rules pbuilder-0.213ubuntu1co1/debian/rules --- pbuilder-0.213/debian/rules 2009-11-12 08:20:00.000000000 +0000 +++ pbuilder-0.213ubuntu1co1/debian/rules 2013-02-16 16:56:50.000000000 +0000 @@ -1,5 +1,9 @@ #!/usr/bin/make -f +LOCALE_PATH := debian/tmplocale +LOCALE_NAME := en_US +LOCALE_CHARSET := UTF-8 + build: build-stamp build-stamp: dh_testdir @@ -9,6 +13,7 @@ dh_testdir dh_testroot rm -f build-stamp + rm -rf $(LOCALE_PATH) $(MAKE) clean dh_clean @@ -18,7 +23,11 @@ dh_prep dh_installdirs ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - $(MAKE) check + mkdir -p $(LOCALE_PATH) + localedef -i $(LOCALE_NAME) -c -f $(LOCALE_CHARSET) \ + -A /usr/share/locale/locale.alias --quiet \ + $(LOCALE_PATH)/$(LOCALE_NAME).$(LOCALE_CHARSET) + LOCPATH=$(LOCALE_PATH) LC_ALL=$(LOCALE_NAME).$(LOCALE_CHARSET) $(MAKE) check endif $(MAKE) install DESTDIR=$(CURDIR)/debian/pbuilder dh_movefiles -ppbuilder-uml --sourcedir=debian/pbuilder diff -Nru pbuilder-0.213/pbuilder-apt-config pbuilder-0.213ubuntu1co1/pbuilder-apt-config --- pbuilder-0.213/pbuilder-apt-config 2012-05-28 23:16:48.000000000 +0000 +++ pbuilder-0.213ubuntu1co1/pbuilder-apt-config 2013-02-16 16:56:44.000000000 +0000 @@ -64,7 +64,7 @@ ;; dapper|hardy|intrepid|jaunty|karmic|lucid) case "$arch" in - amd64|i386) + amd64|i386|armhf) echo "ubuntu" ;; armel|armhf|hppa|ia64|lpia|powerpc|sparc) diff -Nru pbuilder-0.213/pbuilderrc pbuilder-0.213ubuntu1co1/pbuilderrc --- pbuilder-0.213/pbuilderrc 2012-06-03 22:18:08.000000000 +0000 +++ pbuilder-0.213ubuntu1co1/pbuilderrc 2013-02-16 16:56:44.000000000 +0000 @@ -5,7 +5,7 @@ #EXTRAPACKAGES="" #export DEBIAN_BUILDARCH=athlon BUILDPLACE=/var/cache/pbuilder/build/ -MIRRORSITE=http://cdn.debian.net/debian +MIRRORSITE=http://archive.ubuntu.com/ubuntu #OTHERMIRROR="deb http://www.home.com/updates/ ./" #export http_proxy=http://your-proxy:8080/ USEPROC=yes @@ -14,7 +14,7 @@ BUILDRESULT=/var/cache/pbuilder/result/ # specifying the distribution forces the distribution on "pbuilder update" -#DISTRIBUTION=sid +DISTRIBUTION=quantal # specifying the architecture passes --arch= to debootstrap; the default is # to use the architecture of the host #ARCHITECTURE=`dpkg --print-architecture` @@ -88,7 +88,7 @@ # Set the debootstrap variant to 'buildd' type. DEBOOTSTRAPOPTS=( '--variant=buildd' - '--keyring' '/usr/share/keyrings/debian-archive-keyring.gpg' + '--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg' ) # or unset it to make it not a buildd type. # unset DEBOOTSTRAPOPTS