Merge lp:~veger/ubuntu/raring/pbuilder/fix-for-1075347 into lp:ubuntu/raring/pbuilder
- Raring (13.04)
- fix-for-1075347
- Merge into raring
Proposed by
Maarten Bezemer
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merge reported by: | Martin Pitt | ||||||||
Merged at revision: | not available | ||||||||
Proposed branch: | lp:~veger/ubuntu/raring/pbuilder/fix-for-1075347 | ||||||||
Merge into: | lp:ubuntu/raring/pbuilder | ||||||||
Diff against target: |
643 lines (+240/-103) 20 files modified
Makefile (+3/-6) bash_completion.d/pbuilder (+8/-7) debian/changelog (+69/-0) debian/control (+2/-1) debian/copyright (+26/-31) debian/pbuilder-test/01_pbuilder_create (+1/-2) debian/pbuilder.links (+0/-1) debian/po/es.po (+20/-20) debian/po/it.po (+88/-0) debuild.sh (+0/-5) elmo.txt (+0/-12) examples/B90lintian (+1/-1) examples/B92test-pkg (+7/-7) pbuilder-apt-config (+1/-1) pbuilder-buildpackage-funcs (+0/-5) pbuilder-createbuildenv (+3/-0) pbuilder-modules (+4/-0) pbuilder-updatebuildenv (+3/-1) pbuilderrc (+3/-2) test_pbuilder-apt-config (+1/-1) |
||||||||
To merge this branch: | bzr merge lp:~veger/ubuntu/raring/pbuilder/fix-for-1075347 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+132989@code.launchpad.net |
Commit message
Description of the change
Only had a small conflict in debian/control: I took the Standard-Version of debian (as this is the accurate version)
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile' | |||
2 | --- Makefile 2012-02-14 10:45:14 +0000 | |||
3 | +++ Makefile 2012-11-05 23:19:22 +0000 | |||
4 | @@ -164,11 +164,7 @@ | |||
5 | 164 | pbuilderrc.5 \ | 164 | pbuilderrc.5 \ |
6 | 165 | pdebuild.1 \ | 165 | pdebuild.1 \ |
7 | 166 | $(NULL) | 166 | $(NULL) |
8 | 167 | NOINST_SCRIPTS += \ | ||
9 | 168 | debuild.sh \ | ||
10 | 169 | $(NULL) | ||
11 | 170 | CHECK_MANPAGES += $(NOINST_MANPAGES) | 167 | CHECK_MANPAGES += $(NOINST_MANPAGES) |
12 | 171 | CHECK_SCRIPTS += $(NOINST_SCRIPTS) | ||
13 | 172 | 168 | ||
14 | 173 | # TODO: check subdirs etc. | 169 | # TODO: check subdirs etc. |
15 | 174 | 170 | ||
16 | @@ -180,13 +176,14 @@ | |||
17 | 180 | 176 | ||
18 | 181 | check: export PBUILDER_CHECKOUT := $(CURDIR) | 177 | check: export PBUILDER_CHECKOUT := $(CURDIR) |
19 | 182 | check: | 178 | check: |
21 | 183 | # syntax check | 179 | # syntax check. |
22 | 184 | $(foreach script,$(CHECK_SCRIPTS),bash -n $(script)$(newline)) | 180 | $(foreach script,$(CHECK_SCRIPTS),bash -n $(script)$(newline)) |
23 | 185 | $(foreach mp,$(CHECK_MANPAGES),LANG=C MANWIDTH=80 man --warnings -l $(mp) >/dev/null$(newline)) | 181 | $(foreach mp,$(CHECK_MANPAGES),LANG=C MANWIDTH=80 man --warnings -l $(mp) >/dev/null$(newline)) |
25 | 186 | # testsuite | 182 | # unit tests. |
26 | 187 | $(foreach test,$(wildcard ./test_*),$(test)$(newline)) | 183 | $(foreach test,$(wildcard ./test_*),$(test)$(newline)) |
27 | 188 | 184 | ||
28 | 189 | full-check: | 185 | full-check: |
29 | 186 | # system tests that might take long. | ||
30 | 190 | cd testsuite && ./run-test.sh | 187 | cd testsuite && ./run-test.sh |
31 | 191 | 188 | ||
32 | 192 | clean: | 189 | clean: |
33 | 193 | 190 | ||
34 | === modified file 'bash_completion.d/pbuilder' | |||
35 | --- bash_completion.d/pbuilder 2012-03-14 14:54:09 +0000 | |||
36 | +++ bash_completion.d/pbuilder 2012-11-05 23:19:22 +0000 | |||
37 | @@ -53,13 +53,14 @@ | |||
38 | 53 | ;; | 53 | ;; |
39 | 54 | *) | 54 | *) |
40 | 55 | # Provide available flags | 55 | # Provide available flags |
48 | 56 | COMPREPLY=( $( compgen -W '--basetgz --buildplace --mirror --othermirror \ | 56 | COMPREPLY=( $( compgen -W '--allow-untrusted --basetgz --buildplace --mirror \ |
49 | 57 | --http-proxy --distribution --architecture --components --buildresult \ | 57 | --othermirror --http-proxy --distribution --architecture --components \ |
50 | 58 | --aptcache --removepackages --extrapackages --configfile --hookdir \ | 58 | --buildresult --aptcache --removepackages --extrapackages --configfile \ |
51 | 59 | --debemail --debbuildopts --logfile --pkgname-logfile --aptconfdir \ | 59 | --hookdir --debemail --debbuildopts --logfile --pkgname-logfile \ |
52 | 60 | --timeout --override-config --binary-arch --preserve-buildplace \ | 60 | --aptconfdir --timeout --override-config --binary-arch \ |
53 | 61 | --bindmounts --debug --twice --autocleanaptcache --compressprog \ | 61 | --preserve-buildplace --bindmounts --debug --twice --autocleanaptcache \ |
54 | 62 | --debootstrapopts --save-after-login --save-after-exec --debootstrap' \ | 62 | --compressprog --debootstrapopts --save-after-login --save-after-exec \ |
55 | 63 | --debootstrap' \ | ||
56 | 63 | -- "$cur" ) ) | 64 | -- "$cur" ) ) |
57 | 64 | if [[ $prev = @(--aptcache|--hookdir) ]]; then | 65 | if [[ $prev = @(--aptcache|--hookdir) ]]; then |
58 | 65 | # Optionally provide a directory | 66 | # Optionally provide a directory |
59 | 66 | 67 | ||
60 | === modified file 'debian/changelog' | |||
61 | --- debian/changelog 2012-03-14 14:54:09 +0000 | |||
62 | +++ debian/changelog 2012-11-05 23:19:22 +0000 | |||
63 | @@ -1,3 +1,72 @@ | |||
64 | 1 | pbuilder (0.213ubuntu1) raring; urgency=low | ||
65 | 2 | |||
66 | 3 | * Merge from Debian unstable (LP: #1075347, LP: #1060101) | ||
67 | 4 | Remaining changes: | ||
68 | 5 | - pbuilderrc, debian/pbuilder.config: Set default archive mirror to | ||
69 | 6 | "archive.ubuntu.com/ubuntu". | ||
70 | 7 | - pbuilderrc: Set default keyring to the Ubuntu one. | ||
71 | 8 | - pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS | ||
72 | 9 | - debian/rules: install temporary locale so man page tests don't cause | ||
73 | 10 | FTBFS. | ||
74 | 11 | * pbuilderrc: Set default distribution to "quantal" | ||
75 | 12 | |||
76 | 13 | -- Maarten Bezemer <maarten.bezemer@gmail.com> Mon, 05 Nov 2012 23:27:25 +0100 | ||
77 | 14 | |||
78 | 15 | pbuilder (0.213) unstable; urgency=low | ||
79 | 16 | |||
80 | 17 | [ Beatrice Torracca ] | ||
81 | 18 | * Bug#686004: [INTL: it] Italian translation of debconf messages - pbuilder | ||
82 | 19 | |||
83 | 20 | [ David Martínez Moreno ] | ||
84 | 21 | * Bug#686410: pbuilder: [INTL:es] Spanish translation update of debconfmessages - pbuilder. | ||
85 | 22 | |||
86 | 23 | [ Junichi Uekawa ] | ||
87 | 24 | * remove /etc/pbuilder/pbuilderrc -> etc/pbuilderrc. (closes: 689213) | ||
88 | 25 | |||
89 | 26 | -- Junichi Uekawa <dancer@debian.org> Mon, 08 Oct 2012 08:30:04 +0900 | ||
90 | 27 | |||
91 | 28 | pbuilder (0.212) unstable; urgency=low | ||
92 | 29 | |||
93 | 30 | * update copyright file to be more machine-process-able, and move | ||
94 | 31 | homepage information to debian/control | ||
95 | 32 | * set ccachedir to default to off. It's a minor optimization that a | ||
96 | 33 | developer may choose to enable at the cost of incompatibility and some | ||
97 | 34 | bugs. (closes: #675691, #675843, #670651) | ||
98 | 35 | |||
99 | 36 | -- Junichi Uekawa <dancer@debian.org> Fri, 24 Aug 2012 04:50:15 +0900 | ||
100 | 37 | |||
101 | 38 | pbuilder (0.211) unstable; urgency=low | ||
102 | 39 | |||
103 | 40 | [ Junichi Uekawa ] | ||
104 | 41 | * policy update: 3.9.1 | ||
105 | 42 | * For testsuite, do not depend on approx instance. It's not always | ||
106 | 43 | reliable and confusing. Just trust autoconfiguration result here. | ||
107 | 44 | * B90lintian requires bashism (closes: #604546) | ||
108 | 45 | |||
109 | 46 | [ Sjoerd Simons ] | ||
110 | 47 | * Recognize armhf as an architecture on ubuntu-ports | ||
111 | 48 | * When testing mirror selection, force an architecture that we know is on that mirror | ||
112 | 49 | (closes: #671007) | ||
113 | 50 | |||
114 | 51 | -- Junichi Uekawa <dancer@debian.org> Wed, 30 May 2012 19:01:25 +0900 | ||
115 | 52 | |||
116 | 53 | pbuilder (0.210) unstable; urgency=low | ||
117 | 54 | |||
118 | 55 | * move around echobacktime definition location. (closes: #666440) | ||
119 | 56 | * B92test-pkg: Having any test fail should make the regression test | ||
120 | 57 | suite to fail and exit with exit value of 1 instead of 0. | ||
121 | 58 | |||
122 | 59 | -- Junichi Uekawa <dancer@debian.org> Sat, 31 Mar 2012 14:33:15 +0900 | ||
123 | 60 | |||
124 | 61 | pbuilder (0.209) unstable; urgency=low | ||
125 | 62 | |||
126 | 63 | * pbuilder: Auto completion is missing --allow-untrusted flag | ||
127 | 64 | (closes: #664323) | ||
128 | 65 | * Show current time in create / update operations too. | ||
129 | 66 | (closes: #613854) | ||
130 | 67 | |||
131 | 68 | -- Junichi Uekawa <dancer@debian.org> Fri, 30 Mar 2012 03:44:30 +0900 | ||
132 | 69 | |||
133 | 1 | pbuilder (0.208ubuntu1) precise; urgency=low | 70 | pbuilder (0.208ubuntu1) precise; urgency=low |
134 | 2 | 71 | ||
135 | 3 | * Merge from Debian unstable (LP: #952938) | 72 | * Merge from Debian unstable (LP: #952938) |
136 | 4 | 73 | ||
137 | === modified file 'debian/control' | |||
138 | --- debian/control 2012-02-14 10:45:14 +0000 | |||
139 | +++ debian/control 2012-11-05 23:19:22 +0000 | |||
140 | @@ -15,7 +15,7 @@ | |||
141 | 15 | debconf|debconf-2.0, | 15 | debconf|debconf-2.0, |
142 | 16 | po-debconf, | 16 | po-debconf, |
143 | 17 | po4a | 17 | po4a |
145 | 18 | Standards-Version: 3.8.3 | 18 | Standards-Version: 3.9.1 |
146 | 19 | XS-Debian-Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git | 19 | XS-Debian-Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git |
147 | 20 | XS-Debian-Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git | 20 | XS-Debian-Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git |
148 | 21 | 21 | ||
149 | @@ -33,6 +33,7 @@ | |||
150 | 33 | Suggests: pbuilder-uml, | 33 | Suggests: pbuilder-uml, |
151 | 34 | gdebi-core, | 34 | gdebi-core, |
152 | 35 | cowdancer | 35 | cowdancer |
153 | 36 | Homepage: http://pbuilder.alioth.debian.org | ||
154 | 36 | Description: personal package builder for Debian packages | 37 | Description: personal package builder for Debian packages |
155 | 37 | pbuilder constructs a chroot system, and builds a package inside the | 38 | pbuilder constructs a chroot system, and builds a package inside the |
156 | 38 | chroot. | 39 | chroot. |
157 | 39 | 40 | ||
158 | === modified file 'debian/copyright' | |||
159 | --- debian/copyright 2009-11-25 11:37:25 +0000 | |||
160 | +++ debian/copyright 2012-11-05 23:19:22 +0000 | |||
161 | @@ -1,31 +1,26 @@ | |||
193 | 1 | This package was debianized by Junichi Uekawa <dancer@debian.org> on | 1 | Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
194 | 2 | Sat, 28 Jul 2001 17:05:50 +0900. | 2 | Upstream-Name: pbuilder |
195 | 3 | 3 | Upstream-Contact: Junichi Uekawa <dancer@debian.org> | |
196 | 4 | It was downloaded from http://www.netfort.gr.jp/~dancer/software/pbuilder.html | 4 | |
197 | 5 | now from http://pbuilder.alioth.debian.org | 5 | Files: * |
198 | 6 | 6 | Copyright: Copyright 2001-2007 Junichi Uekawa | |
199 | 7 | Upstream Author: | 7 | Copyright (C) 2010 Loïc Minier <lool@dooz.org> |
200 | 8 | Junichi Uekawa <dancer@netfort.gr.jp> and others. | 8 | # pbuilder -- personal Debian package builder |
201 | 9 | 9 | # Copyright (C) 2001-2007 Junichi Uekawa | |
202 | 10 | 10 | # | |
203 | 11 | Copyright: | 11 | # This program is free software; you can redistribute it and/or modify |
204 | 12 | 12 | # it under the terms of the GNU General Public License as published by | |
205 | 13 | # pbuilder -- personal Debian package builder | 13 | # the Free Software Foundation; either version 2 of the License, or |
206 | 14 | # Copyright (C) 2001-2007 Junichi Uekawa | 14 | # (at your option) any later version. |
207 | 15 | # | 15 | # |
208 | 16 | # This program is free software; you can redistribute it and/or modify | 16 | # This program is distributed in the hope that it will be useful, |
209 | 17 | # it under the terms of the GNU General Public License as published by | 17 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
210 | 18 | # the Free Software Foundation; either version 2 of the License, or | 18 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
211 | 19 | # (at your option) any later version. | 19 | # GNU General Public License for more details. |
212 | 20 | # | 20 | # |
213 | 21 | # This program is distributed in the hope that it will be useful, | 21 | # You should have received a copy of the GNU General Public License |
214 | 22 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 22 | # along with this program; if not, write to the Free Software |
215 | 23 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 23 | # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
216 | 24 | # GNU General Public License for more details. | 24 | License: GPL-2+ |
217 | 25 | # | 25 | |
218 | 26 | # You should have received a copy of the GNU General Public License | 26 | |
188 | 27 | # along with this program; if not, write to the Free Software | ||
189 | 28 | # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
190 | 29 | |||
191 | 30 | GPL version 2 or later. | ||
192 | 31 | See /usr/share/common-licenses/GPL-2 on Debian systems. | ||
219 | 32 | \ No newline at end of file | 27 | \ No newline at end of file |
220 | 33 | 28 | ||
221 | === modified file 'debian/pbuilder-test/01_pbuilder_create' | |||
222 | --- debian/pbuilder-test/01_pbuilder_create 2009-07-22 13:42:01 +0000 | |||
223 | +++ debian/pbuilder-test/01_pbuilder_create 2012-11-05 23:19:22 +0000 | |||
224 | @@ -1,4 +1,3 @@ | |||
225 | 1 | #!/bin/bash | 1 | #!/bin/bash |
226 | 2 | env -u COWDANCER_REUSE -u COWDANCER_ILISTFILE -u LD_PRELOAD \ | 2 | env -u COWDANCER_REUSE -u COWDANCER_ILISTFILE -u LD_PRELOAD \ |
229 | 3 | pbuilder create --distribution sid --debootstrap debootstrap \ | 3 | pbuilder create --distribution sid --debootstrap debootstrap |
228 | 4 | --mirror http://localhost:9999/debian | ||
230 | 5 | 4 | ||
231 | === removed file 'debian/pbuilder.links' | |||
232 | --- debian/pbuilder.links 2004-06-19 11:27:10 +0000 | |||
233 | +++ debian/pbuilder.links 1970-01-01 00:00:00 +0000 | |||
234 | @@ -1,1 +0,0 @@ | |||
235 | 1 | /etc/pbuilderrc /etc/pbuilder/pbuilderrc | ||
236 | 2 | \ No newline at end of file | 0 | \ No newline at end of file |
237 | 3 | 1 | ||
238 | === modified file 'debian/po/es.po' | |||
239 | --- debian/po/es.po 2009-07-22 13:42:01 +0000 | |||
240 | +++ debian/po/es.po 2012-11-05 23:19:22 +0000 | |||
241 | @@ -4,7 +4,7 @@ | |||
242 | 4 | # Changes: | 4 | # Changes: |
243 | 5 | # - Initial translation | 5 | # - Initial translation |
244 | 6 | # Ignacio Mondino <ignacio.mondino@gmail.com>, 2008 | 6 | # Ignacio Mondino <ignacio.mondino@gmail.com>, 2008 |
246 | 7 | # Traductores, si no conoce el formato PO, merece la pena leer la | 7 | # Traductor, si no conoce el formato PO, merece la pena leer la |
247 | 8 | # documentación de gettext, especialmente las secciones dedicadas a este | 8 | # documentación de gettext, especialmente las secciones dedicadas a este |
248 | 9 | # formato, por ejemplo ejecutando: | 9 | # formato, por ejemplo ejecutando: |
249 | 10 | # info -n '(gettext)PO Files' | 10 | # info -n '(gettext)PO Files' |
250 | @@ -18,32 +18,33 @@ | |||
251 | 18 | # - La guía de traducción de po's de debconf: | 18 | # - La guía de traducción de po's de debconf: |
252 | 19 | # /usr/share/doc/po-debconf/README-trans | 19 | # /usr/share/doc/po-debconf/README-trans |
253 | 20 | # o http://www.debian.org/intl/l10n/po-debconf/README-trans | 20 | # o http://www.debian.org/intl/l10n/po-debconf/README-trans |
256 | 21 | # | 21 | # |
257 | 22 | # | 22 | # |
258 | 23 | msgid "" | 23 | msgid "" |
259 | 24 | msgstr "" | 24 | msgstr "" |
260 | 25 | "Project-Id-Version: pbuilder_0.181\n" | 25 | "Project-Id-Version: pbuilder_0.181\n" |
261 | 26 | "Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" | 26 | "Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" |
262 | 27 | "POT-Creation-Date: 2008-03-07 00:09+0900\n" | 27 | "POT-Creation-Date: 2008-03-07 00:09+0900\n" |
265 | 28 | "PO-Revision-Date: 2008-08-03 18:50-0300\n" | 28 | "PO-Revision-Date: 2012-08-31 22:35-0700\n" |
266 | 29 | "Last-Translator: Ignacio Mondino <ignacio.mondino@gmail.com>\n" | 29 | "Last-Translator: David Martínez Moreno <ender@debian.org>\n" |
267 | 30 | "Language-Team: Debian Spanish team <debian-l10n-spanish@lists.debian.org>\n" | 30 | "Language-Team: Debian Spanish team <debian-l10n-spanish@lists.debian.org>\n" |
268 | 31 | "Language: \n" | ||
269 | 31 | "MIME-Version: 1.0\n" | 32 | "MIME-Version: 1.0\n" |
270 | 32 | "Content-Type: text/plain; charset=UTF-8\n" | 33 | "Content-Type: text/plain; charset=UTF-8\n" |
272 | 33 | "Content-Transfer-Encoding: 8bit" | 34 | "Content-Transfer-Encoding: 8bit\n" |
273 | 34 | 35 | ||
274 | 35 | #. Type: string | 36 | #. Type: string |
275 | 36 | #. Description | 37 | #. Description |
276 | 37 | #: ../pbuilder.templates:1001 | 38 | #: ../pbuilder.templates:1001 |
277 | 38 | msgid "Default mirror site:" | 39 | msgid "Default mirror site:" |
279 | 39 | msgstr "Replica por omisión:" | 40 | msgstr "Réplica por omisión:" |
280 | 40 | 41 | ||
281 | 41 | #. Type: string | 42 | #. Type: string |
282 | 42 | #. Description | 43 | #. Description |
283 | 43 | #: ../pbuilder.templates:1001 | 44 | #: ../pbuilder.templates:1001 |
284 | 44 | msgid "Please enter the default mirror you want to be used by pbuilder." | 45 | msgid "Please enter the default mirror you want to be used by pbuilder." |
287 | 45 | msgstr "Por favor ingrese la replica por omisión la cual desea que sea " | 46 | msgstr "" |
288 | 46 | "utilizada por pbuilder." | 47 | "Por favor, introduzca la réplica que desea utilizar por omisión en pbuilder." |
289 | 47 | 48 | ||
290 | 48 | #. Type: string | 49 | #. Type: string |
291 | 49 | #. Description | 50 | #. Description |
292 | @@ -53,21 +54,21 @@ | |||
293 | 53 | "information. If this attempt fails, you will be prompted again to insert " | 54 | "information. If this attempt fails, you will be prompted again to insert " |
294 | 54 | "some valid mirror information." | 55 | "some valid mirror information." |
295 | 55 | msgstr "" | 56 | msgstr "" |
299 | 56 | "Si deja este campo en blanco, se hará un intento para auto detectar esta " | 57 | "Si deja este campo en blanco, se intentará autodetectar esta " |
300 | 57 | "información. Si este intento falla, se le pedirá nuevamente que ingrese " | 58 | "información. Si esto falla, se le pedirá nuevamente que introduzca " |
301 | 58 | "información valida sobre la replica." | 59 | "información válida sobre una réplica." |
302 | 59 | 60 | ||
303 | 60 | #. Type: string | 61 | #. Type: string |
304 | 61 | #. Description | 62 | #. Description |
305 | 62 | #: ../pbuilder.templates:1001 | 63 | #: ../pbuilder.templates:1001 |
306 | 63 | msgid "Here is a valid mirror example: http://cdn.debian.net/debian" | 64 | msgid "Here is a valid mirror example: http://cdn.debian.net/debian" |
308 | 64 | msgstr "He aquí un ejemplo de una replica valida: http://cdn.debian.net/debian" | 65 | msgstr "He aquí un ejemplo de una réplica válida: http://cdn.debian.net/debian" |
309 | 65 | 66 | ||
310 | 66 | #. Type: error | 67 | #. Type: error |
311 | 67 | #. Description | 68 | #. Description |
312 | 68 | #: ../pbuilder.templates:2001 | 69 | #: ../pbuilder.templates:2001 |
313 | 69 | msgid "Default mirror not found" | 70 | msgid "Default mirror not found" |
315 | 70 | msgstr "No se encontró la replica por omisión" | 71 | msgstr "No se encontró la réplica por omisión" |
316 | 71 | 72 | ||
317 | 72 | #. Type: error | 73 | #. Type: error |
318 | 73 | #. Description | 74 | #. Description |
319 | @@ -76,14 +77,14 @@ | |||
320 | 76 | "Mirror information detection failed and the user provided no mirror " | 77 | "Mirror information detection failed and the user provided no mirror " |
321 | 77 | "information." | 78 | "information." |
322 | 78 | msgstr "" | 79 | msgstr "" |
325 | 79 | "Ha fallado la auto detección de la información de la replica y el usuario no " | 80 | "Ha fallado la autodetección de la información de la réplica y el usuario no " |
326 | 80 | "ha ingreso ninguna información sobre la misma." | 81 | "ha introducido ninguna información sobre la misma." |
327 | 81 | 82 | ||
328 | 82 | #. Type: error | 83 | #. Type: error |
329 | 83 | #. Description | 84 | #. Description |
330 | 84 | #: ../pbuilder.templates:2001 | 85 | #: ../pbuilder.templates:2001 |
331 | 85 | msgid "Please enter valid mirror information." | 86 | msgid "Please enter valid mirror information." |
333 | 86 | msgstr "Por favor ingrese información valida sobre una replica." | 87 | msgstr "Por favor, introduzca información válida sobre una réplica." |
334 | 87 | 88 | ||
335 | 88 | #. Type: boolean | 89 | #. Type: boolean |
336 | 89 | #. Description | 90 | #. Description |
337 | @@ -98,7 +99,6 @@ | |||
338 | 98 | "Your system seems to have already pbuilder configuration. Proceeding might " | 99 | "Your system seems to have already pbuilder configuration. Proceeding might " |
339 | 99 | "discard or overwrite part or the entire pbuilder's configuration." | 100 | "discard or overwrite part or the entire pbuilder's configuration." |
340 | 100 | msgstr "" | 101 | msgstr "" |
343 | 101 | "Su sistema parece ya disponer de una configuración de pbuilder. El proseguir " | 102 | "Su sistema parece ya disponer de una configuración de pbuilder. Si prosigue " |
344 | 102 | "puede descartar o sobreescribir parcial o totalmente la configuración de " | 103 | "puede descartar o sobreescribir parcial o totalmente la configuración existente de " |
345 | 103 | "pbuilder." | 104 | "pbuilder." |
346 | 104 | |||
347 | 105 | 105 | ||
348 | === added file 'debian/po/it.po' | |||
349 | --- debian/po/it.po 1970-01-01 00:00:00 +0000 | |||
350 | +++ debian/po/it.po 2012-11-05 23:19:22 +0000 | |||
351 | @@ -0,0 +1,88 @@ | |||
352 | 1 | # Italian translation of pbuilder debconf messages. | ||
353 | 2 | # Copyright (C) 2012, pbuilder package copyright holder. | ||
354 | 3 | # This file is distributed under the same license as the pbuilder package. | ||
355 | 4 | # Beatrice Torracca <beatricet@libero.it>, 2012. | ||
356 | 5 | msgid "" | ||
357 | 6 | msgstr "" | ||
358 | 7 | "Project-Id-Version: pbuilder\n" | ||
359 | 8 | "Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n" | ||
360 | 9 | "POT-Creation-Date: 2008-03-07 00:09+0900\n" | ||
361 | 10 | "PO-Revision-Date: 2012-08-27 16:19+0200\n" | ||
362 | 11 | "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" | ||
363 | 12 | "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" | ||
364 | 13 | "Language: it\n" | ||
365 | 14 | "MIME-Version: 1.0\n" | ||
366 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
367 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
368 | 17 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" | ||
369 | 18 | "X-Generator: Virtaal 0.7.1\n" | ||
370 | 19 | |||
371 | 20 | #. Type: string | ||
372 | 21 | #. Description | ||
373 | 22 | #: ../pbuilder.templates:1001 | ||
374 | 23 | msgid "Default mirror site:" | ||
375 | 24 | msgstr "Sito mirror predefinito:" | ||
376 | 25 | |||
377 | 26 | #. Type: string | ||
378 | 27 | #. Description | ||
379 | 28 | #: ../pbuilder.templates:1001 | ||
380 | 29 | msgid "Please enter the default mirror you want to be used by pbuilder." | ||
381 | 30 | msgstr "Inserire il mirror predefinito che deve essere usato da pbuilder." | ||
382 | 31 | |||
383 | 32 | #. Type: string | ||
384 | 33 | #. Description | ||
385 | 34 | #: ../pbuilder.templates:1001 | ||
386 | 35 | msgid "" | ||
387 | 36 | "If you leave this field blank, there will be one attempt to autodetect this " | ||
388 | 37 | "information. If this attempt fails, you will be prompted again to insert " | ||
389 | 38 | "some valid mirror information." | ||
390 | 39 | msgstr "" | ||
391 | 40 | "Se questo campo viene lasciato vuoto, verrà fatto un tentativo di rilevare " | ||
392 | 41 | "automaticamente questa informazione. Se tale tentativo fallirà, verrà " | ||
393 | 42 | "chiesto nuovamente di inserire una qualche informazione valida per un " | ||
394 | 43 | "mirror." | ||
395 | 44 | |||
396 | 45 | #. Type: string | ||
397 | 46 | #. Description | ||
398 | 47 | #: ../pbuilder.templates:1001 | ||
399 | 48 | msgid "Here is a valid mirror example: http://cdn.debian.net/debian" | ||
400 | 49 | msgstr "Ecco un esempio di mirror valido: http://cdn.debian.net/debian" | ||
401 | 50 | |||
402 | 51 | #. Type: error | ||
403 | 52 | #. Description | ||
404 | 53 | #: ../pbuilder.templates:2001 | ||
405 | 54 | msgid "Default mirror not found" | ||
406 | 55 | msgstr "Mirror predefinito non trovato" | ||
407 | 56 | |||
408 | 57 | #. Type: error | ||
409 | 58 | #. Description | ||
410 | 59 | #: ../pbuilder.templates:2001 | ||
411 | 60 | msgid "" | ||
412 | 61 | "Mirror information detection failed and the user provided no mirror " | ||
413 | 62 | "information." | ||
414 | 63 | msgstr "" | ||
415 | 64 | "Il rilevamento delle informazioni sul mirror non è riuscito e l'utente non " | ||
416 | 65 | "ne ha fornita alcuna." | ||
417 | 66 | |||
418 | 67 | #. Type: error | ||
419 | 68 | #. Description | ||
420 | 69 | #: ../pbuilder.templates:2001 | ||
421 | 70 | msgid "Please enter valid mirror information." | ||
422 | 71 | msgstr "Inserire delle informazioni sul mirror valide." | ||
423 | 72 | |||
424 | 73 | #. Type: boolean | ||
425 | 74 | #. Description | ||
426 | 75 | #: ../pbuilder.templates:3001 | ||
427 | 76 | msgid "Overwrite current configuration?" | ||
428 | 77 | msgstr "Sovrascrivere la configurazione attuale?" | ||
429 | 78 | |||
430 | 79 | #. Type: boolean | ||
431 | 80 | #. Description | ||
432 | 81 | #: ../pbuilder.templates:3001 | ||
433 | 82 | msgid "" | ||
434 | 83 | "Your system seems to have already pbuilder configuration. Proceeding might " | ||
435 | 84 | "discard or overwrite part or the entire pbuilder's configuration." | ||
436 | 85 | msgstr "" | ||
437 | 86 | "Il sistema sembra avere già una configurazione per pbuilder. Procedendo si " | ||
438 | 87 | "potrebbero perdere o sovrascrivere la configurazione di pbuilder in parte o " | ||
439 | 88 | "del tutto." | ||
440 | 0 | 89 | ||
441 | === removed file 'debuild.sh' | |||
442 | --- debuild.sh 2008-05-29 10:51:09 +0000 | |||
443 | +++ debuild.sh 1970-01-01 00:00:00 +0000 | |||
444 | @@ -1,5 +0,0 @@ | |||
445 | 1 | # run debuild with .git ignore. | ||
446 | 2 | debuild -us -uc -I.git | ||
447 | 3 | git push --tags | ||
448 | 4 | git push --all | ||
449 | 5 | |||
450 | 6 | 0 | ||
451 | === removed file 'elmo.txt' | |||
452 | --- elmo.txt 2004-06-19 11:27:10 +0000 | |||
453 | +++ elmo.txt 1970-01-01 00:00:00 +0000 | |||
454 | @@ -1,12 +0,0 @@ | |||
455 | 1 | |||
456 | 2 | <dancerj> Hmm... DoBuildDep seems rather long | ||
457 | 3 | <elmo_h> dancerj: python/perl apt can do that for you | ||
458 | 4 | elmo elmo_h | ||
459 | 5 | <elmo_h> or presumably some C{++,} glue using libapt | ||
460 | 6 | <elmo_h> (FWIW, etc.) | ||
461 | 7 | <dancerj> 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 | ||
462 | 8 | <elmo_h> yes, katie (or jennifer, technically) runs apt_pkg.ParseSrcDepends on .dscs in incoming to sanity check them.. | ||
463 | 9 | <dancerj> hmm.. | ||
464 | 10 | |||
465 | 11 | 29 Oct 2003. | ||
466 | 12 | |||
467 | 13 | 0 | ||
468 | === modified file 'examples/B90lintian' | |||
469 | --- examples/B90lintian 2010-07-05 22:35:40 +0000 | |||
470 | +++ examples/B90lintian 2012-11-05 23:19:22 +0000 | |||
471 | @@ -1,4 +1,4 @@ | |||
473 | 1 | #!/bin/sh | 1 | #!/bin/bash |
474 | 2 | 2 | ||
475 | 3 | set -e | 3 | set -e |
476 | 4 | 4 | ||
477 | 5 | 5 | ||
478 | === modified file 'examples/B92test-pkg' | |||
479 | --- examples/B92test-pkg 2010-10-13 19:14:46 +0000 | |||
480 | +++ examples/B92test-pkg 2012-11-05 23:19:22 +0000 | |||
481 | @@ -8,15 +8,14 @@ | |||
482 | 8 | set -e | 8 | set -e |
483 | 9 | 9 | ||
484 | 10 | echo "Installing the prerequisites" | 10 | echo "Installing the prerequisites" |
485 | 11 | # ignore the failures since they are not the prime interest | ||
486 | 12 | for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do | 11 | for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do |
488 | 13 | apt-get install -y "${APTGETOPT[@]}" "$PKG" || true | 12 | apt-get install -y --force-yes "$PKG" || true |
489 | 14 | apt-get remove -y "$PKG" || true | 13 | apt-get remove -y "$PKG" || true |
490 | 15 | done | 14 | done |
491 | 15 | # ignore the failures since they are not the prime interest | ||
492 | 16 | 16 | ||
493 | 17 | # install the single package, then try to satisfy dependencies. | ||
494 | 18 | dpkg -i /tmp/buildd/*.deb || true | 17 | dpkg -i /tmp/buildd/*.deb || true |
496 | 19 | apt-get install -y -f "${APTGETOPT[@]}" | 18 | apt-get install -y -f --force-yes |
497 | 20 | 19 | ||
498 | 21 | if chmod a+x /tmp/buildd/*/debian/pbuilder-test/*; then | 20 | if chmod a+x /tmp/buildd/*/debian/pbuilder-test/*; then |
499 | 22 | : | 21 | : |
500 | @@ -24,11 +23,11 @@ | |||
501 | 24 | echo "W: no pbuilder-test script found, skipping" | 23 | echo "W: no pbuilder-test script found, skipping" |
502 | 25 | exit 0 | 24 | exit 0 |
503 | 26 | fi | 25 | fi |
504 | 27 | |||
505 | 28 | SUCCESS=0 | 26 | SUCCESS=0 |
506 | 29 | COUNT=0 | 27 | COUNT=0 |
507 | 30 | unset FAIL || true | 28 | unset FAIL || true |
509 | 31 | NOFAIL=1 | 29 | |
510 | 30 | EXIT_CODE=0 | ||
511 | 32 | 31 | ||
512 | 33 | # The current directory is the top of the source-tree. | 32 | # The current directory is the top of the source-tree. |
513 | 34 | cd /tmp/buildd/*/debian/.. | 33 | cd /tmp/buildd/*/debian/.. |
514 | @@ -41,7 +40,7 @@ | |||
515 | 41 | else | 40 | else |
516 | 42 | echo FAIL | 41 | echo FAIL |
517 | 43 | FAIL[${#FAIL[@]}]="${SCRIPT##*/}" | 42 | FAIL[${#FAIL[@]}]="${SCRIPT##*/}" |
519 | 44 | NOFAIL=0 | 43 | EXIT_CODE=1 |
520 | 45 | fi | 44 | fi |
521 | 46 | echo "--- END test: ${SCRIPT##*/}" | 45 | echo "--- END test: ${SCRIPT##*/}" |
522 | 47 | ((COUNT=COUNT+1)) | 46 | ((COUNT=COUNT+1)) |
523 | @@ -52,3 +51,4 @@ | |||
524 | 52 | echo "${FAIL[@]/#/ failed }" | 51 | echo "${FAIL[@]/#/ failed }" |
525 | 53 | echo "-- end of testsuite." | 52 | echo "-- end of testsuite." |
526 | 54 | 53 | ||
527 | 54 | exit "${EXIT_CODE}" | ||
528 | 55 | 55 | ||
529 | === modified file 'pbuilder-apt-config' | |||
530 | --- pbuilder-apt-config 2010-06-23 07:21:11 +0000 | |||
531 | +++ pbuilder-apt-config 2012-11-05 23:19:22 +0000 | |||
532 | @@ -67,7 +67,7 @@ | |||
533 | 67 | amd64|i386) | 67 | amd64|i386) |
534 | 68 | echo "ubuntu" | 68 | echo "ubuntu" |
535 | 69 | ;; | 69 | ;; |
537 | 70 | armel|hppa|ia64|lpia|powerpc|sparc) | 70 | armel|armhf|hppa|ia64|lpia|powerpc|sparc) |
538 | 71 | echo "ubuntu-ports" | 71 | echo "ubuntu-ports" |
539 | 72 | ;; | 72 | ;; |
540 | 73 | *) | 73 | *) |
541 | 74 | 74 | ||
542 | === modified file 'pbuilder-buildpackage-funcs' | |||
543 | --- pbuilder-buildpackage-funcs 2011-12-20 10:02:44 +0000 | |||
544 | +++ pbuilder-buildpackage-funcs 2012-11-05 23:19:22 +0000 | |||
545 | @@ -54,11 +54,6 @@ | |||
546 | 54 | fi | 54 | fi |
547 | 55 | } | 55 | } |
548 | 56 | 56 | ||
549 | 57 | function echobacktime () { | ||
550 | 58 | log "I: Current time: $(date)" | ||
551 | 59 | log "I: pbuilder-time-stamp: $(date +%s)" | ||
552 | 60 | } | ||
553 | 61 | |||
554 | 62 | function showbuildbanner () { | 57 | function showbuildbanner () { |
555 | 63 | # show some banners for building | 58 | # show some banners for building |
556 | 64 | log "I: pbuilder-buildpackage/"$(dpkg --print-architecture) | 59 | log "I: pbuilder-buildpackage/"$(dpkg --print-architecture) |
557 | 65 | 60 | ||
558 | === modified file 'pbuilder-createbuildenv' | |||
559 | --- pbuilder-createbuildenv 2012-03-14 14:54:09 +0000 | |||
560 | +++ pbuilder-createbuildenv 2012-11-05 23:19:22 +0000 | |||
561 | @@ -34,6 +34,9 @@ | |||
562 | 34 | TRAP=trap | 34 | TRAP=trap |
563 | 35 | fi | 35 | fi |
564 | 36 | 36 | ||
565 | 37 | # show the current time before doing anything. | ||
566 | 38 | echobacktime | ||
567 | 39 | |||
568 | 37 | # first clean it. | 40 | # first clean it. |
569 | 38 | cleanbuildplace | 41 | cleanbuildplace |
570 | 39 | 42 | ||
571 | 40 | 43 | ||
572 | === modified file 'pbuilder-modules' | |||
573 | --- pbuilder-modules 2012-03-14 14:54:09 +0000 | |||
574 | +++ pbuilder-modules 2012-11-05 23:19:22 +0000 | |||
575 | @@ -459,6 +459,10 @@ | |||
576 | 459 | mkdir -p "$BUILDPLACE/tmp/buildd" | 459 | mkdir -p "$BUILDPLACE/tmp/buildd" |
577 | 460 | } | 460 | } |
578 | 461 | 461 | ||
579 | 462 | function echobacktime () { | ||
580 | 463 | log "I: Current time: $(date)" | ||
581 | 464 | log "I: pbuilder-time-stamp: $(date +%s)" | ||
582 | 465 | } | ||
583 | 462 | 466 | ||
584 | 463 | function recover_aptcache() { | 467 | function recover_aptcache() { |
585 | 464 | local doit | 468 | local doit |
586 | 465 | 469 | ||
587 | === modified file 'pbuilder-updatebuildenv' | |||
588 | --- pbuilder-updatebuildenv 2012-03-14 14:54:09 +0000 | |||
589 | +++ pbuilder-updatebuildenv 2012-11-05 23:19:22 +0000 | |||
590 | @@ -21,7 +21,6 @@ | |||
591 | 21 | . /usr/lib/pbuilder/pbuilder-checkparams | 21 | . /usr/lib/pbuilder/pbuilder-checkparams |
592 | 22 | . /usr/lib/pbuilder/pbuilder-runhooks | 22 | . /usr/lib/pbuilder/pbuilder-runhooks |
593 | 23 | 23 | ||
594 | 24 | |||
595 | 25 | if [ -n "$DISTRIBUTION" ] && [ "$OVERRIDE_APTLINES" = "yes" ]; then | 24 | if [ -n "$DISTRIBUTION" ] && [ "$OVERRIDE_APTLINES" = "yes" ]; then |
596 | 26 | log "I: Upgrading for distribution $DISTRIBUTION" | 25 | log "I: Upgrading for distribution $DISTRIBUTION" |
597 | 27 | fi | 26 | fi |
598 | @@ -31,6 +30,9 @@ | |||
599 | 31 | TRAP=trap | 30 | TRAP=trap |
600 | 32 | fi | 31 | fi |
601 | 33 | 32 | ||
602 | 33 | # show the current time before doing anything. | ||
603 | 34 | echobacktime | ||
604 | 35 | |||
605 | 34 | extractbuildplace | 36 | extractbuildplace |
606 | 35 | $TRAP umountproc_cleanbuildplace_trap exit sighup | 37 | $TRAP umountproc_cleanbuildplace_trap exit sighup |
607 | 36 | 38 | ||
608 | 37 | 39 | ||
609 | === modified file 'pbuilderrc' | |||
610 | --- pbuilderrc 2012-03-14 14:54:09 +0000 | |||
611 | +++ pbuilderrc 2012-11-05 23:19:22 +0000 | |||
612 | @@ -14,7 +14,7 @@ | |||
613 | 14 | BUILDRESULT=/var/cache/pbuilder/result/ | 14 | BUILDRESULT=/var/cache/pbuilder/result/ |
614 | 15 | 15 | ||
615 | 16 | # specifying the distribution forces the distribution on "pbuilder update" | 16 | # specifying the distribution forces the distribution on "pbuilder update" |
617 | 17 | DISTRIBUTION=precise | 17 | DISTRIBUTION=quantal |
618 | 18 | # specifying the architecture passes --arch= to debootstrap; the default is | 18 | # specifying the architecture passes --arch= to debootstrap; the default is |
619 | 19 | # to use the architecture of the host | 19 | # to use the architecture of the host |
620 | 20 | #ARCHITECTURE=`dpkg --print-architecture` | 20 | #ARCHITECTURE=`dpkg --print-architecture` |
621 | @@ -29,7 +29,8 @@ | |||
622 | 29 | #HOOKDIR="/usr/lib/pbuilder/hooks" | 29 | #HOOKDIR="/usr/lib/pbuilder/hooks" |
623 | 30 | HOOKDIR="" | 30 | HOOKDIR="" |
624 | 31 | # NB: this var is private to pbuilder; ccache uses "CCACHE_DIR" instead | 31 | # NB: this var is private to pbuilder; ccache uses "CCACHE_DIR" instead |
626 | 32 | CCACHEDIR="/var/cache/pbuilder/ccache" | 32 | # CCACHEDIR="/var/cache/pbuilder/ccache" |
627 | 33 | CCACHEDIR="" | ||
628 | 33 | 34 | ||
629 | 34 | # make debconf not interact with user | 35 | # make debconf not interact with user |
630 | 35 | export DEBIAN_FRONTEND="noninteractive" | 36 | export DEBIAN_FRONTEND="noninteractive" |
631 | 36 | 37 | ||
632 | === modified file 'test_pbuilder-apt-config' | |||
633 | --- test_pbuilder-apt-config 2011-08-02 07:19:01 +0000 | |||
634 | +++ test_pbuilder-apt-config 2012-11-05 23:19:22 +0000 | |||
635 | @@ -185,7 +185,7 @@ | |||
636 | 185 | 185 | ||
637 | 186 | expect_output "sid" debootstrap_suite --profile sid | 186 | expect_output "sid" debootstrap_suite --profile sid |
638 | 187 | expect_output "sid" debootstrap_suite --profile unstable | 187 | expect_output "sid" debootstrap_suite --profile unstable |
640 | 188 | expect_output "ubuntu-mirror" debootstrap_mirror --profile lucid | 188 | expect_output "ubuntu-mirror" debootstrap_mirror --profile lucid --arch amd64 |
641 | 189 | expect_output "ubuntu-ports-mirror" debootstrap_mirror --profile lucid --arch armel | 189 | expect_output "ubuntu-ports-mirror" debootstrap_mirror --profile lucid --arch armel |
642 | 190 | 190 | ||
643 | 191 | testlib_summary | 191 | testlib_summary |
This was already sponsored.