Merge branch 'lenny' (through tag '1.14.21')

Conflicts:

	ChangeLog
	configure.ac
	debian/changelog
	lib/fields.c
	man/ChangeLog
	man/dpkg-buildpackage.1
	man/po/de.po
	man/po/dpkg-man.pot
	man/po/es.po
	man/po/fr.po
	man/po/hu.po
	man/po/ja.po
	man/po/pl.po
	man/po/pt_BR.po
	man/po/ru.po
	man/po/sv.po
	po/ChangeLog
	po/ja.po
	po/ko.po
	po/ro.po
	src/main.c

ChangeLog

@@ -786,6 +786,93 @@
 
 	* configure.ac: Bump version to 1.15.0~.
 
+2008-08-26  Guillem Jover  <guillem@debian.org>
+
+	* configure.ac: Release 1.14.21.
+
+2008-08-26  Guillem Jover  <guillem@debian.org>
+
+	* man/dpkg.1: Escape hyphen in apt-get command.
+
+2008-08-17  Guillem Jover  <guillem@debian.org>
+
+	* man/dpkg.1: Change reference to dselect as being the preferred
+	fron-end to aptitude. And 'apt-get dselect-upgrade' to be used to
+	act on the current package selections. Add references to aptitude
+	and apt man pages in 'SEE ALSO'.
+
+2008-08-16  Guillem Jover  <guillem@debian.org>
+
+	* src/main.c (setpipe): Set file descriptors to close on exec.
+
+2008-08-15  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-buildpackage.pl (usage): Fix description of -si option.
+	* man/dpkg-buildpackage.1: Match description of -si option with the
+	one from dpkg-genchanges.1.
+
+2008-08-15  Raphael Hertzog  <hertzog@debian.org>
+
+	* Dpkg/Source/Package.pm (new): Call init_options() only if
+	initialize() has been called as it's supposed to be called
+	only after the object has been upgraded to its target type.
+	(init_options): add a comment that explains that this function is
+	not called by Dpkg::Source::Package::V1::init_options() and
+	render the function more robust.
+
+2008-08-15  Ian Jackson  <ian@davenant.greenend.org.uk>
+
+	* src/packages.c (process_queue): When onerr_abort is bigger than 0
+	return instead of breaking out of the loop, to avoid wrongly
+	asserting that !queue.length.
+
+2008-08-15  Guillem Jover  <guillem@debian.org>
+
+	* lib/dbmodify.c (modstatdb_note): Do not call modstatdb_note_core if
+	cstatus does not allow writting. Move the core functionallity to ...
+	(modstatdb_note_core): ... here. New function.
+	* src/help.c (post_postinst_tasks_core): Do not call trig_incorporate
+	if running under --no-act.
+	* src/trigproc.c (trigproc): Do not call maintainer_script_postinst
+	if running under --no-act.
+	(trig_transitional_activate): Do not call trig_file_interests_save
+	if cstatus does not allow writting.
+
+2008-08-15  Guillem Jover  <guillem@debian.org>
+
+	* lib/dpkg-db.h (trig_enqueue_awaited_pend): New function prototype.
+	(trig_fixup_awaiters): Likewise.
+	* lib/dbmodify.c (modstatdb_init): Call trig_fixup_awaiters.
+	* lib/fields.c (f_trigaw): Call trig_enqueue_awaited_pend.
+	* lib/triglib.c (struct pkg_list): New type.
+	(trig_awaited_pend_head): New variable.
+	(trig_enqueue_awaited_pend): New function definition.
+	(trig_fixup_awaiters): Likewise.
+
+2008-06-24  Raphael Hertzog  <hertzog@debian.org>
+
+	* debian/archtable: Add armel.
+
+2008-06-21  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/dpkg-buildpackage.pl, scripts/dpkg-genchanges.pl: Treat
+	debian.tar.gz files (used by 3.0 (quilt) source packages) like
+	diff.gz files when it comes to detection of the kind of upload.
+
+2008-06-21  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package/V3/quilt.pm: Define QUILT_SERIES
+	when running quilt in order to be able to use quilt series with
+	non-standard names (like debian.series or ubuntu.series).
+
+2008-06-18  Raphael Hertzog  <hertzog@debian.org>
+
+	* configure.ac: Bump version to 1.14.21~.
+
+2008-06-18  Raphael Hertzog  <hertzog@debian.org>
+
+	* configure.ac: Release 1.14.20.
+
 2008-06-16  Guillem Jover  <guillem@debian.org>
 
 	* lib/triglib.c (trig_file_interests_ensure): Pass the proper mask

debian/archtable

@@ -17,6 +17,7 @@ ia64-linux-gnu			ia64
 alpha-linux-gnu			alpha
 x86_64-linux-gnu		amd64
 arm-linux-gnu			arm
+arm-linux-gnueabi		armel
 hppa-linux-gnu			hppa
 m68k-linux-gnu			m68k
 mips-linux-gnu			mips

debian/changelog

@@ -89,6 +89,64 @@ dpkg (1.15.0) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Tue, 29 Jul 2008 02:34:59 +0300
 
+dpkg (1.14.21) unstable; urgency=low
+
+  [ Raphael Hertzog ]
+  * Small fix in "3.0 (quilt)" source format when using non-standard name
+    of the quilt series.
+  * Handle debian.tar.gz files like diff.gz in dpkg-buildpackage and
+    dpkg-genchanges to detect the kind of upload.
+  * Add "armel" to /usr/share/dpkg/archtable. Closes: #487768
+  * Modified Dpkg::BuildOptions to recognize and use spaces as separator
+    in DEB_BUILD_OPTIONS (in order to conform with the Debian policy
+    ruling established in #430649).
+  * Fix dpkg-source to not use -i and -I by default with "1.0" source
+    packages. Closes: #495138
+
+  [ Guillem Jover ]
+  * When loading the status file fix up any inconsistent package in state
+    triggers-awaited w/o the corresponding package with pending triggers.
+    Closes: #487637, #486843, #489068
+  * Fix --no-act in triggers related code. Closes: #495097
+  * Do not assert when dpkg stops processing packages due to too many
+    errors occurred while configuring or removing packages.
+    Thanks to Ian Jackson <ian@davenant.greenend.org.uk>. Closes: #483655
+  * Move lzma from dpkg Suggests to Pre-Depends. Closes: #456332
+  * Match description of -si option in dpkg-buildpackage to the one in
+    dpkg-genchanges. Closes: #493743
+  * Close --status-fd file descriptors on exec, so that they are not
+    inherited by the childs. Closes: #471488, #487684
+  * State that the preferred front-end is aptitude and replace one instance
+    of dselect usage with apt-get. Closes: #483785
+
+  [ Updated manpages translations ]
+  * French (Florent Usseil).
+  * German (Helge Kreutzmann).
+
+  [ Updated scripts translations ]
+  * Russian (Yuri Kozlov). Closes: #490076
+  * German (Helge Kreutzmann).
+
+  [ Updated dpkg translations ]
+  * Basque (Piarres Beobide). Closes: #490905
+  * Czech (Miroslav Kure).
+  * French (Christian Perrier).
+  * German (Sven Joachim).
+  * Korean (Changwoo Ryu).
+  * Romanian (Eddy Petrișor).
+  * Russian (Yuri Kozlov). Closes: #488689
+  * Simplified Chinese (Deng Xiyue). Closes: #496176
+  * Slovak (Ivan Masár). Closes: #488903, #495505
+  * Thai (Theppitak Karoonboonyanan). Closes: #488090
+
+  [ Added dpkg translations ]
+  * Lithuanian (Gintautas Miliauskas). Closes: #493326
+
+  [ Updated dselect translations ]
+  * Romanian (Eddy Petrișor).
+
+ -- Guillem Jover <guillem@debian.org>  Tue, 26 Aug 2008 05:32:39 +0300
+
 dpkg (1.14.20) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -126,6 +184,7 @@ dpkg (1.14.20) unstable; urgency=low
   * Brazilian Portuguese (Felipe Augusto van de Wiel).
   * Catalan (Jordi Mallach). Closes: #383448
   * Czech (Miroslav Kure).
+  * French (Christian Perrier).
   * Galician (Jacobo Tarrio). Closes: #483441
   * German (Sven Joachim).
   * Norwegian Bokmal (Hans Fredrik Nordhaug). Closes: #480626
@@ -146,11 +205,6 @@ dpkg (1.14.20) unstable; urgency=low
   * Russian (Yuri Kozlov).
   * Swedish (Peter Karlsson).
 
-  [ Updated programs translations ]
-  * Basque (Piarres Beobide). Closes: #481043
-  * French (Christian Perrier).
-  * Polish (Wiktor Wandachowicz).
-
   [ Updated dselect translations ]
   * Brazilian Portuguese (Felipe Augusto van de Wiel).
   * Polish (Wiktor Wandachowicz).

debian/control

@@ -18,11 +18,11 @@ Build-Depends: debhelper (>= 4.1.81), pkg-config, po4a (>= 0.33.1),
 Package: dpkg
 Architecture: any
 Essential: yes
-Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1)
+Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1), lzma
 Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11),
  dpkg-dev (<< 1.14.16), apt (<< 0.7.7), aptitude (<< 0.4.7-1)
 Replaces: manpages-de (<= 0.4-3), manpages-pl (<= 20051117-1)
-Suggests: apt, lzma
+Suggests: apt
 Description: Debian package management system
  This package privides the low-level infrastructure for handling the
  installation and removal of Debian software packages.

dselect/po/ChangeLog

@@ -1,3 +1,12 @@
+2008-08-17  Guillem Jover  <guillem@debian.org>
+
+	* dselect.pot: Regenerated.
+	* *.po: Merged with dselect.pot.
+
+2008-06-28  Eddy Petrișor <eddy.petrisor@gmail.com>
+
+	* ro.po: Updated to 288t.
+
 2008-06-10  Wiktor Wandachowicz  <siryes@gmail.com>
 
 	* pl.po: Updated to 288t.

dselect/po/ro.po

@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2008-03-30 10:09+0300\n"
-"PO-Revision-Date: 2008-02-09 13:28+0200\n"
+"PO-Revision-Date: 2008-06-28 19:11+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -303,9 +303,8 @@ msgid "Revert to directly requested state for all packages"
 msgstr "Revenire direct la stările cerute pentru toate pachetele"
 
 #: dselect/bindings.cc:161
-#, fuzzy
 msgid "Revert to currently installed state for all packages"
-msgstr "Revenire direct la stările cerute pentru toate pachetele"
+msgstr "Revenire la starea instalată acum pentru toate pachetele"
 
 #: dselect/bindings.cc:164
 msgid "Select currently-highlighted access method"
@@ -561,7 +560,6 @@ msgid "Display, part 1: package listing and status chars"
 msgstr "Afișare, partea 1: lista de pachete și caracterele de stare"
 
 #: dselect/helpmsgs.cc:121
-#, fuzzy
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -600,31 +598,32 @@ msgstr ""
 "pentru a comuta la afișajul detaliat) acestea sunt caractere individuale, de "
 "la stânga la dreapta:\n"
 "\n"
