Merge lenny branch up to commit '1.14.22'

Conflicts:

	configure.ac
	debian/changelog
	man/ChangeLog
	man/po/sv.po
	po/sv.po

ChangeLog

@@ -1,3 +1,34 @@
+2008-09-05  Raphael Hertzog  <hertzog@debian.org>
+
+	* configure.ac: Release 1.14.22.
+
+2008-08-29  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/dpkg-gensymbols.pl: It was already skipping symlinks
+	within the package build tree. Now it also skips real
+	directories accessed through a symlink contained in the package
+	build tree. Package like libc6-386 had symlinks usr/lib32
+	pointing to some directories outside of the build tree and
+	the LD_LIBRARY_PATH set by fakeroot led contained
+	/usr/lib32/libfakeroot which made dpkg-gensymbols scan this
+	directory and add libfakeroot to the libc6-386 symbols file!
+
+2008-08-29  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package/V3/quilt.pm: run_quilt() can be run
+	when no quilt series file exist yet. In that case we have to
+	provide the name of the series file that we want to create (as the
+	quilt command might create it). Up to now
+	File::Spec->rel2abs(undef) returned the name of the current
+	directory and we improperly used that as value of QUILT_SERIES.
+	* scripts/Dpkg/Source/Package/V2.pm (do_build): Change permissions
+	of the automatically generated patch which is initially created
+	0600 with tempfile().
+
+2008-08-26  Guillem Jover  <guillem@debian.org>
+
+	* configure.ac: Bump version to 1.14.22~.
+
 2008-08-26  Guillem Jover  <guillem@debian.org>
 
 	* lib/gettext.h: Move to ..

debian/changelog

@@ -89,6 +89,37 @@ dpkg (1.15.0) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Tue, 29 Jul 2008 02:34:59 +0300
 
+dpkg (1.14.22) unstable; urgency=low
+
+  [ Raphael Hertzog ]
+  * The last "small fix" actually broke conversion of source packages to
+    "3.0 (quilt)" format when they have local changes and no pre-existing
+    quilt series file. Now always provide a valid name in QUILT_SERIES.
+    Closes: #496920
+  * Fix permissions of the automatically generated pacth in "2.0" and "3.0
+    (quilt)" format. They were improperly set to 0600 due to tempfile()
+    and were not reset to a sane value. Closes: #496925
+  * Fix dpkg-gensymbols to not scan (real) directories accessed through a
+    symlink contained in the build tree as they may well not be part of
+    the package (with absolute symlinks). It was already skipping symlinks
+    (since 1.14.16.6) for similar reasons.
+
+  [ Updated dpkg translations ]
+  * Basque (Piarres Beobide). Closes: #496753
+  * Brazilian Portuguese (Felipe Augusto van de Wiel).
+  * Galician (Jacobo Tarrio).
+  * Norwegian Bokmal (Hans Fredrik Nordhaug). Closes: #497309
+  * Swedish (Daniel Nylander and Peter Krefting).
+  * Vietnamese (Clytie Siddall). Closes: #497893
+
+  [ Updated manpages translations ]
+  * Swedish (Peter Krefting).
+
+  [ Updated scripts translations ]
+  * Swedish (Peter Krefting).
+
+ -- Raphael Hertzog <hertzog@debian.org>  Fri, 05 Sep 2008 16:54:45 +0200
+
 dpkg (1.14.21) unstable; urgency=low
 
   [ Raphael Hertzog ]

man/po/ChangeLog

@@ -1,3 +1,8 @@
+2008-06-04  Peter Krefting  <peterk@debian.org>
+
+	* po/sv.po: Updated to 1601t.
+	* po/sv.add: Updated my surname.
+
 2008-08-22  Raphael Hertzog  <hertzog@debian.org>
 
 	* po/fr.po: Updated to 1601t. Replaced "déclenchement" with

man/po/sv.add

@@ -1,3 +1,3 @@
 PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary
 .SH "ÖVERSÄTTNING"
-Peter Karlsson och Daniel Nylander.
+Peter Krefting och Daniel Nylander.

man/po/sv.po

@@ -1,17 +1,17 @@
 # Manual page for dpkg
