diff -Nru pbuilder-0.181ubuntu3/debian/changelog pbuilder-0.181ubuntu4/debian/changelog --- pbuilder-0.181ubuntu3/debian/changelog 2008-06-24 03:49:40.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/changelog 2008-08-03 23:24:01.000000000 -0400 @@ -1,3 +1,18 @@ +pbuilder (0.181ubuntu4) intrepid; urgency=low + + * 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 gdebi | gdebi-kde to Suggests (LP: #131153) + * Added --twice build option (LP: #196008) + - Edited manpage with the new option + - Added option information on built-in help message + + -- Nicolas Valcárcel Sun, 03 Aug 2008 23:23:48 -0400 + pbuilder (0.181ubuntu3) intrepid; urgency=low * Fix pbuilder-satisfydepends-gdebi: diff -Nru pbuilder-0.181ubuntu3/debian/control pbuilder-0.181ubuntu4/debian/control --- pbuilder-0.181ubuntu3/debian/control 2008-05-29 05:02:31.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/control 2008-08-03 17:15:58.000000000 -0400 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Debian pbuilder maintenance team Uploaders: Junichi Uekawa , Matt Kraai Build-Depends: debhelper (>= 4.1.16), docbook-xsl, ldp-docbook-xsl (>= 0.0.20040321-0.1), xsltproc, dpkg-dev (>= 1.13.19), dblatex, debconf|debconf-2.0, po-debconf, po4a -Standards-Version: 3.7.2 +Standards-Version: 3.8.0 Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git @@ -13,7 +13,7 @@ Architecture: all Depends: debootstrap|cdebootstrap, wget, gcc, debianutils (>= 1.13.1), coreutils (>= 4.5.8-1), ${misc:Depends} Recommends: fakeroot, sudo, devscripts, cowdancer -Suggests: pbuilder-uml +Suggests: pbuilder-uml, gdebi | gdebi-kde Description: personal package builder for Debian packages pbuilder constructs a chroot system, and builds a package inside the chroot. diff -Nru pbuilder-0.181ubuntu3/debian/doc-base pbuilder-0.181ubuntu4/debian/doc-base --- pbuilder-0.181ubuntu3/debian/doc-base 2008-05-24 18:54:06.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/doc-base 2008-08-02 23:17:57.000000000 -0400 @@ -2,7 +2,7 @@ Title: pbuilder user's manual Author: Junichi Uekawa Abstract: This manual documents pbuilder for users -Section: Apps/Tools +Section: Debian Format: HTML Index: /usr/share/doc/pbuilder/pbuilder-doc.html diff -Nru pbuilder-0.181ubuntu3/debian/po/ca.po pbuilder-0.181ubuntu4/debian/po/ca.po --- pbuilder-0.181ubuntu3/debian/po/ca.po 2008-05-24 09:04:48.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/po/ca.po 2008-08-02 18:32:29.000000000 -0400 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.179\n" -"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" -"POT-Creation-Date: 2008-03-07 00:09+0900\n" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: 2008-05-11 17:03+0200\n" "Last-Translator: Jordà Polo \n" "Language-Team: Català \n" @@ -44,7 +44,9 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +#, fuzzy +#| msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "Un exemple de rèplica vàlida seria: http://cdn.debian.net/debian" #. Type: error diff -Nru pbuilder-0.181ubuntu3/debian/po/cs.po pbuilder-0.181ubuntu4/debian/po/cs.po --- pbuilder-0.181ubuntu3/debian/po/cs.po 2008-05-24 09:02:24.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/po/cs.po 2008-08-02 18:32:29.000000000 -0400 @@ -6,8 +6,8 @@ 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" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: 2008-05-17 13:43+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -35,13 +35,15 @@ "information. If this attempt fails, you will be prompted again to insert " "some valid mirror information." msgstr "" -"Ponecháte-li pole prázdné, zkusím tuto informaci zjistit sám. Pokud se to g" -"nepovede, budete znovu dotázáni na zadání platného zrcadla." +"Ponecháte-li pole prázdné, zkusím tuto informaci zjistit sám. Pokud se to " +"gnepovede, budete znovu dotázáni na zadání platného zrcadla." #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +#, fuzzy +#| msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "Příklad platného zrcadla: http://cdn.debian.net/debian" #. Type: error diff -Nru pbuilder-0.181ubuntu3/debian/po/de.po pbuilder-0.181ubuntu4/debian/po/de.po --- pbuilder-0.181ubuntu3/debian/po/de.po 2008-04-09 10:33:52.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/po/de.po 2008-08-02 18:32:29.000000000 -0400 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: pbuilder 0.179\n" -"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" -"POT-Creation-Date: 2008-03-07 00:09+0900\n" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: 2008-04-03 21:52+0200\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: de \n" @@ -42,7 +42,9 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +#, fuzzy +#| msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "" "Ein Beispiel fr einen gltigen Spiegelserver: http://cdn.debian.net/debian" diff -Nru pbuilder-0.181ubuntu3/debian/po/eu.po pbuilder-0.181ubuntu4/debian/po/eu.po --- pbuilder-0.181ubuntu3/debian/po/eu.po 2008-05-24 09:03:53.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/po/eu.po 2008-08-02 18:32:29.000000000 -0400 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: xb-pbuilder-templates-eu\n" -"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" -"POT-Creation-Date: 2008-03-07 00:09+0900\n" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: 2008-05-17 21:46+0200\n" "Last-Translator: xabier bilbao \n" "Language-Team: basque \n" @@ -26,7 +26,8 @@ #. Description #: ../pbuilder.templates:1001 msgid "Please enter the default mirror you want to be used by pbuilder." -msgstr "Sartu mesedez pbuilder-ek lehenetsi gisa erabiltzea nahi duzun ispilu-gunea." +msgstr "" +"Sartu mesedez pbuilder-ek lehenetsi gisa erabiltzea nahi duzun ispilu-gunea." #. Type: string #. Description @@ -36,14 +37,16 @@ "information. If this attempt fails, you will be prompted again to insert " "some valid mirror information." msgstr "" -"Eremu hau hutsik uzten baduzu, informazio hau automatikoki atzemateko " -"saio bat egingo da. Saio honek huts egiten baldin badu, berriro " -"eskatuko zaizu baliozko ispilu baten informazioa sartzeko." +"Eremu hau hutsik uzten baduzu, informazio hau automatikoki atzemateko saio " +"bat egingo da. Saio honek huts egiten baldin badu, berriro eskatuko zaizu " +"baliozko ispilu baten informazioa sartzeko." #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +#, fuzzy +#| msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "Hau da baliozko ispilu baten adibidea: http://cdn.debian.net/debian" #. Type: error @@ -84,4 +87,3 @@ "Zure sistemak pbuilder konfigurazioa baduela dirudi. Aurrera jarraituz gero, " "baliteke pbuilder-en konfigurazio osoa edo zati bat baztertzea edo " "gainidaztea." - diff -Nru pbuilder-0.181ubuntu3/debian/po/fi.po pbuilder-0.181ubuntu4/debian/po/fi.po --- pbuilder-0.181ubuntu3/debian/po/fi.po 2008-05-24 09:05:32.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/po/fi.po 2008-08-02 18:32:30.000000000 -0400 @@ -1,8 +1,8 @@ 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" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: 2008-05-20 22:26+0200\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" @@ -27,13 +27,21 @@ #. 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 "Jos tämä kenttä jätetään tyhjäksi, yritetään tieto löytää kerran automaattisesti. Jos tämä epäonnistuu, pyydetään kelvollista peiliä uudelleen." +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 "" +"Jos tämä kenttä jätetään tyhjäksi, yritetään tieto löytää kerran " +"automaattisesti. Jos tämä epäonnistuu, pyydetään kelvollista peiliä " +"uudelleen." #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +#, fuzzy +#| msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "Esimerkki kelvollisesta peilistä: http://cdn.debian.net/debian" #. Type: error @@ -45,7 +53,9 @@ #. Type: error #. Description #: ../pbuilder.templates:2001 -msgid "Mirror information detection failed and the user provided no mirror information." +msgid "" +"Mirror information detection failed and the user provided no mirror " +"information." msgstr "Peilitietojen etsintä epäonnistui, eikä käyttäjä antanut peilitietoja." #. Type: error @@ -63,6 +73,9 @@ #. 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 "Järjestelmässä on jo pbuilder-asetukset. Jatkaminen saattaa hävittää tai kirjoittaa yli osan tai kaikki pbuilderin aiemmista asetuksista." - +msgid "" +"Your system seems to have already pbuilder configuration. Proceeding might " +"discard or overwrite part or the entire pbuilder's configuration." +msgstr "" +"Järjestelmässä on jo pbuilder-asetukset. Jatkaminen saattaa hävittää tai " +"kirjoittaa yli osan tai kaikki pbuilderin aiemmista asetuksista." diff -Nru pbuilder-0.181ubuntu3/debian/po/fr.po pbuilder-0.181ubuntu4/debian/po/fr.po --- pbuilder-0.181ubuntu3/debian/po/fr.po 2008-04-09 10:31:11.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/po/fr.po 2008-08-02 18:32:30.000000000 -0400 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: pbuilder 0.170\n" -"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" -"POT-Creation-Date: 2008-03-07 00:09+0900\n" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: 2008-04-01 11:59+0100\n" "Last-Translator: Fakhry Ezzat \n" "Language-Team: French \n" @@ -43,7 +43,9 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +#, fuzzy +#| msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "Exemple de miroir valable : http://cdn.debian.net/debian" #. Type: error diff -Nru pbuilder-0.181ubuntu3/debian/po/gl.po pbuilder-0.181ubuntu4/debian/po/gl.po --- pbuilder-0.181ubuntu3/debian/po/gl.po 2008-05-24 09:01:41.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/po/gl.po 2008-08-02 18:32:30.000000000 -0400 @@ -5,8 +5,8 @@ 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" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: 2008-05-13 20:51+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -41,7 +41,9 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +#, fuzzy +#| msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "Velaquí un exemplo dunha réplica válida: http://cdn.debian.net/debian" #. Type: error diff -Nru pbuilder-0.181ubuntu3/debian/po/ja.po pbuilder-0.181ubuntu4/debian/po/ja.po --- pbuilder-0.181ubuntu3/debian/po/ja.po 2008-03-06 10:14:18.000000000 -0500 +++ pbuilder-0.181ubuntu4/debian/po/ja.po 2008-08-02 18:32:30.000000000 -0400 @@ -7,8 +7,8 @@ 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" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: 2008-03-07 00:13+0900\n" "Last-Translator: Junichi Uekawa \n" "Language-Team: Japanese \n" @@ -35,12 +35,16 @@ "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 "このフィールドを空白にするとこの情報を自動認識しようとします。もしそれが失敗したら正しいミラーの情報を入力するように求められます。" +msgstr "" +"このフィールドを空白にするとこの情報を自動認識しようとします。もしそれが失敗" +"したら正しいミラーの情報を入力するように求められます。" #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +#, fuzzy +#| msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "正しいミラーの例としては： http://cdn.debian.net/debian" #. Type: error @@ -75,4 +79,6 @@ msgid "" "Your system seems to have already pbuilder configuration. Proceeding might " "discard or overwrite part or the entire pbuilder's configuration." -msgstr "システムにはpbuilderの設定がすでに存在します。このまま進めると一部か全体の設定を上書きしてしまう可能性があります。" +msgstr "" +"システムにはpbuilderの設定がすでに存在します。このまま進めると一部か全体の設" +"定を上書きしてしまう可能性があります。" diff -Nru pbuilder-0.181ubuntu3/debian/po/pt.po pbuilder-0.181ubuntu4/debian/po/pt.po --- pbuilder-0.181ubuntu3/debian/po/pt.po 2008-04-09 10:31:00.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/po/pt.po 2008-08-02 18:32:30.000000000 -0400 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: pbuilder 0.179\n" -"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" -"POT-Creation-Date: 2008-03-07 00:09+0900\n" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: 2008-03-30 22:28+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -26,7 +26,9 @@ #. Description #: ../pbuilder.templates:1001 msgid "Please enter the default mirror you want to be used by pbuilder." -msgstr "Por favor indique o mirror pré-definido que deseja que seja usado pelo pbuilder." +msgstr "" +"Por favor indique o mirror pré-definido que deseja que seja usado pelo " +"pbuilder." #. Type: string #. Description @@ -37,13 +39,15 @@ "some valid mirror information." msgstr "" "Se deixar este campo vazio, irá ser feita uma tentativa de autodetectar esta " -"informação. Se esta tentativa falhar, você será de novo questionado a indicar " -"informação de algum mirror válido." +"informação. Se esta tentativa falhar, você será de novo questionado a " +"indicar informação de algum mirror válido." #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +#, fuzzy +#| msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "Aqui está um exemplo de mirror válido: http://cdn.debian.net/debian" #. Type: error @@ -83,4 +87,3 @@ msgstr "" "O seu sistema parece já ter uma configuração de pbuider. Prosseguir poderá " "anular ou sobreescrever partes ou toda a configuração do pbuilder." - diff -Nru pbuilder-0.181ubuntu3/debian/po/ro.po pbuilder-0.181ubuntu4/debian/po/ro.po --- pbuilder-0.181ubuntu3/debian/po/ro.po 2008-03-06 19:17:51.000000000 -0500 +++ pbuilder-0.181ubuntu4/debian/po/ro.po 2008-08-02 18:32:30.000000000 -0400 @@ -8,15 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" -"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" -"POT-Creation-Date: 2008-03-07 00:09+0900\n" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: 2008-03-06 22:19+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" "X-Generator: KBabel 1.11.4\n" #. Type: string @@ -29,7 +30,8 @@ #. Description #: ../pbuilder.templates:1001 msgid "Please enter the default mirror you want to be used by pbuilder." -msgstr "Introduceți saitul-oglindă implicit pe care doriți să-l folosească pbuilder." +msgstr "" +"Introduceți saitul-oglindă implicit pe care doriți să-l folosească pbuilder." #. Type: string #. Description @@ -46,8 +48,9 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -#| msgid "Here is a valid mirror example: http://ftp.debian.org/debian" -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +#, fuzzy +#| msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "Iată un exemplu valid de sait-oglindă: http://cdn.debian.net/debian" #. Type: error @@ -88,4 +91,3 @@ "Sistemul pare să aibă deja o configurație pentru pbuilder. Continuarea cu " "această acțiune ar putea duce la ștergerea sau suprascrierea parțială sau " "totală a fișierului de configurare aparținând lui pbuilder." - diff -Nru pbuilder-0.181ubuntu3/debian/po/ru.po pbuilder-0.181ubuntu4/debian/po/ru.po --- pbuilder-0.181ubuntu3/debian/po/ru.po 2008-05-24 09:03:03.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/po/ru.po 2008-08-02 18:32:30.000000000 -0400 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: pbuilder new\n" -"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" -"POT-Creation-Date: 2008-03-07 00:09+0900\n" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: 2008-05-18 09:10+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -15,7 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: string #. Description @@ -27,7 +28,8 @@ #. Description #: ../pbuilder.templates:1001 msgid "Please enter the default mirror you want to be used by pbuilder." -msgstr "Укажите сервер-зеркало, который будет использовать pbuilder по умолчанию." +msgstr "" +"Укажите сервер-зеркало, который будет использовать pbuilder по умолчанию." #. Type: string #. Description @@ -44,7 +46,9 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +#, fuzzy +#| msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "Пример задания сервера-зеркала: http://cdn.debian.net/debian" #. Type: error @@ -60,8 +64,8 @@ "Mirror information detection failed and the user provided no mirror " "information." msgstr "" -"Не удалось определить сервер-зеркало и пользователь также " -"не ввёл эту информацию." +"Не удалось определить сервер-зеркало и пользователь также не ввёл эту " +"информацию." #. Type: error #. Description @@ -82,7 +86,5 @@ "Your system seems to have already pbuilder configuration. Proceeding might " "discard or overwrite part or the entire pbuilder's configuration." msgstr "" -"Кажется, что в вашей системе уже выполнена настройка pbuilder. " -"Продолжение работы может стереть или изменить часть или всю " -"настройку pbuilder." - +"Кажется, что в вашей системе уже выполнена настройка pbuilder. Продолжение " +"работы может стереть или изменить часть или всю настройку pbuilder." diff -Nru pbuilder-0.181ubuntu3/debian/po/templates.pot pbuilder-0.181ubuntu4/debian/po/templates.pot --- pbuilder-0.181ubuntu3/debian/po/templates.pot 2008-03-06 10:14:18.000000000 -0500 +++ pbuilder-0.181ubuntu4/debian/po/templates.pot 2008-08-02 18:32:29.000000000 -0400 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" -"POT-Creation-Date: 2008-03-07 00:09+0900\n" +"Report-Msgid-Bugs-To: Source: pbuilder@packages.debian.org\n" +"POT-Creation-Date: 2008-08-02 18:32-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,7 +40,7 @@ #. Type: string #. Description #: ../pbuilder.templates:1001 -msgid "Here is a valid mirror example: http://cdn.debian.net/debian" +msgid "Here is a valid mirror example: http://archive.ubuntu.com/ubuntu" msgstr "" #. Type: error diff -Nru pbuilder-0.181ubuntu3/debian/rules pbuilder-0.181ubuntu4/debian/rules --- pbuilder-0.181ubuntu3/debian/rules 2008-06-20 05:00:23.000000000 -0400 +++ pbuilder-0.181ubuntu4/debian/rules 2008-08-02 18:30:32.000000000 -0400 @@ -27,7 +27,7 @@ rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) clean + [ ! -f Makefile ] || $(MAKE) clean dh_clean diff -Nru pbuilder-0.181ubuntu3/pbuildd/hookdir/A10dpkg-l.sh pbuilder-0.181ubuntu4/pbuildd/hookdir/A10dpkg-l.sh --- pbuilder-0.181ubuntu3/pbuildd/hookdir/A10dpkg-l.sh 2008-05-24 18:54:07.000000000 -0400 +++ pbuilder-0.181ubuntu4/pbuildd/hookdir/A10dpkg-l.sh 2008-08-02 22:21:24.000000000 -0400 @@ -1 +1,2 @@ +#!/bin/sh dpkg -l diff -Nru pbuilder-0.181ubuntu3/pbuilder.8 pbuilder-0.181ubuntu4/pbuilder.8 --- pbuilder-0.181ubuntu3/pbuilder.8 2008-05-24 18:54:05.000000000 -0400 +++ pbuilder-0.181ubuntu4/pbuilder.8 2008-08-03 23:23:44.000000000 -0400 @@ -272,6 +272,13 @@ unpacking the build system, and unpacking the source, and satisfying the build-dependency. +.B "\-\-twice" +is for +.B "--build" +option +It builds the package twice in a row to check for possible clean issues. It +will generate the .deb of the second build. + .B "B" is executed after build system finishes building, successfully, before copying back the build result. diff -Nru pbuilder-0.181ubuntu3/pbuilder-buildpackage pbuilder-0.181ubuntu4/pbuilder-buildpackage --- pbuilder-0.181ubuntu3/pbuilder-buildpackage 2008-05-24 18:54:05.000000000 -0400 +++ pbuilder-0.181ubuntu4/pbuilder-buildpackage 2008-08-03 23:20:33.000000000 -0400 @@ -117,8 +117,14 @@ if [ -z "$DEBEMAIL" ]; then DPKG_COMMANDLINE="cd tmp/buildd/*/; dpkg-buildpackage -us -uc $DEBBUILDOPTS" + if [ -z "$TWICE" ]; then + DPKG_COMMANDLINE="$DPKG_COMMANDLINE; dpkg-buildpackage -us -uc $DEBBUILDOPTS" + fi else DPKG_COMMANDLINE="cd tmp/buildd/*/; dpkg-buildpackage -us -uc \"-m$DEBEMAIL\" $DEBBUILDOPTS" + if [ -z "$TWICE" ]; then + DPKG_COMMANDLINE="$DPKG_COMMANDLINE; dpkg-buildpackage -us -uc \"-m$DEBEMAIL\" $DEBBUILDOPTS" + fi fi ( diff -Nru pbuilder-0.181ubuntu3/pbuilder-checkparams pbuilder-0.181ubuntu4/pbuilder-checkparams --- pbuilder-0.181ubuntu3/pbuilder-checkparams 2008-05-24 18:54:05.000000000 -0400 +++ pbuilder-0.181ubuntu4/pbuilder-checkparams 2008-08-03 23:10:12.000000000 -0400 @@ -217,6 +217,10 @@ IGNORE_UMOUNT="no" shift; ;; + --twice) + TWICE=True + shift; + ;; --) # end of processing for this shift; break; diff -Nru pbuilder-0.181ubuntu3/pbuilder-modules pbuilder-0.181ubuntu4/pbuilder-modules --- pbuilder-0.181ubuntu3/pbuilder-modules 2008-05-24 18:54:05.000000000 -0400 +++ pbuilder-0.181ubuntu4/pbuilder-modules 2008-08-03 23:26:42.000000000 -0400 @@ -72,6 +72,7 @@ --preserve-buildplace --bindmounts [bind-mount-point] --debug + --twice --autocleanaptcache --debootstrapopts [debootstrap options] --save-after-login/--save-after-exec