-" Fanion de (E)roare: Spațiu - fără eroare (dar pachetul ar putea fi "
-"deteriorat - vedeți mai jos)\n"
-"                       „R”  - eroare gravă în timpul instalării, are nevoie "
-"de reinstalare;\n"
-" Starea (I)nstalării:  Spațiu - neinstalat;\n"
-"                         „*”  - instalat;\n"
-"                         „-”  - neinstalat dar fișierele de configurare "
-"rămân;\n"
-"          pachetele în { „U”  - despachetat dar încă neconfigurat;\n"
-"          aceste stări { „C”  - semi-configurat (s-a întâlnit eroare);\n"
-"      sunt deteriorate { „I”  - semi-instalat (s-a întâlnit eroare).\n"
-" Vechiul marcaj (O): ceea ce s-a cerut de la acest pachet înainte de a afișa "
-"această listă;\n"
-" (M)arcaj: ceea ce se cere de la acest pachet:\n"
-"  „*”: marcat pentru instalare sau îmbunătățire;\n"
+" Fanion de eroare:   Spațiu - fără eroare (dar pachetul ar putea fi\n"
+"                              deteriorat - vedeți mai jos)\n"
+"                       „R”  - eroare gravă în timpul instalării, are\n"
+"                              nevoie de reinstalare;\n"
+" Starea instalării:    Spațiu    - neinstalat;\n"
+"                         „*”     - instalat;\n"
+"                         „-”     - neinstalat dar fișierele de configurare\n"
+"                                     rămân;\n"
+"   pachetele în aceste { „U”     - despachetat dar încă neconfigurat;\n"
+"   stări nu sunt       { „C”     - semi-configurat (s-a întâlnit eroare);\n"
+"   (chiar) bine        { „I”     - semi-instalat (s-a întâlnit eroare).\n"
+"   instalate           { „W”,„t” - declanșatorii sunt așteptați, respectiv\n"
+"                                     în așteptare. Vechiul marcaj: ceea ce s-"
+"a cerut de la acest pachet înainte de a afișa\n"
+"                   această listă;\n"
+" Marcaj: ceea ce se cere pentru acest pachet:\n"
+"  „*”: marcat pentru instalare sau înnoire;\n"
 "  „-”: marcat pentru ștergere, dar fișierele de configurare rămân;\n"
 "  „=”: în așteptare: pachetul nu va fi procesat deloc;\n"
 "  „_”: marcat pentru ștergere completă - inclusiv configurarea;\n"
-"  „n”: pachetul este nou și poate încă fi marcat pentru instalare/ștergere/"
-"&c.\n"
+"  „n”: pachetul este nou și poate încă fi marcat pentru\n"
+"         instalare/ștergere/&c.\n"
 "\n"
-"De asemenea sunt afișate pentru fiecare pachet Prioritatea, Secțiunea, "
-"numele, versiunea\n"
-"instalată și cea disponibilă (shift-V pentru a afișa/ascunde) și descrierea "
-"pe scurt.\n"
+"De asemenea, pentru fiecare pachet, sunt afișate Prioritatea, Secțiunea,\n"
+"numele, versiunea instalată și cea disponibilă (shift-V pentru a\n"
+"afișa/ascunde) și descrierea pe scurt.\n"
 
 #: dselect/helpmsgs.cc:148
 msgid "Display, part 2: list highlight; information display"
@@ -1370,11 +1369,11 @@ msgstr "configurare eșuată"
 
 #: dselect/pkgdisplay.cc:57
 msgid "awaiting trigger processing"
-msgstr ""
+msgstr "așteaptă procesarea declanșatorilor"
 
 #: dselect/pkgdisplay.cc:58
 msgid "triggered"
-msgstr ""
+msgstr "declanșat"
 
 #: dselect/pkgdisplay.cc:59
 msgid "installed"
@@ -1433,9 +1432,8 @@ msgid "pre-depends on"
 msgstr "ante-dependență de"
 
 #: dselect/pkgdisplay.cc:77
-#, fuzzy
 msgid "breaks"
-msgstr "se corupe cu"
+msgstr "corupe"
 
 #: dselect/pkgdisplay.cc:78
 msgid "conflicts with"

lib/dbmodify.c

@@ -194,6 +194,7 @@ enum modstatdb_rw modstatdb_init(const char *adir, enum modstatdb_rw readwritere
     varbufinit(&uvb, 10240);
   }
 
+  trig_fixup_awaiters(cstatus);
   trig_incorporate(cstatus, admindir);
 
   return cstatus;
@@ -238,6 +239,41 @@ void modstatdb_shutdown(void) {
   free(updatefnbuf);
 }
 
+static void
+modstatdb_note_core(struct pkginfo *pkg)
+{
+  assert(cstatus >= msdbrw_write);
+
+  varbufreset(&uvb);
+  varbufrecord(&uvb, pkg, &pkg->installed);
+
+  if (fwrite(uvb.buf, 1, uvb.used, importanttmp) != uvb.used)
+    ohshite(_("unable to write updated status of `%.250s'"), pkg->name);
+  if (fflush(importanttmp))
+    ohshite(_("unable to flush updated status of `%.250s'"), pkg->name);
+  if (ftruncate(fileno(importanttmp), uvb.used))
+    ohshite(_("unable to truncate for updated status of `%.250s'"), pkg->name);
+  if (fsync(fileno(importanttmp)))
+    ohshite(_("unable to fsync updated status of `%.250s'"), pkg->name);
+  if (fclose(importanttmp))
+    ohshite(_("unable to close updated status of `%.250s'"), pkg->name);
+  sprintf(updatefnrest, IMPORTANTFMT, nextupdate);
+  if (rename(importanttmpfile, updatefnbuf))
+    ohshite(_("unable to install updated status of `%.250s'"), pkg->name);
+
+  /* Have we made a real mess? */
+  assert(strlen(updatefnrest) <= IMPORTANTMAXLEN);
+
+  nextupdate++;
+
+  if (nextupdate > MAXUPDATES) {
+    modstatdb_checkpoint();
+    nextupdate = 0;
+  }
+
+  createimptmp();
+}
+
 /* Note: If anyone wants to set some triggers-pending, they must also
  * set status appropriately, or we will undo it. That is, it is legal
  * to call this when pkg->status and pkg->trigpend_head disagree and
@@ -247,8 +283,6 @@ void modstatdb_shutdown(void) {
 void modstatdb_note(struct pkginfo *pkg) {
   struct trigaw *ta;
 
-  assert(cstatus >= msdbrw_write);
-
   onerr_abort++;
 
   /* Clear pending triggers here so that only code that sets the status
@@ -268,31 +302,8 @@ void modstatdb_note(struct pkginfo *pkg) {
 	      versiondescribe(&pkg->installed.version, vdew_nonambig));
   statusfd_send("status: %s: %s", pkg->name, statusinfos[pkg->status].name);
 
-  varbufreset(&uvb);
-  varbufrecord(&uvb, pkg, &pkg->installed);
-  if (fwrite(uvb.buf, 1, uvb.used, importanttmp) != uvb.used)
-    ohshite(_("unable to write updated status of `%.250s'"), pkg->name);
-  if (fflush(importanttmp))
-    ohshite(_("unable to flush updated status of `%.250s'"), pkg->name);
-  if (ftruncate(fileno(importanttmp), uvb.used))
-    ohshite(_("unable to truncate for updated status of `%.250s'"), pkg->name);
-  if (fsync(fileno(importanttmp)))
-    ohshite(_("unable to fsync updated status of `%.250s'"), pkg->name);
-  if (fclose(importanttmp))
-    ohshite(_("unable to close updated status of `%.250s'"), pkg->name);
-  sprintf(updatefnrest, IMPORTANTFMT, nextupdate);
-  if (rename(importanttmpfile, updatefnbuf))
-    ohshite(_("unable to install updated status of `%.250s'"), pkg->name);
-  assert(strlen(updatefnrest)<=IMPORTANTMAXLEN); /* or we've made a real mess */
-
-  nextupdate++;  
-
-  if (nextupdate > MAXUPDATES) {
-    modstatdb_checkpoint();
-    nextupdate= 0;
-  }
-
-  createimptmp();
+  if (cstatus >= msdbrw_write)
+    modstatdb_note_core(pkg);
 
   if (!pkg->trigpend_head && pkg->othertrigaw_head) {
     /* Automatically remove us from other packages' Triggers-Awaited.

lib/dpkg-db.h

@@ -299,6 +299,9 @@ int trig_note_pend(struct pkginfo *pend, char *trig /*not copied!*/);
 int trig_note_aw(struct pkginfo *pend, struct pkginfo *aw);
 void trig_clear_awaiters(struct pkginfo *notpend);
 
+void trig_enqueue_awaited_pend(struct pkginfo *pend);
+void trig_fixup_awaiters(enum modstatdb_rw cstatus);
+
 void trig_file_interests_ensure(void);
 void trig_file_interests_save(void);
 

lib/fields.c

@@ -555,6 +555,8 @@ f_trigaw(struct pkginfo *aw, struct pkginfoperfile *pifp,
     if (!trig_note_aw(pend, aw))
       parse_error(filename, lno, aw,
                   _("duplicate awaited trigger package `%.255s'"), word);
+
+    trig_enqueue_awaited_pend(pend);
   }
 }
 

lib/triglib.c

@@ -169,6 +169,52 @@ trig_clear_awaiters(struct pkginfo *notpend)
 	}
 }
 
+/* FIXME: switch to use the generic pkg list for lenny+1 */
+struct pkg_list {
+	struct pkg_list *next;
+	struct pkginfo *pkg;
+};
+
+static struct pkg_list *trig_awaited_pend_head;
+
+void
+trig_enqueue_awaited_pend(struct pkginfo *pend)
+{
+	struct pkg_list *tp;
+
+	for (tp = trig_awaited_pend_head; tp; tp = tp->next)
+		if (tp->pkg == pend)
+			return;
+
+	tp = nfmalloc(sizeof(*tp));
+	tp->pkg = pend;
+	tp->next = trig_awaited_pend_head;
+	trig_awaited_pend_head = tp;
+}
+
+/*
+ * Fix up packages in state triggers-awaited w/o the corresponding package
+ * with pending triggers. This can happen when dpkg was interrupted
+ * while in modstatdb_note, and the package in triggers-pending had its
+ * state modified but dpkg could not clearing the awaiters.
+ *
+ * XXX: possibly get rid of some of the checks done somewhere else for
+ *      this condition at run-time.
+ */
+void
+trig_fixup_awaiters(enum modstatdb_rw cstatus)
+{
+	struct pkg_list *tp;
+
+	if (cstatus < msdbrw_write)
+		return;
+
+	for (tp = trig_awaited_pend_head; tp; tp = tp->next)
+		if (!tp->pkg->trigpend_head)
+			trig_clear_awaiters(tp->pkg);
+	trig_awaited_pend_head = NULL;
+}
+
 /*---------- generalised handling of trigger kinds ----------*/
 
 static const struct trigkindinfo tki_explicit, tki_file, tki_unknown;

man/dpkg.1

@@ -19,7 +19,7 @@ packages are particularly inadequate.
 .SH DESCRIPTION
 \fBdpkg\fP is a tool to install, build, remove and manage
 Debian packages. The primary and more user-friendly
-front-end for \fBdpkg\fP is \fBdselect\fP(1). \fBdpkg\fP itself is
+front-end for \fBdpkg\fP is \fBaptitude\fP(1). \fBdpkg\fP itself is
 controlled entirely via command line parameters, which consist of exactly
 one action and zero or more options. The action-parameter tells \fBdpkg\fP
 what to do and options control the behavior of the action in some way.
@@ -649,7 +649,7 @@ with:
 Note that this will not actually install or remove anything, but just
 set the selection state on the requested packages. You will need some
 other application to actually download and install the requested