-# Peter Karlsson <peterk@debian.org>, 1999-2008.
+# Peter Krefting <peterk@debian.org>, 1999-2008.
 # Copyright 1999-2008 Software in the Public Interest
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-26 06:49+0400\n"
-"PO-Revision-Date: 2008-06-04 09:50+0100\n"
-"Last-Translator: Peter Karlsson <peterk@debian.org>\n"
+"POT-Creation-Date: 2008-08-17 18:06+0400\n"
+"PO-Revision-Date: 2008-08-29 17:52+0100\n"
+"Last-Translator: Peter Krefting <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit"
 
 # type: Plain text
 #: ../../man/822-date.1:2
@@ -2388,7 +2388,6 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg.1:26
-#, fuzzy
 msgid ""
 "B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
 "primary and more user-friendly front-end for B<dpkg> is B<aptitude>(1). "
@@ -2399,7 +2398,7 @@ msgid ""
 msgstr ""
 "B<dpkg> är ett verktyg för att installera, bygga, ta bort och hantera "
 "Debianpaket. Det primära och mer användarvänliga skalet runt B<dpkg> är "
-"B<dselect>(1). B<dpkg> kontrolleras helt och hållet via "
+"B<aptitude>(1). B<dpkg> kontrolleras helt och hållet via "
 "kommandoradsparametrar, vilka består av exakt en åtgärd och noll eller fler "
 "flaggor. Åtgärdsparametern talar om för dpkg vad som skall göras, och "
 "flaggorna styr på vilket sätt åtgärden skall utföras."
@@ -4081,7 +4080,6 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg.1:653
-#, fuzzy
 msgid ""
 "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 "
@@ -4091,7 +4089,7 @@ msgstr ""
 "Observera att detta faktiskt inte kommer installera eller ta bort någonting, "
 "utan bara sätta valstatus på de efterfrågade paketen. Du måste använda ett "
 "annat program för att faktiskt hämta och installera de efterfrågade paketen. "
-"Till exempel kan du köra B<dselect> och välja I<Installera>."
+"Till exempel kan du köra B<apt-get dselect-upgrade>."
 
 # type: Plain text
 #: ../../man/dpkg.1:656
@@ -4119,13 +4117,12 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg.1:673
-#, fuzzy
 msgid ""
 "B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
 "B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
 msgstr ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
-"(5), B<dpkg.cfg>(5) och B<dpkg-reconfigure>(8)."
+"B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
+"B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5) och B<dpkg-reconfigure>(8)."
 
 # type: Plain text
 #: ../../man/dpkg.1:676
@@ -13225,7 +13222,7 @@ msgid ""
 "Ian Jackson."
 msgstr ""
 "Manualsida av Klee Dienes E<lt>klee@mit.eduE<gt>, delvis omformaterad av Ian "
-"Jackson, översatt av Peter Karlsson E<lt>peterk@debian.orgE<gt>."
+"Jackson, översatt av Peter Krefting E<lt>peterk@debian.orgE<gt>."
 
 # type: TH
 #: ../../man/update-alternatives.8:8

po/ChangeLog

@@ -1,3 +1,27 @@
+2008-09-05  Clytie Siddall  <clytie@riverland.net.au>
+
+	* vi.po: Updated to 985t.
+
+2008-09-05  Hans Fredrik Nordhaug <hans@nordhaug.priv.no>
+
+	* nb.po: Updated to 985t.
+
+2008-09-05  Piarres Beobide  <pi+debian@beobide.net>
+
+	* eu.po: Updated to 985t.
+
+2008-08-29  Jacobo Tarrio <jtarrio@debian.org>
+
+	* gl.po: Updated to 985t.
+
+2008-08-29  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated to 985t.
+
+2008-08-26  Felipe Augusto van de Wiel  <faw@debian.org>
+
+	* pt_BR.po: Updated to 985t.
+
 2008-08-26  Deng Xiyue  <manphiz-guest@users.alioth.debian.org>
 
 	* zh_CN.po: Updated to 985t.

po/eu.po

@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: dpkg_po_eu\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2008-08-17 18:05+0300\n"
-"PO-Revision-Date: 2008-07-15 09:47+0200\n"
+"PO-Revision-Date: 2008-08-27 10:10+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: lib/compat.c:46
 msgid "unable to open tmpfile for vsnprintf"
@@ -135,8 +135,7 @@ msgstr ""
 
 #: lib/dbmodify.c:64
 #, c-format
-msgid ""
-"updates directory contains files with different length names (both %d and %d)"
+msgid "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 "eguneratzeen direktorioak luzera desberdineko izenak dituzten fitxategiak "
 "dauzka (%d eta %d)"
@@ -390,8 +389,7 @@ msgstr "`conffiles' balioak `%.*s' lerroa gaizki formateatua dauka"
 #: lib/fields.c:266
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
-msgstr ""
-"`conffiles' balioko lerroa zuriunea ez den `%c' karakterearekin hasten da"
+msgstr "`conffiles' balioko lerroa zuriunea ez den `%c' karakterearekin hasten da"
 
 #: lib/fields.c:282
 msgid "root or null directory is listed as a conffile"
@@ -399,10 +397,8 @@ msgstr "erro direktorioa edo direktorio baliogabea conffile gisa zerrendatu da"
 
 #: lib/fields.c:338
 #, c-format
-msgid ""
-"`%s' field, missing package name, or garbage where package name expected"
-msgstr ""
-"`%s' eremua, pakete izena falta, edo zaborra pakete izena espero zen lekuan"
+msgid "`%s' field, missing package name, or garbage where package name expected"
+msgstr "`%s' eremua, pakete izena falta, edo zaborra pakete izena espero zen lekuan"
 
 #: lib/fields.c:341
 #, c-format
@@ -722,8 +718,7 @@ msgstr "ezin da GPL fitxategia ireki "
 #: lib/parse.c:108
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
-msgstr ""
-"huts egin du `%.255s' paketearen informazio fitxategia irakurtzeko irekitzean"
+msgstr "huts egin du `%.255s' paketearen informazio fitxategia irakurtzeko irekitzean"
 
 #: lib/parse.c:113
 #, c-format
@@ -914,8 +909,7 @@ msgstr "Itxierako giltza falta da formatuan\n"
 #: lib/trigdeferred.l:62
 #, c-format
 msgid "invalid package name `%.250s' in triggers deferred file `%.250s'"
-msgstr ""
-"`%.250s' pakete izen baliogabea `%.250s' baztertutako abiarazle fitxategian"
+msgstr "`%.250s' pakete izen baliogabea `%.250s' baztertutako abiarazle fitxategian"
 
 #: lib/trigdeferred.l:71
 #, c-format
@@ -1026,8 +1020,7 @@ msgstr "ezin da `%.250s' abiarazle interes fitxategi berria instalatu"
 
 #: lib/triglib.c:467
 #, c-format
-msgid ""
-"duplicate file trigger interest for filename `%.250s' and package `%.250s'"
+msgid "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 "bikoizturiko fitxategi abiarazle interesa `%.250s' fitxategian eta`%.250s' "
 "paketean"
@@ -1195,8 +1188,7 @@ msgstr ""
 #: src/archives.c:457
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
-msgstr ""
-"ezin da atzitu leheneratutako `%.255s' beste bertsio bat instalatu aurretik"
+msgstr "ezin da atzitu leheneratutako `%.255s' beste bertsio bat instalatu aurretik"
 
 #: src/archives.c:492
 #, c-format
@@ -1215,8 +1207,7 @@ msgstr "Instalaturiko %s paketeak ordezturiko fitxategiak...\n"
 
 #: src/archives.c:561
 #, c-format
-msgid ""
-"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
 "%2$.250s paketeko `%1$.250s' direktorioa direktorioa ez den batekin "
 "gainidazten saiatzen ari da"
@@ -1294,8 +1285,7 @@ msgstr "ezin da esteka sinbolikoaren babeskopiaren 'chown' egin: `%.255s'"
 #: src/archives.c:785
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
-msgstr ""
-"bertsio berria instalatu aurretik ezin da estekaren babeskopia egin: `%.255s'"
+msgstr "bertsio berria instalatu aurretik ezin da estekaren babeskopia egin: `%.255s'"
 
 #: src/archives.c:810
 #, c-format
@@ -1350,8 +1340,7 @@ msgstr "%.250s instalatzea"
 
 #: src/archives.c:920
 #, c-format
-msgid ""
-"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
+msgid "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 "dpkg: %s-ren konfigurazio kentzea kontutan hartzen, zein %s-ek apur "
 "dezake ... \n"