-packages. For example, run \fBdselect\fP and choose \fIInstall\fP.
+packages. For example, run \fBapt\-get dselect\-upgrade\fP.
 
 Ordinarily, you will find that \fBdselect\fP(1) provides a more
 convenient way to modify the package selection states.
@@ -660,6 +660,8 @@ Additional functionality can be gained by installing any of the
 following packages: \fBapt\fR, \fBaptitude\fR and \fBdebsums\fR.
 .
 .SH SEE ALSO
+\fBaptitude\fP(1),
+\fBapt\fP(1),
 \fBdselect\fP(1),
 \fBdpkg\-deb\fP(1),
 \fBdpkg\-query\fP(1),

man/po/ChangeLog

@@ -1,8 +1,38 @@
+2008-08-22  Raphael Hertzog  <hertzog@debian.org>
+
+	* po/fr.po: Updated to 1601t. Replaced "déclenchement" with
+	"action différée" everywhere. Fixed many related translations.
+
+2008-08-18  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Updated to 1595t0f6u.
+
+2008-08-17  Guillem Jover  <guillem@debian.org>
+
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot.
+
+2008-08-11  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Mention (in comment) the copyright of Sven as well.
+
+2008-07-22  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Unify translation of "diversion". Update to 1594t0f7u.
+
 2008-06-28  Guillem Jover  <guillem@debian.org>
 
 	* po/dpkg-man.pot: Regenerated.
 	* po/*.po: Merged with dpkg-man.pot.
 
+2008-07-22  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Unify translation of "diversion". Update to 1594t0f7u.
+
+2008-06-22  Florent USSEIL  <swiip81@free.fr>
+
+	* po/fr.po: Updated to 1601t.
+
 2008-06-10  Wiktor Wandachowicz  <siryes@gmail.com>
 
 	* po/pl.add: Update.
@@ -22,11 +52,11 @@
 
 2008-06-03  Helge Kreutzmann  <debian@helgefjell.de>
 
-	* po/dpkg-man.pot: Regenerated
+	* po/dpkg-man.pot: Regenerated.
 	* po/*.po: Merged with dpkg-man.pot.
 	* po/de.add: Add Sven, he translated some paragraphs as well.
-	* po/de.po: Updated. Take translation fix from Frank Lichtenheld
-	from the master.
+	* po/de.po: Take translation fix from
+	Frank Lichtenheld <djpig@debian.org> from the master.
 
 2008-05-27  Peter Karlsson  <peterk@debian.org>
 
@@ -39,7 +69,7 @@
 
 2008-05-23  Raphael Hertzog  <hertzog@debian.org>
 
-	* man/po/*.po: Fix all the filenames to avoid fuzzying translations.
+	* po/*.po: Fix all the filenames to avoid fuzzying translations.
 
 2008-05-22  Helge Kreutzmann  <debian@helgefjell.de>
 

po/ChangeLog

@@ -1,11 +1,72 @@
+2008-08-26  Deng Xiyue  <manphiz-guest@users.alioth.debian.org>
+
+	* zh_CN.po: Updated to 985t.
+
+2008-08-24  Miroslav Kure  <kurem@debian.cz>
+
+	* cs.po: Updated to 985t.
+
+2008-08-20  Eddy Petrișor <eddy.petrisor@gmail.com>
+
+	* ro.po: Updated to 985t.
+
+2008-08-18  Sven Joachim  <svenjoac@gmx.de>
+
+	* de.po: Updated to 985t.
+
+2008-08-18  Christian Perrier  <bubulle@debian.org>
+
+	* fr.po: Updated to 985t.
+
+2008-08-18  Ivan Masár  <helix84@centrum.sk>
+
+	* sk.po: Updated to 985t.
+
+2008-08-17  Guillem Jover  <guillem@debian.org>
+
+	* dpkg.pot: Regenerated.
+	* *.po: Merged with dpkg.pot.
+
+2008-08-17  Guillem Jover  <guillem@debian.org>
+
+	* LINGUAS: Add Lithuanian.
+
+2008-08-02  Gintautas Miliauskas  <gintas@akl.lt>
+
+	* lt.po: Added as 626t54f304u.
+
 2008-07-29  Eddy Petrișor <eddy.petrisor@gmail.com>
 
 	* ro.po: Updated to 984t (port from lenny branch).
 
+2008-07-26  Christian Perrier  <bubulle@debian.org>
+
+	* fr.po: Replace "déclenchement" by "action différée".
+
+2008-07-22  Piarres Beobide  <pi+debian@beobide.net>
+
+	* eu.po: Updated to 984t.
+
 2008-07-19  Changwoo Ryu  <cwryu@debian.org>
 
 	* ko.po: Updated to 984t.
 
+2008-07-02  Ivan Masár  <helix84@centrum.sk>
+
+	* sk.po: Updated to 984t.
+
+2008-07-01  Yuri Kozlov  <kozlov.y@gmail.com>
+
+	* ru.po: Updated to 984t.
+
+2008-06-28  Eddy Petrișor <eddy.petrisor@gmail.com>
+
+	* ro.po: Updated to 984t.
+
+2008-06-26  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated to 984t.
+
 2008-06-09  Felipe Augusto van de Wiel  <faw@debian.org>
 
 	* pt_BR.po: Updated to 984t.

po/LINGUAS

@@ -61,6 +61,9 @@ ko
 # Kurdish - Erdal Ronahi <erdal.ronahi@gmail.com>
 ku
 
+# Lithuanian - Gintautas Miliauskas <gintas@akl.lt>
+lt
+
 # Marathi - Priti Patil <prithisd@gmail.com>
 mr
 

scripts/Dpkg/Source/Package.pm

@@ -103,22 +103,27 @@ sub new {
         'options' => {},
     };
     bless $self, $class;
+    if (exists $args{'options'}) {
+        $self->{'options'} = $args{'options'};
+    }
     if (exists $args{"filename"}) {
         $self->initialize($args{"filename"});
+        $self->init_options();
     }
-    if (exists $args{"options"}) {
-        $self->{'options'} = $args{'options'};
-    }
-    $self->init_options();
     return $self;
 }
 
 sub init_options {
     my ($self) = @_;
     # Use full ignore list by default
+    # note: this function is not called by V1 packages
     $self->{'options'}{'diff_ignore_regexp'} ||= $diff_ignore_default_regexp;
-    $self->{'options'}{'tar_ignore'} = [ @tar_ignore_default_pattern ]
+    if (defined $self->{'options'}{'tar_ignore'}) {
+        $self->{'options'}{'tar_ignore'} = [ @tar_ignore_default_pattern ]
             unless @{$self->{'options'}{'tar_ignore'}};
+    } else {
+        $self->{'options'}{'tar_ignore'} = [ @tar_ignore_default_pattern ];
+    }
 }
 
 sub initialize {

scripts/Dpkg/Source/Package/V3/quilt.pm

@@ -105,8 +105,13 @@ sub run_quilt {
     unless (File::Spec->file_name_is_absolute($absdir)) {
         $absdir = File::Spec->rel2abs($dir);
     }
+    my $series = $self->get_series_file($dir);
+    unless (File::Spec->file_name_is_absolute($series)) {
+        $series = File::Spec->rel2abs($series);
+    }
     my %opts = (
-        env => { QUILT_PATCHES => "$absdir/debian/patches" },
+        env => { QUILT_PATCHES => "$absdir/debian/patches",
+                 QUILT_SERIES => $series },
         'chdir' => $dir,
         'exec' => [ 'quilt', '--quiltrc', '/dev/null', @$params ],
         %more_opts

scripts/dpkg-buildpackage.pl

@@ -60,7 +60,7 @@ Options:
   -m<maint>      maintainer for package is <maint>.    }
   -e<maint>      maintainer for release is <maint>.    } only passed
   -C<descfile>   changes are described in <descfile>.  } to dpkg-genchanges
-  -si (default)  src includes orig for rev. 0 or 1.    }
+  -si (default)  src includes orig if new upstream.    }
   -sa            uploaded src always includes orig.    }
   -sd            uploaded src is diff and .dsc only.   }
   -sn            force Debian native source format.      }
@@ -422,10 +422,10 @@ close CHANGES or subprocerr(_g('dpkg-genchanges'));
 close OUT or syserr(_g('write changes file'));
 
 my $srcmsg;
-sub fileomitted { return $files !~ /$_[0]/ }
+sub fileomitted($) { return $files !~ /$_[0]/ }
 if (fileomitted '\.deb') {
     # source only upload
-    if (fileomitted "\.diff\.$comp_regex") {
+    if (fileomitted "\.diff\.$comp_regex" and fileomitted "\.debian\.tar\.$comp_regex") {
 	$srcmsg = _g('source only upload: Debian-native package');
     } elsif (fileomitted "\.orig\.tar\.$comp_regex") {
 	$srcmsg = _g('source only, diff-only upload (original source NOT included)');
@@ -436,7 +436,7 @@ if (fileomitted '\.deb') {
     $srcmsg = _g('full upload (original source is included)');
     if (fileomitted '\.dsc') {
 	$srcmsg = _g('binary only upload (no source included)');
-    } elsif (fileomitted "\.diff\.$comp_regex") {
+    } elsif (fileomitted "\.diff\.$comp_regex" and fileomitted "\.debian\.tar\.$comp_regex") {
 	$srcmsg = _g('full upload; Debian-native package (full source is included)');
     } elsif (fileomitted "\.orig\.tar\.$comp_regex") {
 	$srcmsg = _g('binary and diff upload (original source NOT included)');

scripts/dpkg-genchanges.pl

@@ -453,12 +453,12 @@ if (!is_binaryonly) {
 
     if ((($sourcestyle =~ m/i/ && not($include_tarball)) ||
 	 $sourcestyle =~ m/d/) &&
-	grep(m/\.diff\.$comp_regex$/,@sourcefiles)) {
+	grep(m/\.(debian\.tar|diff)\.$comp_regex$/,@sourcefiles)) {
 	$origsrcmsg= _g("not including original source code in upload");
 	@sourcefiles= grep(!m/\.orig\.tar\.$comp_regex$/,@sourcefiles);
     } else {
 	if ($sourcestyle =~ m/d/ &&
-	    !grep(m/\.diff\.$comp_regex$/,@sourcefiles)) {
+	    !grep(m/\.(debian\.tar|diff)\.$comp_regex$/,@sourcefiles)) {
 	    warning(_g("ignoring -sd option for native Debian package"));
 	}
         $origsrcmsg= _g("including full source code in upload");

scripts/po/ChangeLog

@@ -1,3 +1,28 @@
+2008-08-18  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* de.po: Updated to 473t.
+
+2008-08-17  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-dev.pot: Regenerated.
+	* *.po: Merged with dpkg-dev.pot.
+
+2008-08-04  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* de.po: Updated to 473t.
+
+2008-08-04  Cyril Brulebois  <kibi@debian.org>
+
+	* fr.po: Fixed mis-translation.
+
+2008-07-22  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* de.po: Unify translation of "diversion".
+
+2008-07-10  Yuri Kozlov  <kozlov.y@gmail.com>
+
+	* ru.po: Updated to 473t.
+
 2008-06-10  Wiktor Wandachowicz  <siryes@gmail.com>
 
 	* pl.po: Updated to 473t.
@@ -21,7 +46,7 @@
 
 2008-06-07  Christian perrier  <bubulle@debian.org>
 
-	* fr.po: Updated to 471t
+	* fr.po: Updated to 471t.
 
 2008-06-06  Wiktor Wandachowicz  <siryes@gmail.com>
 
@@ -37,7 +62,7 @@
 
 2008-05-13  Christian perrier  <bubulle@debian.org>
 
-	* fr.po: 326t78f67u
+	* fr.po: Updated to 326t78f67u.
 
 2008-05-13  Peter Karlsson  <peterk@debian.org>
 

scripts/po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-06-09 09:08+0200\n"
+"POT-Creation-Date: 2008-08-17 18:08+0300\n"
 "PO-Revision-Date: 2006-12-04 13:59+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -164,7 +164,7 @@ msgid ""
 "  -m<maint>      maintainer for package is <maint>.    }\n"
 "  -e<maint>      maintainer for release is <maint>.    } only passed\n"
 "  -C<descfile>   changes are described in <descfile>.  } to dpkg-genchanges\n"
-"  -si (default)  src includes orig for rev. 0 or 1.    }\n"
+"  -si (default)  src includes orig if new upstream.    }\n"
 "  -sa            uploaded src always includes orig.    }\n"
 "  -sd            uploaded src is diff and .dsc only.   }\n"
 "  -sn            force Debian native source format.      }\n"
@@ -544,12 +544,12 @@ msgstr ""
 msgid "cannot open .dsc file %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:140
+#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:145
 #, perl-format
 msgid "source control file %s"
 msgstr "fitxer de control font %s"
 
-#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:201
+#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:206
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr ""
@@ -584,13 +584,13 @@ msgstr ""
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:414
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "manca informació per al camp d'eixida %s"
@@ -1314,7 +1314,7 @@ msgstr ""
 #: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
 #: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:79
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:260
 #, perl-format
 msgid "cannot read %s"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog.pm:799 scripts/Dpkg/IPC.pm:226
 #: scripts/Dpkg/Shlibs.pm:77 scripts/Dpkg/Shlibs/SymbolFile.pm:114
-#: scripts/Dpkg/Source/Package.pm:129 scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:134 scripts/Dpkg/Source/Package.pm:143
 #, fuzzy, perl-format
 msgid "cannot open %s"
 msgstr "no es pot combinar -b o -B amb -S"
@@ -1835,12 +1835,12 @@ msgstr ""
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package.pm:427 scripts/Dpkg/Source/Package/V2.pm:180
 #: scripts/Dpkg/Source/Package/V2.pm:399
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:248
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:252
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:263
 #, fuzzy, perl-format
 msgid "cannot write %s"
 msgstr "no es pot combinar -b o -B amb -S"
@@ -1918,7 +1918,7 @@ msgstr ""
 msgid "close on tar input"
 msgstr ""
 
-#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:249
+#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:254
 #: scripts/Dpkg/Source/Package/V2.pm:164
 #, fuzzy, perl-format
 msgid "cannot opendir %s"
@@ -2121,13 +2121,13 @@ msgid "diff `%s' doesn't contain any patch"
 msgstr ""
 
 #: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
 #, fuzzy, perl-format
 msgid "cannot create directory %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
 #: scripts/Dpkg/Source/Patch.pm:452
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:159
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr ""
@@ -2141,7 +2141,7 @@ msgstr ""
 msgid "nonexistent"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot stat %s"
 msgstr ""
@@ -2175,73 +2175,73 @@ msgstr ""
 msgid "named socket"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:124
+#: scripts/Dpkg/Source/Package.pm:129
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:147
+#: scripts/Dpkg/Source/Package.pm:152
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:173
+#: scripts/Dpkg/Source/Package.pm:178
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:182
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:203
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "file `%s' listed twice in Files field"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:232
+#: scripts/Dpkg/Source/Package.pm:237
 msgid "source and version are required to compute the source basename"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:278
+#: scripts/Dpkg/Source/Package.pm:283
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:282
+#: scripts/Dpkg/Source/Package.pm:287
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr ""
 "no s'ha pogut verificar la signatura de %s perquè gpg no està instal·lat"
 
-#: scripts/Dpkg/Source/Package.pm:291
+#: scripts/Dpkg/Source/Package.pm:296
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#: scripts/Dpkg/Source/Package.pm:338 scripts/Dpkg/Source/Package/V2.pm:370
 #, fuzzy, perl-format
 msgid "can't write %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/Dpkg/Source/Package.pm:345
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:348
+#: scripts/Dpkg/Source/Package.pm:353
 #, perl-format
 msgid "cannot make %s executable"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:350
+#: scripts/Dpkg/Source/Package.pm:355
 #, perl-format
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:382
+#: scripts/Dpkg/Source/Package.pm:387
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr ""
@@ -2304,7 +2304,7 @@ msgid "failed to rename saved %s to %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:162
 #, fuzzy, perl-format
 msgid "applying %s"
 msgstr "%s: s'està aplicant %s"
@@ -2447,7 +2447,7 @@ msgid "no orig.tar file found"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V2.pm:217
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -2655,12 +2655,12 @@ msgid ""
 "source might fail when applying patches."
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:135
 #, fuzzy, perl-format
 msgid "can't create symlink %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:147
 #, perl-format
 msgid "applying %s with quilt"
 msgstr ""

scripts/po/de.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg scripts\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-06-09 09:08+0200\n"
-"PO-Revision-Date: 2008-06-09 21:17+0200\n"
+"POT-Creation-Date: 2008-08-17 18:08+0300\n"
+"PO-Revision-Date: 2008-08-18 22:44+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@ msgid ""
 "  -m<maint>      maintainer for package is <maint>.    }\n"
 "  -e<maint>      maintainer for release is <maint>.    } only passed\n"
 "  -C<descfile>   changes are described in <descfile>.  } to dpkg-genchanges\n"
-"  -si (default)  src includes orig for rev. 0 or 1.    }\n"
+"  -si (default)  src includes orig if new upstream.    }\n"
 "  -sa            uploaded src always includes orig.    }\n"
 "  -sd            uploaded src is diff and .dsc only.   }\n"
 "  -sn            force Debian native source format.      }\n"
@@ -239,7 +239,7 @@ msgstr ""
 "  -e<Betr>       <Betr> ist Betreuer für die Veröffentlichung.} nur an\n"
 "  -C<Datei>      Änderungen sind in <Datei> beschrieben. } dpkg-genchanges\n"
 "                                                         } weitergegeben.\n"
-"  -si (Standard) Quellen enthalten Orig. für Rev. 0 oder 1. }\n"
+"  -si (Standard) Quellen enthalten Orig. falls neues Upstream }\n"
 "  -sa            hochgeladene Quellen enthalten immer Orig. }\n"
 "  -sd            hochgeladene Quellen sind nur diff und .dsc}\n"
 "  -sn            erzwinge »Debian native«-Quellformat.      }\n"
@@ -682,12 +682,12 @@ msgstr "fehlende Priorit
 msgid "cannot open .dsc file %s"
 msgstr "kann .dsc-Datei %s nicht öffnen"
 
-#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:140
+#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:145
 #, perl-format
 msgid "source control file %s"
 msgstr "Quell-Steuerdatei %s"
 
-#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:201
+#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:206
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr "Files-Feld enthält ungültige Zeile »%s«"
@@ -722,13 +722,13 @@ msgstr "rein-bin
 msgid "write original source message"
 msgstr "schreibe ursprüngliche Quell-Nachricht"
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "fehlende Informationen für kritisches Ausgabefeld %s"
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:414
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "fehlende Informationen für Ausgabefeld %s"
@@ -1072,7 +1072,7 @@ msgstr "konnte override-Datei %s nicht
 #: scripts/dpkg-scanpackages.pl:99
 #, perl-format
 msgid " * Unconditional maintainer override for %s *"
-msgstr ""
+msgstr " * Bedingungsloser Übersteuerung (»override«) des Betreuers für %s *"
 
 #: scripts/dpkg-scanpackages.pl:115 scripts/dpkg-scansources.pl:507
 msgid "1 to 3 args expected\n"
@@ -1558,11 +1558,11 @@ msgstr "kann dpkg nicht ausf
 
 #: scripts/dpkg-shlibdeps.pl:761
 msgid "diversions involved - output may be incorrect"
-msgstr "Umlenkungen beteiligt - Ausgabe könnte nicht korrekt sein"
+msgstr "Umleitungen beteiligt - Ausgabe könnte nicht korrekt sein"
 
 #: scripts/dpkg-shlibdeps.pl:763
 msgid "write diversion info to stderr"
-msgstr "schreibe Informationen zu Umlenkungen auf Stderr"
+msgstr "schreibe Informationen zu Umleitungen auf Stderr"
 
 #: scripts/dpkg-shlibdeps.pl:767
 #, perl-format
@@ -1615,7 +1615,7 @@ msgstr "Architektur %s ist nur alleine erlaubt (Liste f
 #: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
 #: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:79
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:260
 #, perl-format
 msgid "cannot read %s"
 msgstr "kann %s nicht lesen"
@@ -1974,7 +1974,7 @@ msgstr "Fork f
 
 #: scripts/Dpkg/Changelog.pm:799 scripts/Dpkg/IPC.pm:226
 #: scripts/Dpkg/Shlibs.pm:77 scripts/Dpkg/Shlibs/SymbolFile.pm:114
-#: scripts/Dpkg/Source/Package.pm:129 scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:134 scripts/Dpkg/Source/Package.pm:143
 #, perl-format
 msgid "cannot open %s"
 msgstr "kann %s nicht öffnen"
@@ -2207,12 +2207,12 @@ msgstr "
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package.pm:427 scripts/Dpkg/Source/Package/V2.pm:180
 #: scripts/Dpkg/Source/Package/V2.pm:399
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:248
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:252
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:263
 #, perl-format
 msgid "cannot write %s"
 msgstr "kann %s nicht schreiben"
@@ -2293,7 +2293,7 @@ msgstr "schreibe auf Tar-Eingabe"
 msgid "close on tar input"
 msgstr "schließe auf Tar-Eingabe"
 
-#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:249
+#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:254
 #: scripts/Dpkg/Source/Package/V2.pm:164
 #, perl-format
 msgid "cannot opendir %s"
@@ -2499,13 +2499,13 @@ msgid "diff `%s' doesn't contain any patch"
 msgstr "Diff »%s« enthält keinen Patch"
 
 #: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
 #, perl-format
 msgid "cannot create directory %s"
 msgstr "kann Verzeichnis %s nicht erstellen"
 
 #: scripts/Dpkg/Source/Patch.pm:452
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:159
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "kann Zeitstempel für %s nicht ändern"
@@ -2519,7 +2519,7 @@ msgstr "entferne Patch-Sicherungskopiedatei %s"
 msgid "nonexistent"
 msgstr "nichtexistierend"
 
-#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot stat %s"
 msgstr "kann Stat von %s nicht ausführen"
@@ -2553,72 +2553,73 @@ msgstr "benannte Pipe"
 msgid "named socket"
 msgstr "benannter Socket"
 
-#: scripts/Dpkg/Source/Package.pm:124
+#: scripts/Dpkg/Source/Package.pm:129
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr "%s ist nicht der Name einer Datei"
 
-#: scripts/Dpkg/Source/Package.pm:147
+#: scripts/Dpkg/Source/Package.pm:152
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "vermisse kritische Quellsteuerfeld %s"
 
-#: scripts/Dpkg/Source/Package.pm:173
+#: scripts/Dpkg/Source/Package.pm:178
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
 msgstr "Quellpaketformat »%s« nicht unterstützt (Perlmodul %s benötigt)"
 
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:182
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr "ungültiges Formatfeld »%s«"
 
-#: scripts/Dpkg/Source/Package.pm:203
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "file `%s' listed twice in Files field"
 msgstr "Datei »%s« zweimal im Feld Files aufgeführt"
 
-#: scripts/Dpkg/Source/Package.pm:232
+#: scripts/Dpkg/Source/Package.pm:237
 msgid "source and version are required to compute the source basename"
 msgstr ""
+"Quelle und Version werden benötigt, um den »basename« der Quelle zu ermitteln"
 
-#: scripts/Dpkg/Source/Package.pm:278
+#: scripts/Dpkg/Source/Package.pm:283
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "Fehler beim Überprüfen der Signatur von %s"
 
-#: scripts/Dpkg/Source/Package.pm:282
+#: scripts/Dpkg/Source/Package.pm:287
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "konnte Signatur von %s nicht überprüfen, da Gpg nicht installiert ist"
 
-#: scripts/Dpkg/Source/Package.pm:291
+#: scripts/Dpkg/Source/Package.pm:296
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "%s ist keine gültige Option für %s"
 
-#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#: scripts/Dpkg/Source/Package.pm:338 scripts/Dpkg/Source/Package/V2.pm:370
 #, perl-format
 msgid "can't write %s"
 msgstr "kann %s nicht schreiben"
 
-#: scripts/Dpkg/Source/Package.pm:345
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s existiert nicht"
 
-#: scripts/Dpkg/Source/Package.pm:348
+#: scripts/Dpkg/Source/Package.pm:353
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "kann Programm %s nicht ausführbar machen"
 
-#: scripts/Dpkg/Source/Package.pm:350
+#: scripts/Dpkg/Source/Package.pm:355
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s ist keine gewöhnliche Datei"
 
-#: scripts/Dpkg/Source/Package.pm:382
+#: scripts/Dpkg/Source/Package.pm:387
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "versuchte zweimal Datei »%s« hinzuzufügen"
@@ -2681,7 +2682,7 @@ msgid "failed to rename saved %s to %s"
 msgstr "Fehler beim Umbenennen des gesicherten %s in %s"
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:162
 #, perl-format
 msgid "applying %s"
 msgstr "wende %s an"
@@ -2841,7 +2842,7 @@ msgid "no orig.tar file found"
 msgstr "keine orig.tar-Datei gefunden"
 
 #: scripts/Dpkg/Source/Package/V2.pm:217
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -3065,12 +3066,12 @@ msgstr ""
 "die Seriendatei (%s) enthält nicht unterstützte Optionen (»%s«, Zeile %s), "
 "dpkg-source könnte beim Anwenden der Patches scheitern."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:135
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "kann Symlink %s nicht erstellen"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:147
 #, perl-format
 msgid "applying %s with quilt"
 msgstr "wende %s mit Quilt an"

scripts/po/dpkg-dev.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-06-09 09:08+0200\n"
+"POT-Creation-Date: 2008-08-17 18:08+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -155,7 +155,7 @@ msgid ""
 "  -m<maint>      maintainer for package is <maint>.    }\n"
 "  -e<maint>      maintainer for release is <maint>.    } only passed\n"
 "  -C<descfile>   changes are described in <descfile>.  } to dpkg-genchanges\n"
-"  -si (default)  src includes orig for rev. 0 or 1.    }\n"
+"  -si (default)  src includes orig if new upstream.    }\n"
 "  -sa            uploaded src always includes orig.    }\n"
 "  -sd            uploaded src is diff and .dsc only.   }\n"
 "  -sn            force Debian native source format.      }\n"
@@ -530,12 +530,12 @@ msgstr ""
 msgid "cannot open .dsc file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:140
+#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:145
 #, perl-format
 msgid "source control file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:201
+#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:206
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr ""
@@ -570,13 +570,13 @@ msgstr ""
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:414
 #, perl-format
 msgid "missing information for output field %s"
 msgstr ""
@@ -1296,7 +1296,7 @@ msgstr ""
 #: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
 #: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:79
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:260
 #, perl-format
 msgid "cannot read %s"
 msgstr ""
@@ -1572,7 +1572,7 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog.pm:799 scripts/Dpkg/IPC.pm:226
 #: scripts/Dpkg/Shlibs.pm:77 scripts/Dpkg/Shlibs/SymbolFile.pm:114
-#: scripts/Dpkg/Source/Package.pm:129 scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:134 scripts/Dpkg/Source/Package.pm:143
 #, perl-format
 msgid "cannot open %s"
 msgstr ""
@@ -1805,12 +1805,12 @@ msgstr ""
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package.pm:427 scripts/Dpkg/Source/Package/V2.pm:180
 #: scripts/Dpkg/Source/Package/V2.pm:399
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:248
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:252
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:263
 #, perl-format
 msgid "cannot write %s"
 msgstr ""
@@ -1888,7 +1888,7 @@ msgstr ""
 msgid "close on tar input"
 msgstr ""
 
-#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:249
+#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:254
 #: scripts/Dpkg/Source/Package/V2.pm:164
 #, perl-format
 msgid "cannot opendir %s"
@@ -2091,13 +2091,13 @@ msgid "diff `%s' doesn't contain any patch"
 msgstr ""
 
 #: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
 #, perl-format
 msgid "cannot create directory %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Patch.pm:452
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:159
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr ""
@@ -2111,7 +2111,7 @@ msgstr ""
 msgid "nonexistent"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot stat %s"
 msgstr ""
@@ -2145,72 +2145,72 @@ msgstr ""
 msgid "named socket"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:124
+#: scripts/Dpkg/Source/Package.pm:129
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:147
+#: scripts/Dpkg/Source/Package.pm:152
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:173
+#: scripts/Dpkg/Source/Package.pm:178
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:182
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:203
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "file `%s' listed twice in Files field"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:232
+#: scripts/Dpkg/Source/Package.pm:237
 msgid "source and version are required to compute the source basename"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:278
+#: scripts/Dpkg/Source/Package.pm:283
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:282
+#: scripts/Dpkg/Source/Package.pm:287
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:291
+#: scripts/Dpkg/Source/Package.pm:296
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#: scripts/Dpkg/Source/Package.pm:338 scripts/Dpkg/Source/Package/V2.pm:370
 #, perl-format
 msgid "can't write %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:345
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:348
+#: scripts/Dpkg/Source/Package.pm:353
 #, perl-format
 msgid "cannot make %s executable"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:350
+#: scripts/Dpkg/Source/Package.pm:355
 #, perl-format
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:382
+#: scripts/Dpkg/Source/Package.pm:387
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr ""
@@ -2273,7 +2273,7 @@ msgid "failed to rename saved %s to %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:162
 #, perl-format
 msgid "applying %s"
 msgstr ""
@@ -2416,7 +2416,7 @@ msgid "no orig.tar file found"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V2.pm:217
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -2623,12 +2623,12 @@ msgid ""
 "source might fail when applying patches."
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:135
 #, perl-format
 msgid "can't create symlink %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:147
 #, perl-format
 msgid "applying %s with quilt"
 msgstr ""

scripts/po/fr.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-06-09 09:08+0200\n"
+"POT-Creation-Date: 2008-08-17 18:08+0300\n"
 "PO-Revision-Date: 2008-06-09 21:52+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -167,7 +167,7 @@ msgstr ""
 "Copyright (C) 2007 Frank Lichtenheld."
 
 #: scripts/dpkg-buildpackage.pl:36
-#, perl-format
+#, fuzzy, perl-format
 msgid ""
 "\n"
 "Usage: %s [<options> ...]\n"
@@ -197,7 +197,7 @@ msgid ""
 "  -m<maint>      maintainer for package is <maint>.    }\n"
 "  -e<maint>      maintainer for release is <maint>.    } only passed\n"
 "  -C<descfile>   changes are described in <descfile>.  } to dpkg-genchanges\n"
-"  -si (default)  src includes orig for rev. 0 or 1.    }\n"
+"  -si (default)  src includes orig if new upstream.    }\n"
 "  -sa            uploaded src always includes orig.    }\n"
 "  -sd            uploaded src is diff and .dsc only.   }\n"
 "  -sn            force Debian native source format.      }\n"
@@ -338,7 +338,7 @@ msgstr "version source"
 
 #: scripts/dpkg-buildpackage.pl:296
 msgid "source changed by"
-msgstr "source changé en"
+msgstr "source changé par"
 
 #: scripts/dpkg-buildpackage.pl:324
 msgid "host architecture"
@@ -725,12 +725,12 @@ msgstr "il manque la priorité des fichiers source"
 msgid "cannot open .dsc file %s"
 msgstr "impossible d'ouvrir le fichier .dsc %s"
 
-#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:140
+#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:145
 #, perl-format
 msgid "source control file %s"
 msgstr "fichier de contrôle des sources %s"
 
-#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:201
+#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:206
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr "le champ Files contient une ligne mal formée « %s »"
@@ -765,13 +765,13 @@ msgstr "envoi d'un binaire - aucune inclusion de code source"
 msgid "write original source message"
 msgstr "écriture du message source original"
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "il manque l'information pour l'important champ de sortie %s"
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:414
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "information manquante pour le champ de sortie %s"
@@ -1686,7 +1686,7 @@ msgstr ""
 #: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
 #: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:79
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:260
 #, perl-format
 msgid "cannot read %s"
 msgstr "impossible de lire %s"
@@ -2056,7 +2056,7 @@ msgstr "fork for %s"
 
 #: scripts/Dpkg/Changelog.pm:799 scripts/Dpkg/IPC.pm:226
 #: scripts/Dpkg/Shlibs.pm:77 scripts/Dpkg/Shlibs/SymbolFile.pm:114
-#: scripts/Dpkg/Source/Package.pm:129 scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:134 scripts/Dpkg/Source/Package.pm:143
 #, perl-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
@@ -2293,12 +2293,12 @@ msgstr "réouverture stdin"
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package.pm:427 scripts/Dpkg/Source/Package/V2.pm:180
 #: scripts/Dpkg/Source/Package/V2.pm:399
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:248
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:252
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:263
 #, perl-format
 msgid "cannot write %s"
 msgstr "impossible d'écrire %s"
@@ -2380,7 +2380,7 @@ msgstr "écriture sur l'entrée de tar"
 msgid "close on tar input"
 msgstr "écriture sur la sortie de tar"
 
-#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:249
+#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:254
 #: scripts/Dpkg/Source/Package/V2.pm:164
 #, perl-format
 msgid "cannot opendir %s"
@@ -2540,8 +2540,8 @@ msgstr "ligne après --- n'est pas comme attendu dans diff %s (ligne %d)"
 #, perl-format
 msgid "none of the filenames in ---/+++ are relative in diff `%s' (line %d)"
 msgstr ""
-"aucun des fichiers indiqués par « ---/+++ » n'est relatif dans le diff "
-"« %s » (ligne %d)"
+"aucun des fichiers indiqués par « ---/+++ » n'est relatif dans le diff « %"
+"s » (ligne %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:343
 #, perl-format
@@ -2592,13 +2592,13 @@ msgid "diff `%s' doesn't contain any patch"
 msgstr "le diff %s ne contient pas de changement"
 
 #: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
 #, perl-format
 msgid "cannot create directory %s"
 msgstr "impossible de créer le répertoire %s"
 
 #: scripts/Dpkg/Source/Patch.pm:452
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:159
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "impossible de modifier la date de %s"
@@ -2612,7 +2612,7 @@ msgstr "suppression du fichier de sauvegarde %s"
 msgid "nonexistent"
 msgstr "inexistant"
 
-#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot stat %s"
 msgstr "stat de %s impossible"
@@ -2646,17 +2646,17 @@ msgstr "tube nommé"
 msgid "named socket"
 msgstr "« socket » nommé"
 
-#: scripts/Dpkg/Source/Package.pm:124
+#: scripts/Dpkg/Source/Package.pm:129
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr "%s n'est pas un nom de fichier"
 
-#: scripts/Dpkg/Source/Package.pm:147
+#: scripts/Dpkg/Source/Package.pm:152
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "un champ de contrôle vital manque, %s"
 
-#: scripts/Dpkg/Source/Package.pm:173
+#: scripts/Dpkg/Source/Package.pm:178
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
@@ -2664,58 +2664,58 @@ msgstr ""
 "le format de paquet source « %s » n'est pas géré (le module Perl %s est "
 "requis)"
 
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:182
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr "champ Format « %s » non valable"
 
-#: scripts/Dpkg/Source/Package.pm:203
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "file `%s' listed twice in Files field"
 msgstr "le fichier « %s » est mentionné deux fois dans le champ Files"
 
-#: scripts/Dpkg/Source/Package.pm:232
+#: scripts/Dpkg/Source/Package.pm:237
 msgid "source and version are required to compute the source basename"
 msgstr ""
 "la source et la version sont indispensables pour calculer le nom de base de "
 "la source"
 
-#: scripts/Dpkg/Source/Package.pm:278
+#: scripts/Dpkg/Source/Package.pm:283
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "impossible de vérifier la signature sur %s"
 
-#: scripts/Dpkg/Source/Package.pm:282
+#: scripts/Dpkg/Source/Package.pm:287
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "impossible de vérifier la signature sur %s, gpg n'est pas installé"
 
-#: scripts/Dpkg/Source/Package.pm:291
+#: scripts/Dpkg/Source/Package.pm:296
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "%s n'est pas une option valable pour %s"
 
-#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#: scripts/Dpkg/Source/Package.pm:338 scripts/Dpkg/Source/Package/V2.pm:370
 #, perl-format
 msgid "can't write %s"
 msgstr "impossible d'écrire sur %s"
 
-#: scripts/Dpkg/Source/Package.pm:345
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s n'existe pas"
 
-#: scripts/Dpkg/Source/Package.pm:348
+#: scripts/Dpkg/Source/Package.pm:353
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "impossible de rendre %s exécutable"
 
-#: scripts/Dpkg/Source/Package.pm:350
+#: scripts/Dpkg/Source/Package.pm:355
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s n'est pas un fichier normal"
 
-#: scripts/Dpkg/Source/Package.pm:382
+#: scripts/Dpkg/Source/Package.pm:387
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "fichier %s ajouté deux fois"
@@ -2778,7 +2778,7 @@ msgid "failed to rename saved %s to %s"
 msgstr "impossible de modifier le fichier sauvegardé %s en %s"
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:162
 #, perl-format
 msgid "applying %s"
 msgstr "mise en place de %s"
@@ -2934,7 +2934,7 @@ msgid "no orig.tar file found"
 msgstr "pas de fichier orig.tar trouvé"
 
 #: scripts/Dpkg/Source/Package/V2.pm:217
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -2995,7 +2995,8 @@ msgstr "impossible de supprimer %s"
 #: scripts/Dpkg/Source/Package/V2.pm:352
 #, perl-format
 msgid "local changes stored in %s, the modified files are:"
-msgstr "modifications locales enregistrées dans %s, les fichiers modifiés sont :"
+msgstr ""
+"modifications locales enregistrées dans %s, les fichiers modifiés sont :"
 
 #: scripts/Dpkg/Source/Package/V2.pm:358
 #, perl-format
@@ -3162,12 +3163,12 @@ msgstr ""
 "le fichier « series » (%s) contient des options non gérées (« %s », ligne %s), "
 "dpkg-source pourrait échouer dans l'application des correctifs."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:135
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "impossible de lire le lien symbolique %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:147
 #, perl-format
 msgid "applying %s with quilt"
 msgstr "application de %s avec quilt"

scripts/po/pl.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-06-09 09:08+0200\n"
+"POT-Creation-Date: 2008-08-17 18:08+0300\n"
 "PO-Revision-Date: 2008-06-10 20:52+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -158,7 +158,7 @@ msgstr ""
 "Copyright (C) 2007 Frank Lichtenheld"
 
 #: scripts/dpkg-buildpackage.pl:36
-#, perl-format
+#, fuzzy, perl-format
 msgid ""
 "\n"
 "Usage: %s [<options> ...]\n"
@@ -188,7 +188,7 @@ msgid ""
 "  -m<maint>      maintainer for package is <maint>.    }\n"
 "  -e<maint>      maintainer for release is <maint>.    } only passed\n"
 "  -C<descfile>   changes are described in <descfile>.  } to dpkg-genchanges\n"
-"  -si (default)  src includes orig for rev. 0 or 1.    }\n"
+"  -si (default)  src includes orig if new upstream.    }\n"
 "  -sa            uploaded src always includes orig.    }\n"
 "  -sd            uploaded src is diff and .dsc only.   }\n"
 "  -sn            force Debian native source format.      }\n"
@@ -677,12 +677,12 @@ msgstr "brak pola Priority plików źródłowych"
 msgid "cannot open .dsc file %s"
 msgstr "nie można otworzyć pliku .dsc %s"
 
-#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:140
+#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:145
 #, perl-format
 msgid "source control file %s"
 msgstr "źródłowy plik kontrolny %s"
 
-#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:201
+#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:206
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr "Pole Files zawiera niepoprawną linię \"%s\""
@@ -717,13 +717,13 @@ msgstr "wydanie tylko binarne - niedołączanie żadnych kodów źródłowych"
 msgid "write original source message"
 msgstr "wypisywanie oryginalnego komunikatu źródłowego"
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "brak informacji o krytycznym polu wyjściowym %s"
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:414
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "brak informacji o polu wyjściowym %s"
@@ -1618,7 +1618,7 @@ msgstr ""
 #: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
 #: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:79
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:260
 #, perl-format
 msgid "cannot read %s"
 msgstr "nie można odczytać %s"
@@ -1972,7 +1972,7 @@ msgstr "fork dla %s"
 
 #: scripts/Dpkg/Changelog.pm:799 scripts/Dpkg/IPC.pm:226
 #: scripts/Dpkg/Shlibs.pm:77 scripts/Dpkg/Shlibs/SymbolFile.pm:114
-#: scripts/Dpkg/Source/Package.pm:129 scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:134 scripts/Dpkg/Source/Package.pm:143
 #, perl-format
 msgid "cannot open %s"
 msgstr "nie można otworzyć %s"
@@ -2205,12 +2205,12 @@ msgstr "ponowne otwieranie stdin"
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package.pm:427 scripts/Dpkg/Source/Package/V2.pm:180
 #: scripts/Dpkg/Source/Package/V2.pm:399
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:248
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:252
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:263
 #, perl-format
 msgid "cannot write %s"
 msgstr "nie można zapisać %s"
@@ -2289,7 +2289,7 @@ msgstr "zapisywanie na wejściu tar"
 msgid "close on tar input"
 msgstr "zamykanie wejścia tar"
 
-#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:249
+#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:254
 #: scripts/Dpkg/Source/Package/V2.pm:164
 #, perl-format
 msgid "cannot opendir %s"
@@ -2464,8 +2464,7 @@ msgstr ""
 #: scripts/Dpkg/Source/Patch.pm:350
 #, perl-format
 msgid "file removal without proper filename in diff `%s' (line %d)"
-msgstr ""
-"usuwanie pliku bez właściwej nazwy w pliku łatki \"%s\" (linia %d)"
+msgstr "usuwanie pliku bez właściwej nazwy w pliku łatki \"%s\" (linia %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:352
 #, perl-format
@@ -2503,13 +2502,13 @@ msgid "diff `%s' doesn't contain any patch"
 msgstr "diff \"%s\" nie zawiera żadnej łatki"
 
 #: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
 #, perl-format
 msgid "cannot create directory %s"
 msgstr "nie można utworzyć katalogu %s"
 
 #: scripts/Dpkg/Source/Patch.pm:452
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:159
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "nie można zmienić czasu modyfikacji dla %s"
@@ -2523,7 +2522,7 @@ msgstr "usuwanie kopii zapasowej pliku łatki %s"
 msgid "nonexistent"
 msgstr "nieistniejące"
 
-#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot stat %s"
 msgstr "nie można ustalić stanu %s"
@@ -2557,17 +2556,17 @@ msgstr "nazwany potok"
 msgid "named socket"
 msgstr "nazwane gniazdo"
 
-#: scripts/Dpkg/Source/Package.pm:124
+#: scripts/Dpkg/Source/Package.pm:129
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr "%s nie jest nazwą pliku"
 
-#: scripts/Dpkg/Source/Package.pm:147
+#: scripts/Dpkg/Source/Package.pm:152
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "brak krytycznego źródłowego pola kontrolnego %s "
 
-#: scripts/Dpkg/Source/Package.pm:173
+#: scripts/Dpkg/Source/Package.pm:178
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
@@ -2575,56 +2574,56 @@ msgstr ""
 "format \"%s\" pakietu źródłowego nie jest obsługiwany (wymagany moduł Perla %"
 "s)"
 
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:182
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr "niepoprawne pole Format \"%s\""
 
-#: scripts/Dpkg/Source/Package.pm:203
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "file `%s' listed twice in Files field"
 msgstr "plik \"%s\" dwukrotnie wymieniony w polu Fields"
 
-#: scripts/Dpkg/Source/Package.pm:232
+#: scripts/Dpkg/Source/Package.pm:237
 msgid "source and version are required to compute the source basename"
 msgstr "źródło i wersja są wymagane do określenia nazwy bazowej źródeł"
 
-#: scripts/Dpkg/Source/Package.pm:278
+#: scripts/Dpkg/Source/Package.pm:283
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "błąd weryfikowania sygnatury w %s"
 
-#: scripts/Dpkg/Source/Package.pm:282
+#: scripts/Dpkg/Source/Package.pm:287
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "nie można zweryfikować sygnatury w %s, ponieważ nie zainstalowano gpg"
 
-#: scripts/Dpkg/Source/Package.pm:291
+#: scripts/Dpkg/Source/Package.pm:296
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "%s nie jest prawidłową opcją dla %s"
 
-#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#: scripts/Dpkg/Source/Package.pm:338 scripts/Dpkg/Source/Package/V2.pm:370
 #, perl-format
 msgid "can't write %s"
 msgstr "nie można zapisać %s"
 
-#: scripts/Dpkg/Source/Package.pm:345
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s nie istnieje"
 
-#: scripts/Dpkg/Source/Package.pm:348
+#: scripts/Dpkg/Source/Package.pm:353
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "nie można uczynić %s plikiem wykonywalnym"
 
-#: scripts/Dpkg/Source/Package.pm:350
+#: scripts/Dpkg/Source/Package.pm:355
 #, perl-format
 msgid "%s is not a plain file"
 msgstr " %s nie jest zwykłym plikiem"
 
-#: scripts/Dpkg/Source/Package.pm:382
+#: scripts/Dpkg/Source/Package.pm:387
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "próbowano dwukrotnie dodać plik \"%s\""
@@ -2687,7 +2686,7 @@ msgid "failed to rename saved %s to %s"
 msgstr "nie można zmienić nazwy zachowanego %s na %s"
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:162
 #, perl-format
 msgid "applying %s"
 msgstr "aplikowanie %s"
@@ -2848,7 +2847,7 @@ msgid "no orig.tar file found"
 msgstr "nie znaleziono pliku orig.tar"
 
 #: scripts/Dpkg/Source/Package/V2.pm:217
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -3073,12 +3072,12 @@ msgstr ""
 "plik wydania (%s) zawiera nieobsługiwane opcje (\"%s\", linia %s), dpkg-"
 "source może zawieść przy nakładaniu łatek."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:135
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "nie można utworzyć linku symbolicznego \"%s\""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:147
 #, perl-format
 msgid "applying %s with quilt"
 msgstr "nakładanie %s z użyciem quilt"

scripts/po/ru.po

@@ -1,13 +1,13 @@
-# translation of ru.po to Russian
+# translation of dpkg_1.14.20_ru.po to Russian
 # Localization file for dpkg and other programs from dpkg package.
 #
 # Yuri Kozlov <kozlov.y@gmail.com>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.14.19\n"
+"Project-Id-Version: dpkg 1.14.20\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-06-09 09:08+0200\n"
-"PO-Revision-Date: 2008-05-03 22:40+0400\n"
+"POT-Creation-Date: 2008-08-17 18:08+0300\n"
+"PO-Revision-Date: 2008-07-09 20:55+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -162,7 +162,7 @@ msgstr ""
 "Copyright (C) 2007 Frank Lichtenheld"
 
 #: scripts/dpkg-buildpackage.pl:36
-#, perl-format
+#, fuzzy, perl-format
 msgid ""
 "\n"
 "Usage: %s [<options> ...]\n"
@@ -192,7 +192,7 @@ msgid ""
 "  -m<maint>      maintainer for package is <maint>.    }\n"
 "  -e<maint>      maintainer for release is <maint>.    } only passed\n"
 "  -C<descfile>   changes are described in <descfile>.  } to dpkg-genchanges\n"
-"  -si (default)  src includes orig for rev. 0 or 1.    }\n"
+"  -si (default)  src includes orig if new upstream.    }\n"
 "  -sa            uploaded src always includes orig.    }\n"
 "  -sd            uploaded src is diff and .dsc only.   }\n"
 "  -sn            force Debian native source format.      }\n"
@@ -690,12 +690,12 @@ msgstr "отсутствует Priority для файлов исходников
 msgid "cannot open .dsc file %s"
 msgstr "не удалось открыть файл .dsc %s"
 
-#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:140
+#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:145
 #, perl-format
 msgid "source control file %s"
 msgstr "файл управления исходниками %s"
 
-#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:201
+#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:206
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr "Поле Files содержит неправильную строку `%s'"
@@ -730,13 +730,13 @@ msgstr "закачка только бинарных пакетов, без па
 msgid "write original source message"
 msgstr "запись оригинального исходного сообщения"
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "отсутствует информация о критическом поле вывода %s"
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:414
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "отсутствует информация о поле вывода %s"
@@ -1626,7 +1626,7 @@ msgstr ""
 #: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
 #: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:79
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:260
 #, perl-format
 msgid "cannot read %s"
 msgstr "не удалось прочитать %s"
@@ -1981,7 +1981,7 @@ msgstr "вызов fork для %s"
 
 #: scripts/Dpkg/Changelog.pm:799 scripts/Dpkg/IPC.pm:226
 #: scripts/Dpkg/Shlibs.pm:77 scripts/Dpkg/Shlibs/SymbolFile.pm:114
-#: scripts/Dpkg/Source/Package.pm:129 scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:134 scripts/Dpkg/Source/Package.pm:143
 #, perl-format
 msgid "cannot open %s"
 msgstr "не удалось открыть %s"
@@ -2216,12 +2216,12 @@ msgstr "переоткрытие stdin"
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package.pm:427 scripts/Dpkg/Source/Package/V2.pm:180
 #: scripts/Dpkg/Source/Package/V2.pm:399
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:248
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:252
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:263
 #, perl-format
 msgid "cannot write %s"
 msgstr "не удалось записать %s"
@@ -2300,7 +2300,7 @@ msgstr "вызов write для ввода tar"
 msgid "close on tar input"
 msgstr "закрытие ввода tar"
 
-#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:249
+#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:254
 #: scripts/Dpkg/Source/Package/V2.pm:164
 #, perl-format
 msgid "cannot opendir %s"
@@ -2456,10 +2456,9 @@ msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr "строка после --- не та, что ожидалась в diff `%s' (строка %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:337
-#, fuzzy, perl-format
+#, perl-format
 msgid "none of the filenames in ---/+++ are relative in diff `%s' (line %d)"
-msgstr ""
-"оригинальный и изменённый файлы равны /dev/null для diff `%s' (строка %d)"
+msgstr "ни один из имён файлов в ---/+++ не связаны с diff `%s' (строка %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:343
 #, perl-format
@@ -2468,14 +2467,14 @@ msgstr ""
 "оригинальный и изменённый файлы равны /dev/null для diff `%s' (строка %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:350
-#, fuzzy, perl-format
+#, perl-format
 msgid "file removal without proper filename in diff `%s' (line %d)"
-msgstr "строка после --- не та, что ожидалась в diff `%s' (строка %d)"
+msgstr "удаление файла без правильного имени файла в diff `%s' (строка %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:352
 #, perl-format
 msgid "diff %s removes a non-existing file %s (line %d)"
-msgstr ""
+msgstr "diff %s удаляет несуществующий файл %s (строка %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:361
 #, perl-format
@@ -2508,13 +2507,13 @@ msgid "diff `%s' doesn't contain any patch"
 msgstr "diff `%s' не содержит заплатки"
 
 #: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
 #, perl-format
 msgid "cannot create directory %s"
 msgstr "не удалось создать каталог %s"
 
 #: scripts/Dpkg/Source/Patch.pm:452
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:159
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "не удалось изменить метку времени для %s"
@@ -2528,7 +2527,7 @@ msgstr "удаление резервной копии заплатки %s"
 msgid "nonexistent"
 msgstr "несуществующий"
 
-#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot stat %s"
 msgstr "не удалось выполнить функцию stat %s"
@@ -2562,73 +2561,73 @@ msgstr "именованный канал"
 msgid "named socket"
 msgstr "именованный сокет"
 
-#: scripts/Dpkg/Source/Package.pm:124
+#: scripts/Dpkg/Source/Package.pm:129
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr "%s не является именем файла"
 
-#: scripts/Dpkg/Source/Package.pm:147
+#: scripts/Dpkg/Source/Package.pm:152
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "отсутствует критическое управляющее поле исходников %s"
 
-#: scripts/Dpkg/Source/Package.pm:173
+#: scripts/Dpkg/Source/Package.pm:178
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
 msgstr ""
 "формат исходника пакета `%s' не поддерживается (требуется Perl модуль %s)"
 
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:182
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr "неправильное поле Format '%s'"
 
-#: scripts/Dpkg/Source/Package.pm:203
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "file `%s' listed twice in Files field"
 msgstr "файл `%s' упомянут дважды в поле Files"
 
-#: scripts/Dpkg/Source/Package.pm:232
+#: scripts/Dpkg/Source/Package.pm:237
 msgid "source and version are required to compute the source basename"
 msgstr "для определения базового имени исходника требуется исходник и версия"
 
-#: scripts/Dpkg/Source/Package.pm:278
+#: scripts/Dpkg/Source/Package.pm:283
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "проверка подписи для %s завершилась неудачно"
 
-#: scripts/Dpkg/Source/Package.pm:282
+#: scripts/Dpkg/Source/Package.pm:287
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "невозможно проверить подпись для %s, так как gpg не установлена"
 
-#: scripts/Dpkg/Source/Package.pm:291
+#: scripts/Dpkg/Source/Package.pm:296
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "%s не является допустимым параметром для %s"
 
-#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#: scripts/Dpkg/Source/Package.pm:338 scripts/Dpkg/Source/Package/V2.pm:370
 #, perl-format
 msgid "can't write %s"
 msgstr "не удалось записать %s"
 
-#: scripts/Dpkg/Source/Package.pm:345
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s не существует"
 
-#: scripts/Dpkg/Source/Package.pm:348
+#: scripts/Dpkg/Source/Package.pm:353
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "не удалось сделать %s исполняемым"
 
-#: scripts/Dpkg/Source/Package.pm:350
+#: scripts/Dpkg/Source/Package.pm:355
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s не является простым файлом"
 
-#: scripts/Dpkg/Source/Package.pm:382
+#: scripts/Dpkg/Source/Package.pm:387
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "попытка добавить файл `%s' дважды"
@@ -2691,7 +2690,7 @@ msgid "failed to rename saved %s to %s"
 msgstr "отказ при переименовании сохранённого %s в %s"
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:162
 #, perl-format
 msgid "applying %s"
 msgstr "накладывается %s"
@@ -2853,7 +2852,7 @@ msgid "no orig.tar file found"
 msgstr "файл orig.tar не найден"
 
 #: scripts/Dpkg/Source/Package/V2.pm:217
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -2888,9 +2887,9 @@ msgstr ""
 "изменённыйдвоичный файл в debian tarball"
 
 #: scripts/Dpkg/Source/Package/V2.pm:320
-#, fuzzy, perl-format
+#, perl-format
 msgid "unwanted binary file: %s"
-msgstr "повторение бинарного поля в %s"
+msgstr "нежелательный двоичный файл: %s"
 
 #: scripts/Dpkg/Source/Package/V2.pm:326
 #, perl-format
@@ -2898,6 +2897,8 @@ msgid ""
 "detected %d unwanted binary file(s) (add them in debian/source/include-"
 "binaries to allow their inclusion)."
 msgstr ""
+"обнаружено %d нежелательных двочных файлов (что разрешить включение, "
+"добавьте их в debian/source/include-binaries)."
 
 #: scripts/Dpkg/Source/Package/V2.pm:339
 msgid "unrepresentable changes to source"
@@ -2911,7 +2912,7 @@ msgstr "не удалось удалить %s"
 #: scripts/Dpkg/Source/Package/V2.pm:352
 #, perl-format
 msgid "local changes stored in %s, the modified files are:"
-msgstr ""
+msgstr "локальные изменения сохранены в %s, изменённые файлы:"
 
 #: scripts/Dpkg/Source/Package/V2.pm:358
 #, perl-format
@@ -3076,12 +3077,12 @@ msgstr ""
 "файл series (%s) содержит неподдерживаемые параметры ('%s', строка %s), у "
 "dpkg-source может не получиться наложить заплатки."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:135
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "не удалось создать символическую ссылку %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:147
 #, perl-format
 msgid "applying %s with quilt"
 msgstr "наложение %s с помощью quilt"
@@ -3125,9 +3126,3 @@ msgstr "пакет исходников содержит два конфликт
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr "номер версии содержит недопустимый символ `%s'"
-
-#~ msgid "diff `%s' patches file with no subdirectory"
-#~ msgstr "файл заплаток diff `%s' без подкаталога"
-
-#~ msgid "diff `%s' is missing trailing newline"
-#~ msgstr "в diff `%s' отсутствует завершающий символ новой строки"

scripts/po/sv.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.15\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-06-09 09:08+0200\n"
+"POT-Creation-Date: 2008-08-17 18:08+0300\n"
 "PO-Revision-Date: 2008-06-09 14:22+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -155,7 +155,7 @@ msgstr ""
 "Copyright © 2007 Frank Lichtenheld."
 
 #: scripts/dpkg-buildpackage.pl:36
-#, perl-format
+#, fuzzy, perl-format
 msgid ""
 "\n"
 "Usage: %s [<options> ...]\n"
@@ -185,7 +185,7 @@ msgid ""
 "  -m<maint>      maintainer for package is <maint>.    }\n"
 "  -e<maint>      maintainer for release is <maint>.    } only passed\n"
 "  -C<descfile>   changes are described in <descfile>.  } to dpkg-genchanges\n"
-"  -si (default)  src includes orig for rev. 0 or 1.    }\n"
+"  -si (default)  src includes orig if new upstream.    }\n"
 "  -sa            uploaded src always includes orig.    }\n"
 "  -sd            uploaded src is diff and .dsc only.   }\n"
 "  -sn            force Debian native source format.      }\n"
@@ -665,12 +665,12 @@ msgstr "\"Priority\" saknas för källfiler"
 msgid "cannot open .dsc file %s"
 msgstr "kan inte öppna .dsc-filen %s"
 
-#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:140
+#: scripts/dpkg-genchanges.pl:405 scripts/Dpkg/Source/Package.pm:145
 #, perl-format
 msgid "source control file %s"
 msgstr "källstyrfilen %s"
 
-#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:201
+#: scripts/dpkg-genchanges.pl:415 scripts/Dpkg/Source/Package.pm:206
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr "Files-fältet innehåller felaktig rad \"%s\""
@@ -705,13 +705,13 @@ msgstr "endast binär insändning - tar inte med någon källkod"
 msgid "write original source message"
 msgstr "skriver meddelande om originalkällkod"
 
-#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:404
+#: scripts/dpkg-genchanges.pl:521 scripts/Dpkg/Source/Package.pm:409
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "saknar information för kritiskt utdatafält %s"
 
 #: scripts/dpkg-genchanges.pl:526 scripts/dpkg-gencontrol.pl:260
-#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:409
+#: scripts/dpkg-gencontrol.pl:263 scripts/Dpkg/Source/Package.pm:414
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "saknar information för utdatafält %s"
@@ -1581,7 +1581,7 @@ msgstr "arkitektur %s tillåts inte ensamt (listan för paketet %s är \"%s\")"
 #: scripts/dpkg-source.pl:257 scripts/Dpkg/Control.pm:81
 #: scripts/Dpkg/Shlibs/Objdump.pm:89 scripts/Dpkg/Source/CompressedFile.pm:131
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:79
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:260
 #, perl-format
 msgid "cannot read %s"
 msgstr "kan inte läsa %s"
@@ -1933,7 +1933,7 @@ msgstr "grenar för %s"
 
 #: scripts/Dpkg/Changelog.pm:799 scripts/Dpkg/IPC.pm:226
 #: scripts/Dpkg/Shlibs.pm:77 scripts/Dpkg/Shlibs/SymbolFile.pm:114
-#: scripts/Dpkg/Source/Package.pm:129 scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:134 scripts/Dpkg/Source/Package.pm:143
 #, perl-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
@@ -2167,12 +2167,12 @@ msgstr "öppna standard in på nytt"
 #: scripts/Dpkg/IPC.pm:234 scripts/Dpkg/IPC.pm:242
 #: scripts/Dpkg/Shlibs/SymbolFile.pm:181
 #: scripts/Dpkg/Source/CompressedFile.pm:118
-#: scripts/Dpkg/Source/Package.pm:422 scripts/Dpkg/Source/Package/V2.pm:180
+#: scripts/Dpkg/Source/Package.pm:427 scripts/Dpkg/Source/Package/V2.pm:180
 #: scripts/Dpkg/Source/Package/V2.pm:399
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:136
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:243
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:247
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:258
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:248
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:252
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:263
 #, perl-format
 msgid "cannot write %s"
 msgstr "kan inte skriva %s"
@@ -2251,7 +2251,7 @@ msgstr "skriv på tar-indata"
 msgid "close on tar input"
 msgstr "stängning av tar-indata"
 
-#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:249
+#: scripts/Dpkg/Source/Archive.pm:133 scripts/Dpkg/Source/Package.pm:254
 #: scripts/Dpkg/Source/Package/V2.pm:164
 #, perl-format
 msgid "cannot opendir %s"
@@ -2458,13 +2458,13 @@ msgid "diff `%s' doesn't contain any patch"
 msgstr "diffen \"%s\" innehåller inte någon patch"
 
 #: scripts/Dpkg/Source/Patch.pm:417 scripts/Dpkg/Source/Package/V3/git.pm:182
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:146
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
 #, perl-format
 msgid "cannot create directory %s"
 msgstr "kan inte skapa katalogen %s"
 
 #: scripts/Dpkg/Source/Patch.pm:452
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:154
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:159
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "kan inte ändra tidsstämpel på %s"
@@ -2478,7 +2478,7 @@ msgstr "tar bort patchsäkerhetskopian %s"
 msgid "nonexistent"
 msgstr "saknas"
 
-#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:343
+#: scripts/Dpkg/Source/Patch.pm:497 scripts/Dpkg/Source/Package.pm:348
 #, perl-format
 msgid "cannot stat %s"
 msgstr "kan inte ta status på %s"
@@ -2512,72 +2512,72 @@ msgstr "namngivet rör"
 msgid "named socket"
 msgstr "namngivet uttag"
 
-#: scripts/Dpkg/Source/Package.pm:124
+#: scripts/Dpkg/Source/Package.pm:129
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr "%s är inte namnet på en fil"
 
-#: scripts/Dpkg/Source/Package.pm:147
+#: scripts/Dpkg/Source/Package.pm:152
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "saknar kritiska källkodsstyrfältet %s"
 
-#: scripts/Dpkg/Source/Package.pm:173
+#: scripts/Dpkg/Source/Package.pm:178
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
 msgstr "källkodsformatet \"%s\" stöds inte (Perlmodulen %s krävs)"
 
-#: scripts/Dpkg/Source/Package.pm:177
+#: scripts/Dpkg/Source/Package.pm:182
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr "ogiltigt Format-fält \"%s\""
 
-#: scripts/Dpkg/Source/Package.pm:203
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "file `%s' listed twice in Files field"
 msgstr "filen \"%s\" förekommer två gånger i Files-fältet"
 
-#: scripts/Dpkg/Source/Package.pm:232
+#: scripts/Dpkg/Source/Package.pm:237
 msgid "source and version are required to compute the source basename"
 msgstr "källkod och version behövs för att beräkna basnamn för källkod"
 
-#: scripts/Dpkg/Source/Package.pm:278
+#: scripts/Dpkg/Source/Package.pm:283
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "misslyckades verifiera signaturen på %s"
 
-#: scripts/Dpkg/Source/Package.pm:282
+#: scripts/Dpkg/Source/Package.pm:287
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "kunde inte verifiera signaturen på %s eftersom gpg inte installerats"
 
-#: scripts/Dpkg/Source/Package.pm:291
+#: scripts/Dpkg/Source/Package.pm:296
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "%s är inte en giltig flagga för %s"
 
-#: scripts/Dpkg/Source/Package.pm:333 scripts/Dpkg/Source/Package/V2.pm:370
+#: scripts/Dpkg/Source/Package.pm:338 scripts/Dpkg/Source/Package/V2.pm:370
 #, perl-format
 msgid "can't write %s"
 msgstr "kan inte skriva %s"
 
-#: scripts/Dpkg/Source/Package.pm:345
+#: scripts/Dpkg/Source/Package.pm:350
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s finns inte"
 
-#: scripts/Dpkg/Source/Package.pm:348
+#: scripts/Dpkg/Source/Package.pm:353
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "kan inte göra %s exekverbar"
 
-#: scripts/Dpkg/Source/Package.pm:350
+#: scripts/Dpkg/Source/Package.pm:355
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s är inte en vanlig fil"
 
-#: scripts/Dpkg/Source/Package.pm:382
+#: scripts/Dpkg/Source/Package.pm:387
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "försökte lägga till filen \"%s\" två gånger"
@@ -2640,7 +2640,7 @@ msgid "failed to rename saved %s to %s"
 msgstr "misslyckades att byta namn på sparad %s till %s"
 
 #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:183
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:162
 #, perl-format
 msgid "applying %s"
 msgstr "tillämpar %s"
@@ -2797,7 +2797,7 @@ msgid "no orig.tar file found"
 msgstr "ingen orig.tar-fil hittades"
 
 #: scripts/Dpkg/Source/Package/V2.pm:217
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:206
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -3018,12 +3018,12 @@ msgstr ""
 "series-filen (%s) innehåller flaggor som inte stöds (\"%s\", rad %s), dpkg-"
 "source kanske kommer att misslyckas med att tillämpa patchar."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:130
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:135
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "kan inte skapa den symboliska länken %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:147
 #, perl-format
 msgid "applying %s with quilt"
 msgstr "tillämpar %s med quilt"

src/help.c

@@ -211,8 +211,10 @@ post_postinst_tasks_core(struct pkginfo *pkg)
 {
   modstatdb_note(pkg);
 
-  debug(dbg_triggersdetail, "post_postinst_tasks_core - trig_incorporate");
-  trig_incorporate(msdbrw_write, admindir);
+  if (!f_noact) {
+    debug(dbg_triggersdetail, "post_postinst_tasks_core - trig_incorporate");
+    trig_incorporate(msdbrw_write, admindir);
+  }
 }
 
 static void

src/packages.c

@@ -228,7 +228,8 @@ void process_queue(void) {
       /* give up on it from the point of view of other packages, ie reset istobe */
       pkg->clientdata->istobe= itb_normal;
       error_unwind(ehflag_bombout);