@@ -1373,8 +1362,7 @@ msgstr ""
 #: src/archives.c:939
 #, c-format
 msgid "dpkg: warning - ignoring breakage, may proceed anyway !\n"
-msgstr ""
-"dpkg: abisua - apurketari ez ikusi egin zaio, hala ere aurrera jarraitzen!\n"
+msgstr "dpkg: abisua - apurketari ez ikusi egin zaio, hala ere aurrera jarraitzen!\n"
 
 #: src/archives.c:945
 #, c-format
@@ -1500,8 +1488,7 @@ msgstr "%s - abisua: %.250s aurreko bertsiora itzultzen (%.250s -> %.250s).\n"
 #: src/archives.c:1276
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
-msgstr ""
-"%.250s ez da aurreko bertsiora itzuliko (%.250s -> %.250s), saltatzen.\n"
+msgstr "%.250s ez da aurreko bertsiora itzuliko (%.250s -> %.250s), saltatzen.\n"
 
 #: src/cleanup.c:83
 #, c-format
@@ -1605,14 +1592,12 @@ msgstr ""
 #: src/configure.c:245
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
-msgstr ""
-"dpkg: %s: abisua - huts egin du `%.250s' babeskopia zaharra kentzean : %s\n"
+msgstr "dpkg: %s: abisua - huts egin du `%.250s' babeskopia zaharra kentzean : %s\n"
 
 #: src/configure.c:254
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr ""
-"dpkg: %s: abisua - huts egin du `%.250s' -> `%.250s' izena aldatzean: %s\n"
+msgstr "dpkg: %s: abisua - huts egin du `%.250s' -> `%.250s' izena aldatzean: %s\n"
 
 #: src/configure.c:262
 #, c-format
@@ -1622,14 +1607,12 @@ msgstr "dpkg: %s: abisua - huts egin du `%.250s' kentzean: %s\n"
 #: src/configure.c:270
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
-msgstr ""
-"dpkg: %s: abisua - huts egin du `%.250s' banaketa zaharra kentzean: %s\n"
+msgstr "dpkg: %s: abisua - huts egin du `%.250s' banaketa zaharra kentzean: %s\n"
 
 #: src/configure.c:275
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
-msgstr ""
-"dpkg: %s: abisua - huts egin du `%.250s' kentzean (gainidatzi aurretik): %s\n"
+msgstr "dpkg: %s: abisua - huts egin du `%.250s' kentzean (gainidatzi aurretik): %s\n"
 
 #: src/configure.c:280
 #, c-format
@@ -1712,8 +1695,7 @@ msgstr "ezin da aldatu `%.250s' konfigurazio fitxategi berriaren jabetza"
 #: src/configure.c:448
 #, c-format
 msgid "unable to set mode of new dist conffile `%.250s'"
-msgstr ""
-"ezin da ezarri banaketa berriaren `%.250s' konfigurazio fitxategiaren modua"
+msgstr "ezin da ezarri banaketa berriaren `%.250s' konfigurazio fitxategiaren modua"
 
 #: src/configure.c:478
 #, c-format
@@ -2095,8 +2077,7 @@ msgstr ""
 #: src/enquiry.c:279
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
-msgstr ""
-"badirudi dpkg ez dagoela instalatuta, ezin da bilatu aroaren euskarria !\n"
+msgstr "badirudi dpkg ez dagoela instalatuta, ezin da bilatu aroaren euskarria !\n"
 
 #: src/enquiry.c:322
 msgid "--predep-package does not take any argument"
@@ -2114,16 +2095,14 @@ msgstr ""
 #: src/enquiry.c:376
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
-msgstr ""
-"%.250s: ezin dira aurremendekotasunak bete (hau dela eta behar dira: %.250s)"
+msgstr "%.250s: ezin dira aurremendekotasunak bete (hau dela eta behar dira: %.250s)"
 
 #: src/enquiry.c:394
 msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture: ez du argumenturik hartzen"
 
 #: src/enquiry.c:436
-msgid ""
-"--compare-versions takes three arguments: <version> <relation> <version>"
+msgid "--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 "--compare-versions: hiru argumentu hartzen ditu: <version> <relation> "
 "<version>"
@@ -2147,8 +2126,7 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:63
-msgid ""
-"dpkg: failed to allocate memory for new entry in list of failed packages."
+msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
 msgstr ""
 "dpkg: ezin izan da memoriarik esleitu huts egindako paketeen zerrendan "
 "sarrera berria gehitzeko."
@@ -2173,8 +2151,7 @@ msgstr "%s paketea atxikitzeko zen, baina zuk eskatu bezala prozesatuko da\n"
 
 #: src/errors.c:98
 #, c-format
-msgid ""
-"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 "%s paketea atxikita dago, ez da ukituko.  Erabili --force-hold\n"
 "gainidazteko.\n"
@@ -2247,8 +2224,7 @@ msgstr "ezin da hustu %s paketearen fitxategi zerrendako eguneratua"
 #: src/filesdb.c:269
 #, c-format
 msgid "failed to sync updated files list file for package %s"
-msgstr ""
-"ezin da sinkronizatu %s paketearen fitxategi zerrendaren fitxategi eguneratua"
+msgstr "ezin da sinkronizatu %s paketearen fitxategi zerrendaren fitxategi eguneratua"
 
 #: src/filesdb.c:272
 #, c-format
@@ -2764,8 +2740,7 @@ msgstr "--debug: octal argumentu bat behar du"
 #: src/main.c:267
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
-msgstr ""
-"pakete izen nulua --ignore-depends komaz bereizitako `%.250s' zerrendan"
+msgstr "pakete izen nulua --ignore-depends komaz bereizitako `%.250s' zerrendan"
 
 #: src/main.c:273
 #, c-format
@@ -2779,7 +2754,7 @@ msgstr "baliogabeko osokoa --%s: `%.250s'"
 
 #: src/main.c:302
 msgid "<package status and progress file descriptor>"
-msgstr ""
+msgstr "<pakete egoera eta aurrerapen fitxategi deskribatzailea>"
 
 #: src/main.c:322
 #, c-format
@@ -2917,8 +2892,7 @@ msgstr "--%s: pakete izenaren argumentu bat behar du gutxienez"
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
 "the files they come in"
-msgstr ""
-"paketeen izenak zehaztu behar dituzu, ez paketeen barruko fitxategien izenak"
+msgstr "paketeen izenak zehaztu behar dituzu, ez paketeen barruko fitxategien izenak"
 
 #: src/packages.c:188
 #, c-format
@@ -3119,8 +3093,7 @@ msgstr "%s (%s) deskonprimitzen...\n"
 #: src/processarc.c:323
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
-msgstr ""
-"konf. fitxategiaren izena (`%.250s' hasten dena) luzeegia da (>%d karaktere)"
+msgstr "konf. fitxategiaren izena (`%.250s' hasten dena) luzeegia da (>%d karaktere)"
 
 #: src/processarc.c:376
 #, c-format
@@ -3453,8 +3426,7 @@ msgstr ""
 
 #: src/remove.c:95
 #, c-format
-msgid ""
-"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
 msgstr ""
 "dpkg - abisua: %.250s kentzeko eskaerari ez ikusi egingo zaio, ez dagoelako "
 "instalatuta.\n"
@@ -3809,8 +3781,7 @@ msgstr "ezin da begiratu `%.250s' artxiboa badagoen"
 
 #: dpkg-deb/build.c:221
 msgid "target is directory - cannot skip control file check"
-msgstr ""
-"helburua direktorioa da - ezin da saltatu kontrol fitxategiaren egiaztapena"
+msgstr "helburua direktorioa da - ezin da saltatu kontrol fitxategiaren egiaztapena"
 
 #: dpkg-deb/build.c:222
 #, c-format
@@ -3823,14 +3794,12 @@ msgstr ""
 
 #: dpkg-deb/build.c:240
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
-msgstr ""
-"pakete izenak minuskula alfanumerikoak edo `-+.' ez diren karaktereak dauzka"
+msgstr "pakete izenak minuskula alfanumerikoak edo `-+.' ez diren karaktereak dauzka"
 
 #: dpkg-deb/build.c:242
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
-msgstr ""
-"abisua, `%s'(e)k erabiltzaileak definitutako `%s' lehentasun balioa dauka\n"
+msgstr "abisua, `%s'(e)k erabiltzaileak definitutako `%s' lehentasun balioa dauka\n"
 
 #: dpkg-deb/build.c:250
 #, c-format
@@ -3881,8 +3850,7 @@ msgstr "fgets: kate huts bat bidali du konfigurazio fitxategiak irakurtzean"
 
 #: dpkg-deb/build.c:304
 #, c-format