-      if (onerr_abort > 0) break;
+      if (onerr_abort > 0)
+        return;
       continue;
     }
     push_error_handler(&ejbuf,print_error_perpackage,pkg->name);

src/trigproc.c

@@ -301,9 +301,11 @@ trigproc(struct pkginfo *pkg)
 		pkg->status = stat_halfconfigured;
 		modstatdb_note(pkg);
 
-		sincenothing = 0;
-		maintainer_script_postinst(pkg, "triggered",
-		                           namesarg.buf + 1, NULL);
+		if (!f_noact) {
+			sincenothing = 0;
+			maintainer_script_postinst(pkg, "triggered",
+			                           namesarg.buf + 1, NULL);
+		}
 
 		/* This is to cope if the package triggers itself: */
 		pkg->status = pkg->trigaw.head ? stat_triggersawaited :
@@ -364,10 +366,10 @@ trig_transitional_activate(enum modstatdb_rw cstatus)
 		              transitional_interest_callback_ro, NULL, pkg);
 	}
 	iterpkgend(it);
-	if (cstatus >= msdbrw_write)
+	if (cstatus >= msdbrw_write) {
 		modstatdb_checkpoint();
-
-	trig_file_interests_save();
+		trig_file_interests_save();
+	}
 }
 
 /*========== hook setup ==========*/