-msgid ""
-"warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
 "abisua, `%.50s...' konf. fitxategiaren izena luzeegia da, edo amaierako "
 "lerro-jauzia falta du\n"
@@ -4030,8 +3998,7 @@ msgstr "`%.250s' fitxategia hondatuta dago - kidearen %zi luzera negatiboa"
 #: dpkg-deb/extract.c:84 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
-msgstr ""
-"`%.250s' fitxategia hondatuta dago - okerreko digitua (%d kodea) %s(e)n"
+msgstr "`%.250s' fitxategia hondatuta dago - okerreko digitua (%d kodea) %s(e)n"
 
 #: dpkg-deb/extract.c:97
 msgid "failed getting the current file position"
@@ -4255,8 +4222,7 @@ msgstr "dpkg-deb: `%.255s': ez dauka `%.255s' kontrol-osagairik\n"
 #: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
-msgstr ""
-"huts egin du `%.255s' osagaia irekitzean (%.255s), espero ez zen moduan"
+msgstr "huts egin du `%.255s' osagaia irekitzean (%.255s), espero ez zen moduan"
 
 #: dpkg-deb/info.c:120
 msgid "One requested control component is missing"
@@ -4443,8 +4409,7 @@ msgstr "ezin da joan atzera"
 #: dpkg-split/info.c:105
 #, c-format
 msgid "file `%.250s' is corrupt - bad padding character (code %d)"
-msgstr ""
-"`%.250s' fitxategia hondatuta dago - okerreko karaktere betegarria (%d kodea)"
+msgstr "`%.250s' fitxategia hondatuta dago - okerreko karaktere betegarria (%d kodea)"
 
 #: dpkg-split/info.c:109
 #, c-format
@@ -4461,8 +4426,7 @@ msgstr ""
 #: dpkg-split/info.c:124
 #, c-format
 msgid "file `%.250s' is corrupt - bad MD5 checksum `%.250s'"
-msgstr ""
-"`%.250s' fitxategia hondatuta dago - okerreko MD5 kontrol batura: `%.250s'"
+msgstr "`%.250s' fitxategia hondatuta dago - okerreko MD5 kontrol batura: `%.250s'"
 
 #: dpkg-split/info.c:131
 #, c-format
@@ -5447,8 +5411,7 @@ msgstr "%s: huts %s %s-ra mugitzerakoan, uzten: %s"
 #: scripts/install-info.pl:288
 #, perl-format
 msgid "%s: no backup file %s available, retrieving default file."
-msgstr ""
-"%s: %s babeskopia fitxategia ez dago, lehenetsiriko fitxategia erabiltzen."
+msgstr "%s: %s babeskopia fitxategia ez dago, lehenetsiriko fitxategia erabiltzen."
 
 #: scripts/install-info.pl:297
 #, perl-format
@@ -5915,8 +5878,7 @@ msgstr ""
 
 #: scripts/update-alternatives.pl:650
 msgid "Press enter to keep the default[*], or type selection number: "
-msgstr ""
-"Enter sakatu lehenespena mantentzeko[*], edo hautatze zenbakia sakatu: "
+msgstr "Enter sakatu lehenespena mantentzeko[*], edo hautatze zenbakia sakatu: "
 
 #: scripts/update-alternatives.pl:682
 #, perl-format
@@ -5957,3 +5919,4 @@ msgstr "Ezin da %s %s bezala instalatu: %s"
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Arazo larria: %s"
+

po/gl.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2008-08-17 18:05+0300\n"
-"PO-Revision-Date: 2008-05-28 20:45+0100\n"
+"PO-Revision-Date: 2008-08-29 21:17+0100\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
@@ -2813,7 +2813,7 @@ msgstr "número enteiro non válido para --%s: \"%.250s\""
 
 #: src/main.c:302
 msgid "<package status and progress file descriptor>"
-msgstr ""
+msgstr "<descriptor do ficheiro de estado e progreso dos paquetes>"
 
 #: src/main.c:322
 #, c-format

po/nb.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2008-08-17 18:05+0300\n"
-"PO-Revision-Date: 2008-05-11 08:17+0200\n"
+"PO-Revision-Date: 2008-08-31 20:55+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
 "MIME-Version: 1.0\n"
@@ -2739,10 +2739,10 @@ msgstr "ugyldig heltall for --%s: «%.250s»"
 
 #: src/main.c:302
 msgid "<package status and progress file descriptor>"
-msgstr ""
+msgstr "<pakkestatus og fremdriftsfilindikator>"
 
 #: src/main.c:322
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -2805,6 +2805,7 @@ msgstr ""
 "                         standardinnstilling, blir du spurt med mindre du\n"
 "                         i tillegg har valgt «confold» eller «confnew».\n"
 "  confmiss [!]           Installer alltid oppsettsfiler som mangler\n"
+"  breaks [!]             Installer selvi om det vil ødelegge en annen pakke\n"
 "  conflicts [!]          Tillat installasjon av pakker som er i konflikt\n"
 "  architecture [!]       Håndter også pakker med feil arkitektur\n"
 "  overwrite-dir [!]      Skriv over kataloger fra en pakke med filer fra en "

po/pt_BR.po

@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2008-08-17 18:05+0300\n"
-"PO-Revision-Date: 2008-06-09 02:48-0300\n"
+"PO-Revision-Date: 2008-08-26 03:21-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -2791,7 +2791,7 @@ msgstr "inteiro inválido para --%s: '%.250s'"
 
 #: src/main.c:302
 msgid "<package status and progress file descriptor>"
-msgstr ""
+msgstr "<estado do pacote e progresso do descritor de arquivo>"
 
 #: src/main.c:322
 #, c-format

po/sv.po

@@ -1,15 +1,15 @@
 # Swedish translation of dpkg
 # Copyright © 1999-2008 Software in the Public Interest
-# Peter Karlsson <peterk@debian.org>, 1999-2008.
-# Daniel Nylander <po@danielnylander.se>, 2006.
+# Peter Krefting <peterk@debian.org>, 1999-2008.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.15\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2008-08-17 18:05+0300\n"
-"PO-Revision-Date: 2008-05-13 09:26+0100\n"
-"Last-Translator: Peter Karlsson <peterk@debian.org>\n"
+"PO-Revision-Date: 2008-08-29 11:50+0100\n"
+"Last-Translator: Daniel Krefting <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -1871,12 +1871,12 @@ msgstr "kunde inte kontrollera om \"%.250s\" existerar"
 #: src/depcon.c:156
 #, c-format
 msgid "%s depends on %s"
-msgstr "%s beror på %s"
+msgstr "%s är beroende av %s"
 
 #: src/depcon.c:159
 #, c-format
 msgid "%s pre-depends on %s"
-msgstr "%s beror i förväg på %s"
+msgstr "%s är i förväg beroende av %s"
 
 #: src/depcon.c:162
 #, c-format
@@ -1993,9 +1993,9 @@ msgid ""
 "installation.  They must be reinstalled for them (and any packages\n"
 "that depend on them) to function properly:\n"
 msgstr ""
-"Följande paket är i oordning på grund av grava problem när de\n"
-"installerades. De måste ominstalleras om de (och paket som beror på\n"
-"dem) ska fungera korrekt:\n"
+"Följande paket är i oordning på grund av allvarliga problem när de\n"
+"installerades. De måste ominstalleras om de (och paket som är\n"
+"beroende av dem) ska fungera korrekt:\n"
 
 #: src/enquiry.c:86
 msgid ""
@@ -2732,7 +2732,7 @@ msgstr "ogiltigt heltal för --%s: \"%.250s\""
 
 #: src/main.c:302
 msgid "<package status and progress file descriptor>"
-msgstr ""
+msgstr "<filhandtag för paketstatus och förlopp>"
 
 #: src/main.c:322
 #, c-format
@@ -2962,7 +2962,7 @@ msgstr "  Versionen av %s som skall konfigureras är %s.\n"
 
 #: src/packages.c:585
 msgid " depends on "
-msgstr " beror på "
+msgstr " är beroende av "
 
 #: src/packages.c:591
 msgid "; however:\n"

scripts/Dpkg/Source/Package/V2.pm

@@ -337,7 +337,7 @@ sub do_build {
     $diff->add_diff_directory($tmp, $dir, basedirname => $basedirname,
             %{$self->{'diff_options'}}, handle_binary_func => $handle_binary);
     error(_g("unrepresentable changes to source")) if not $diff->finish();
-    # The previous auto-patch must be removed, it has not been used and it
+    # The previous auto-patch must be removed, it has not been used and it
     # will be recreated if it's still needed
     my $autopatch = File::Spec->catfile($dir, "debian", "patches",
                                         $self->get_autopatch_name());
@@ -356,6 +356,8 @@ sub do_build {
         }
         rename($tmpdiff, $autopatch) ||
                 syserr(_g("cannot rename %s to %s"), $tmpdiff, $autopatch);
+        chmod(0666 & ~ umask(), $autopatch) ||
+                syserr(_g("unable to change permission of `%s'"), $autopatch);
     }
     $self->register_autopatch($dir);
     pop @Dpkg::Exit::handlers;

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

@@ -106,6 +106,8 @@ sub run_quilt {
         $absdir = File::Spec->rel2abs($dir);
     }
     my $series = $self->get_series_file($dir);
+    # Use default name if no series files exist yet
+    $series = "$absdir/debian/patches/series" unless defined $series;
     unless (File::Spec->file_name_is_absolute($series)) {
         $series = File::Spec->rel2abs($series);
     }

scripts/dpkg-gensymbols.pl

@@ -12,6 +12,7 @@ use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(warning error syserr usageerr);
 use Dpkg::Control;
 use Dpkg::Changelog qw(parse_changelog);
+use Dpkg::Path qw(check_files_are_the_same);
 
 textdomain("dpkg-dev");
 
@@ -137,12 +138,18 @@ foreach my $file ($input, $output, "debian/$oppackage.symbols.$host_arch",
 
 # Scan package build dir looking for libraries
 if (not scalar @files) {
-    foreach my $path (@librarypaths) {
+    PATH: foreach my $path (@librarypaths) {
 	my $libdir = "$packagebuilddir$path";
 	$libdir =~ s{/+}{/}g;
 	lstat $libdir;
 	next if not -d _;
 	next if -l _; # Skip directories which are symlinks
+        # Skip any directory _below_ a symlink as well
+        my $updir = $libdir;
+        while (($updir =~ s{/[^/]*$}{}) and
+               not check_files_are_the_same($packagebuilddir, $updir)) {
+            next PATH if -l $updir;
+        }
 	opendir(DIR, "$libdir") ||
 	    syserr(_g("Can't read directory %s: %s"), $libdir, $!);
 	push @files, grep {

scripts/po/ChangeLog

@@ -1,3 +1,7 @@
+2008-08-29  Peter Krefting  <peterk@debian.org>
+
+	* sv.po: Updated to 473t.
+
 2008-08-18  Helge Kreutzmann  <debian@helgefjell.de>
 
 	* de.po: Updated to 473t.

scripts/po/sv.po

@@ -1,19 +1,19 @@
 # Copyright (C) 2007-2008 Software in the Public Interest, Inc.
 # This file is distributed under the same license as the dpkg package.
-# Peter Karlsson <peterk@debian.org>, 2007-2008.
+# Peter Krefting <peterk@debian.org>, 2007-2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.15\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\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"
+"PO-Revision-Date: 2008-08-29 17:49+0100\n"
+"Last-Translator: Peter Krefting <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"Plural-Forms: nplurals=2; plural=n!=1;"
 
 #: scripts/822-date.pl:12
 msgid "Usage: 822-date"
@@ -155,7 +155,7 @@ msgstr ""
 "Copyright © 2007 Frank Lichtenheld."
 
 #: scripts/dpkg-buildpackage.pl:36
-#, fuzzy, perl-format
+#, perl-format
 msgid ""
 "\n"
 "Usage: %s [<options> ...]\n"
@@ -234,7 +234,7 @@ msgstr ""
 "  -e<ansvarig>   ansvarig för utgivningen är <maint>.  } sänds bara\n"
 "  -C<ändrfil>    ändringar beskrivs i <ändrfil>.       } till dpkg-"
 "genchanges\n"
-"  -si (standard) källk. innehåller orig. för rev. 0/1. }\n"
+"  -si (standard) källk. innehåller orig. för ny uppstr.}\n"
 "  -sa            insänd källkod innehåller alltid orig.}\n"
 "  -sd            insänd källkod är endast diff och .dsc}\n"
 "  -sn            tvinga Debianeget källkodsformat.       }\n"