Merge branch 'master' of git://git.debian.org/git/dpkg/dpkg into sourcev3

ChangeLog

@@ -1,3 +1,31 @@
+2007-11-21  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Shlibs/Objdump.pm: Fix the checks in is_executable() and
+	is_public_library().
+	* scripts/t/200_Dpkg_Shlibs.t: Add some more tests to make sure
+	the above functions behave as expected.
+	* scripts/t/400_Dpkg_Deps.t: Add some more tests to make sure that
+	empty dependency fields are correctly handled.
+	* scripts/Makefile.am: Include the new data files required by the
+	tests above.
+	* scrips/Dpkg/Fields.pm: New module containing 3 functions moved
+	out of controllib.pl (capit(), set_field_importance(),
+	sort_by_field_importance()).
+	* scripts/controllib.pl: Removed the 3 functions above.
+	* scripts/dpkg-shlibdeps.pl: Use Dpkg::Fields for capit().
+	* scripts/dpkg-genchanges.pl: Use Dpkg::Fields for capit() and
+	set_field_importance().
+	* scripts/dpkg-gencontrol.pl: Likewise.
+	* scripts/dpkg-source.pl: Likewise.
+
+2007-11-20  Guillem Jover  <guillem@debian.org>
+
+	* configure.ac: Bump version to 1.14.10~.
+
+2007-11-20  Guillem Jover  <guillem@debian.org>
+
+	* configure.ac: Release 1.14.9.
+
 2007-11-19  Raphael Hertzog  <hertzog@debian.org>
 
 	* scripts/Dpkg/Path.pm: Fix behaviour of get_pkg_root_dir() when

configure.ac

@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.14.9~], [debian-dpkg@lists.debian.org])
+AC_INIT([dpkg], [1.14.10~], [debian-dpkg@lists.debian.org])
 AC_CONFIG_SRCDIR([lib/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])

debian/changelog

@@ -1,4 +1,20 @@
-dpkg (1.14.9) UNRELEASED; urgency=low
+dpkg (1.14.10) UNRELEASED; urgency=low
+
+  [ Raphael Hertzog ]
+  * dpkg-shlibdeps now correctly identify private libraries (avoid many
+    warnings with perl/python modules).
+  * Move capit() to a Dpkg::Fields module and use it in dpkg-shlibdeps.
+    Closes: #452262
+
+  [ Updated man pages translations ]
+  * Swedish (Peter Karlsson)
+
+  [ Added scripts translations ]
+  * Swedish (Peter Karlsson)
+
+ -- Guillem Jover <guillem@debian.org>  Tue, 20 Nov 2007 07:27:44 +0200
+
+dpkg (1.14.9) unstable; urgency=low
 
   [ Raphael Hertzog ]
   * Fix bad behaviour of Dpkg::Path::get_pkg_root_dir() and adjust
@@ -6,9 +22,9 @@ dpkg (1.14.9) UNRELEASED; urgency=low
   * Fix Dpkg::Deps to accept empty fields. Closes: #452013
 
   [ Updated man pages translations ]
-    * German (Helge Kreutzmann).
+  * German (Helge Kreutzmann).
 
- -- Guillem Jover <guillem@debian.org>  Mon, 19 Nov 2007 10:59:18 +0200
+ -- Guillem Jover <guillem@debian.org>  Tue, 20 Nov 2007 07:15:41 +0200
 
 dpkg (1.14.8) unstable; urgency=low
 

debian/dpkg-dev.install

@@ -65,6 +65,7 @@ usr/share/perl5/Dpkg/BuildOptions.pm
 usr/share/perl5/Dpkg/Source
 usr/share/perl5/Dpkg/ErrorHandling.pm
 usr/share/perl5/Dpkg/Deps.pm
+usr/share/perl5/Dpkg/Fields.pm
 usr/share/perl5/Dpkg/Path.pm
 usr/share/perl5/Dpkg/Shlibs
 usr/share/perl5/Dpkg/Shlibs.pm

man/ChangeLog

@@ -1,3 +1,7 @@
+2007-11-02  Peter Karlsson  <peterk@debian.org>
+
+	* po/sv.po: Updated to 1344t.
+
 2007-11-19  Helge Kreutzmann  <debian@helgefjell.de>
 
         * po/de.po: Updated to 1303t0f41u.
@@ -37,7 +41,7 @@
 
 	* po/de.po: Updated to 1300t0f45u.
 
-2007-11-02  Peter Karlsson  <peter@softwolves.pp.>
+2007-11-02  Peter Karlsson  <peterk@debian.org>
 
 	* po/dpkg-man.pot: Regenerated.
 	* po/*.po: Merged with dpkg-man.pot.
@@ -137,7 +141,7 @@
 	* dpkg-source.1: Remove superfluous [options] from
 	-b command description.
 
-2007-09-28  Peter Karlsson  <peter@softwolves.pp.se>
+2007-09-28  Peter Karlsson  <peterk@debian.org>
 
 	* po/sv.po: Updated to 1290t.
 

man/po/sv.po

@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: dpkg man pages\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-11-19 10:18+0200\n"
-"PO-Revision-Date: 2007-11-02 14:10+0100\n"
+"PO-Revision-Date: 2007-11-20 14:20+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -4102,16 +4102,13 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-architecture.1:251
-#, fuzzy
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
-msgstr ""
-"CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
+msgstr "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 
 # type: Plain text
 #: ../../man/dpkg-architecture.1:253
-#, fuzzy
 msgid "eval \\`dpkg-architecture -u\\`"
-msgstr "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+msgstr "eval \\`dpkg-architecture -u\\`"
 
 # type: Plain text
 #: ../../man/dpkg-architecture.1:256
@@ -6606,9 +6603,9 @@ msgstr "dpkg-scanpackages"
 
 # type: TH
 #: ../../man/dpkg-scanpackages.1:16
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "2007-11-19"
-msgstr "2007-01-24"
+msgstr "2007-11-19"
 
 # type: Plain text
 #: ../../man/dpkg-scanpackages.1:19
@@ -6699,15 +6696,14 @@ msgstr ""
 
 # type: TP
 #: ../../man/dpkg-scanpackages.1:73
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<-t>, B<--type> I<type>"
-msgstr "B<-t>, B<--test>"
+msgstr "B<-t>, B<--test> I<typ>"
 
 # type: Plain text
 #: ../../man/dpkg-scanpackages.1:76
-#, fuzzy
 msgid "Scan for *.I<type> packages, instead of *.deb."
-msgstr "Sök efter I<*.udeb>, i stället för I<*.deb>."
+msgstr "Sök efter *.I<typ>-paket, i stället för *.deb."
 
 # type: TP
 #: ../../man/dpkg-scanpackages.1:76
@@ -6718,7 +6714,7 @@ msgstr "B<-u>, B<--udeb>"
 # type: Plain text
 #: ../../man/dpkg-scanpackages.1:79
 msgid "B<Obsolete> alias for B<-tudeb>."
-msgstr ""
+msgstr "B<Föråldrat> alias till B<-tudeb>."
 
 # type: TP
 #: ../../man/dpkg-scanpackages.1:79

po/ChangeLog

@@ -953,7 +953,7 @@
 
 	* pt.po: Updated to 974t24f2u.
 
-2005-12-22  Peter Karlsson  <peter@softwolves.pp.se>
+2005-12-22  Peter Karlsson  <peterk@debian.org>
 
 	* sv.po: Updated to 1000t.
 

scripts/Dpkg/Fields.pm

@@ -0,0 +1,40 @@
+package Dpkg::Fields;
+
+use strict;
+use warnings;
+
+use Exporter;
+our @ISA = qw(Exporter);
+our @EXPORT_OK = qw(capit set_field_importance sort_field_by_importance);
+
+sub capit {
+    my @pieces = map { ucfirst(lc) } split /-/, $_[0];
+    return join '-', @pieces;
+}
+
+our %fieldimps;
+
+sub set_field_importance(@)
+{
+    my @fields = @_;
+    my $i = 1;
+
+    grep($fieldimps{$_} = $i++, @fields);
+}
+
+sub sort_field_by_importance($$)
+{
+    my ($a, $b) = @_;
+
+    if (defined $fieldimps{$a} && defined $fieldimps{$b}) {
+	$fieldimps{$a} <=> $fieldimps{$b};
+    } elsif (defined($fieldimps{$a})) {
+	-1;
+    } elsif (defined($fieldimps{$b})) {
+	1;
+    } else {
+	$a cmp $b;
+    }
+}
+
+1;

scripts/Dpkg/Shlibs/Objdump.pm

@@ -122,9 +122,13 @@ sub reset {
     $self->{file} = '';
     $self->{id} = '';
     $self->{SONAME} = '';
+    $self->{HASH} = '';
+    $self->{GNU_HASH} = '';
+    $self->{SONAME} = '';
     $self->{NEEDED} = [];
     $self->{RPATH} = [];
     $self->{dynsyms} = {};
+    $self->{flags} = {};
 
     return $self;
 }
@@ -326,13 +330,13 @@ sub get_needed_libraries {
 
 sub is_executable {
     my $self = shift;
-    return exists $self->{flags}{EXEC_P} and $self->{flags}{EXEC_P};
+    return exists $self->{flags}{EXEC_P} && $self->{flags}{EXEC_P};
 }
 
 sub is_public_library {
     my $self = shift;
-    return exists $self->{flags}{DYNAMIC} and $self->{flags}{DYNAMIC}
-	and exists $self->{SONAME} and $self->{SONAME};
+    return exists $self->{flags}{DYNAMIC} && $self->{flags}{DYNAMIC}
+	&& exists $self->{SONAME} && $self->{SONAME};
 }
 
 1;

scripts/Makefile.am

@@ -64,7 +64,9 @@ EXTRA_DIST = \
 	t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf \
 	t/200_Dpkg_Shlibs/objdump.glib-ia64 \
 	t/200_Dpkg_Shlibs/objdump.libc6-2.3 \
-	t/200_Dpkg_Shlibs/objdump.libc6-2.6
+	t/200_Dpkg_Shlibs/objdump.libc6-2.6 \
+	t/200_Dpkg_Shlibs/objdump.dbd-pg \
+	t/200_Dpkg_Shlibs/objdump.ls
 
 CLEANFILES = \
 	$(bin_SCRIPTS) $(sbin_SCRIPTS) $(changelog_SCRIPTS) \
@@ -76,6 +78,7 @@ nobase_dist_perllib_DATA = \
 	Dpkg/BuildOptions.pm \
 	Dpkg/ErrorHandling.pm \
 	Dpkg/Deps.pm \
+	Dpkg/Fields.pm \
 	Dpkg/Gettext.pm \
 	Dpkg/Path.pm \
 	Dpkg/Shlibs.pm \

scripts/changelog/debian.pl

@@ -6,6 +6,7 @@ use warnings;
 use Dpkg;
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(error internerr usageerr);
+use Dpkg::Fields qw(set_field_importance);
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';

scripts/controllib.pl

@@ -9,6 +9,7 @@ use Dpkg;
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(warning error failure internerr syserr subprocerr);
 use Dpkg::Arch qw(get_host_arch debarch_is);
+use Dpkg::Fields qw(capit sort_field_by_importance);
 
 textdomain("dpkg-dev");
 
@@ -74,11 +75,6 @@ sub getfowner
     return @fowner;
 }
 
-sub capit {
-    my @pieces = map { ucfirst(lc) } split /-/, $_[0];
-    return join '-', @pieces;
-}
-
 sub substvars {
     my ($v) = @_;
     my $lhs;
@@ -105,31 +101,6 @@ sub substvars {
     return $v;
 }
 
-my %fieldimps;
-
-sub set_field_importance(@)
-{
-    my @fields = @_;
-    my $i = 1;
-
-    grep($fieldimps{$_} = $i++, @fields);
-}
-
-sub sort_field_by_importance($$)
-{
-    my ($a, $b) = @_;
-
-    if (defined $fieldimps{$a} && defined $fieldimps{$b}) {
-	$fieldimps{$a} <=> $fieldimps{$b};
-    } elsif (defined($fieldimps{$a})) {
-	-1;
-    } elsif (defined($fieldimps{$b})) {
-	1;
-    } else {
-	$a cmp $b;
-    }
-}
-
 sub outputclose {
     my ($varlistfile) = @_;
 

scripts/dpkg-genchanges.pl

@@ -10,6 +10,7 @@ use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(warning error failure unknown internerr syserr
                            subprocerr usageerr);
 use Dpkg::Arch qw(get_host_arch debarch_eq debarch_is);
+use Dpkg::Fields qw(capit set_field_importance sort_field_by_importance);
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';

scripts/dpkg-gencontrol.pl

@@ -11,6 +11,7 @@ use Dpkg::ErrorHandling qw(warning error failure unknown internerr syserr
                            subprocerr usageerr);
 use Dpkg::Arch qw(get_host_arch debarch_eq debarch_is);
 use Dpkg::Deps qw(@pkg_dep_fields %dep_field_type);
+use Dpkg::Fields qw(capit set_field_importance);
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';

scripts/dpkg-shlibdeps.pl

@@ -14,6 +14,7 @@ use Dpkg::Shlibs qw(find_library);
 use Dpkg::Shlibs::Objdump;
 use Dpkg::Shlibs::SymbolFile;
 use Dpkg::Arch qw(get_host_arch);
+use Dpkg::Fields qw(capit);
 
 our $host_arch= get_host_arch();
 

scripts/dpkg-source.pl

@@ -10,6 +10,7 @@ use Dpkg::ErrorHandling qw(warning warnerror error failure unknown
                            $warnable_error $quiet_warnings);
 use Dpkg::Arch qw(debarch_eq);
 use Dpkg::Deps qw(@src_dep_fields %dep_field_type);
+use Dpkg::Fields qw(capit set_field_importance);
 
 my @filesinarchive;
 my %dirincluded;

scripts/po/ChangeLog

@@ -1,3 +1,12 @@
+2007-11-20  Peter Karlsson  <peterk@debian.org>
+
+	* sv.po: Updated to 480t.
+
+2007-11-20  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-dev.pot: Regenerated.
+	* *.po: Merged with dpkg-dev.pot.
+
 2007-11-19  Guillem Jover  <guillem@debian.org>
 
 	* dpkg-dev.pot: Regenerated.

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: 2007-11-19 08:48+0200\n"
+"POT-Creation-Date: 2007-11-20 06:56+0200\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"
@@ -473,8 +473,8 @@ msgstr "%s: Dependències de construcció no satisfetes: "
 msgid "%s: Build conflicts: "
 msgstr "%s: Conflictes de construcció: "
 
-#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:257
-#: scripts/dpkg-gencontrol.pl:264 scripts/dpkg-source.pl:323
+#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:258
+#: scripts/dpkg-gencontrol.pl:265 scripts/dpkg-source.pl:323
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "s'ha produït un error en analitzar %s"
@@ -506,27 +506,27 @@ msgstr ""
 msgid "filename, section and priority may contain no whitespace"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:335
+#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:336
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:338
+#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:339
 msgid "chown new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:349
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:352
+#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:353
 msgid "read old files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:361
+#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:362
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:362
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:363
 msgid "close new files list file"
 msgstr ""
 
@@ -728,8 +728,8 @@ msgstr ""
 msgid "missing information for critical output field %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:280
-#: scripts/dpkg-gencontrol.pl:283 scripts/dpkg-source.pl:404
+#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:281
+#: scripts/dpkg-gencontrol.pl:284 scripts/dpkg-source.pl:404
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "manca informació per al camp d'eixida %s"
@@ -794,48 +794,48 @@ msgid ""
 "list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:291
+#: scripts/dpkg-gencontrol.pl:292
 #, perl-format
 msgid "%s package with udeb specific field %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:304
+#: scripts/dpkg-gencontrol.pl:305
 msgid "fork for du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:307
+#: scripts/dpkg-gencontrol.pl:308
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:308
+#: scripts/dpkg-gencontrol.pl:309
 msgid "exec du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:315
+#: scripts/dpkg-gencontrol.pl:316
 #, perl-format
 msgid "du in `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:317
+#: scripts/dpkg-gencontrol.pl:318
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:350
+#: scripts/dpkg-gencontrol.pl:351
 msgid "close old files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:363
+#: scripts/dpkg-gencontrol.pl:364
 msgid "install new files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:370
+#: scripts/dpkg-gencontrol.pl:371
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr ""
@@ -1367,23 +1367,31 @@ msgstr ""
 msgid "cannot open file %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/dpkg-shlibdeps.pl:458
+#: scripts/dpkg-shlibdeps.pl:440
+#, perl-format
+msgid ""
+"$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
+"identified due to lack of DEBIAN sub-directory in the root of package's "
+"build tree"
+msgstr ""
+
+#: scripts/dpkg-shlibdeps.pl:470
 msgid "cannot fork for dpkg --search"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:465
+#: scripts/dpkg-shlibdeps.pl:477
 msgid "cannot exec dpkg"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:470
+#: scripts/dpkg-shlibdeps.pl:482
 msgid "diversions involved - output may be incorrect"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:472
+#: scripts/dpkg-shlibdeps.pl:484
 msgid "write diversion info to stderr"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:476
+#: scripts/dpkg-shlibdeps.pl:488
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr ""

scripts/po/de.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg scripts\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-11-19 08:48+0200\n"
+"POT-Creation-Date: 2007-11-20 06:56+0200\n"
 "PO-Revision-Date: 2007-11-11 12:56+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -561,8 +561,8 @@ msgstr "%s: Nicht erf
 msgid "%s: Build conflicts: "
 msgstr "%s: Baukonflikte: "
 
-#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:257
-#: scripts/dpkg-gencontrol.pl:264 scripts/dpkg-source.pl:323
+#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:258
+#: scripts/dpkg-gencontrol.pl:265 scripts/dpkg-source.pl:323
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "Fehler beim Parsen von %s"
@@ -600,27 +600,27 @@ msgstr "ben
 msgid "filename, section and priority may contain no whitespace"
 msgstr "Dateiname, Bereich und Priorität dürfen keine Leerzeichen enthalten"
 
-#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:335
+#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:336
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:338
+#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:339
 msgid "chown new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:349
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:352
+#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:353
 msgid "read old files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:361
+#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:362
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:362
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:363
 msgid "close new files list file"
 msgstr ""
 
@@ -822,8 +822,8 @@ msgstr "md5sum der Quelldatei %s (%s) unterscheidet sich von md5sum in %s (%s)"
 msgid "missing information for critical output field %s"
 msgstr "fehlende Informationen für kritisches Ausgabefeld %s"
 
-#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:280
-#: scripts/dpkg-gencontrol.pl:283 scripts/dpkg-source.pl:404
+#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:281
+#: scripts/dpkg-gencontrol.pl:284 scripts/dpkg-source.pl:404
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "fehlende Informationen für Ausgabefeld %s"
@@ -891,48 +891,48 @@ msgid ""
 "list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:291
+#: scripts/dpkg-gencontrol.pl:292
 #, perl-format
 msgid "%s package with udeb specific field %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:304
+#: scripts/dpkg-gencontrol.pl:305
 msgid "fork for du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:307
+#: scripts/dpkg-gencontrol.pl:308
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:308
+#: scripts/dpkg-gencontrol.pl:309
 msgid "exec du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:315
+#: scripts/dpkg-gencontrol.pl:316
 #, perl-format
 msgid "du in `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:317
+#: scripts/dpkg-gencontrol.pl:318
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:350
+#: scripts/dpkg-gencontrol.pl:351
 msgid "close old files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:363
+#: scripts/dpkg-gencontrol.pl:364
 msgid "install new files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:370
+#: scripts/dpkg-gencontrol.pl:371
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "kann neue Ausgabe-Steuerdatei »%s« nicht öffnen"
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "kann Ausgabe-Steurdatei »%s« nicht installieren"
@@ -1499,23 +1499,31 @@ msgstr ""
 msgid "cannot open file %s"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: scripts/dpkg-shlibdeps.pl:458
+#: scripts/dpkg-shlibdeps.pl:440
+#, perl-format
+msgid ""
+"$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
+"identified due to lack of DEBIAN sub-directory in the root of package's "
+"build tree"
+msgstr ""
+
+#: scripts/dpkg-shlibdeps.pl:470
 msgid "cannot fork for dpkg --search"
 msgstr "kann Fork für »dpkg --search« nicht durchführen"
 
-#: scripts/dpkg-shlibdeps.pl:465
+#: scripts/dpkg-shlibdeps.pl:477
 msgid "cannot exec dpkg"
 msgstr "kann dpkg nicht ausführen"
 
-#: scripts/dpkg-shlibdeps.pl:470
+#: scripts/dpkg-shlibdeps.pl:482
 msgid "diversions involved - output may be incorrect"
 msgstr "Umlenkungen beteiligt - Ausgabe könnte nicht korrekt sein"
 
-#: scripts/dpkg-shlibdeps.pl:472
+#: scripts/dpkg-shlibdeps.pl:484
 msgid "write diversion info to stderr"
 msgstr "schreibe Informationen zu Umlenkungen auf Stderr"
 
-#: scripts/dpkg-shlibdeps.pl:476
+#: scripts/dpkg-shlibdeps.pl:488
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "unbekannte Ausgabe von »dpkg --search«: »%s«"

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: 2007-11-19 08:48+0200\n"
+"POT-Creation-Date: 2007-11-20 06:56+0200\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"
@@ -462,8 +462,8 @@ msgstr ""
 msgid "%s: Build conflicts: "
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:257
-#: scripts/dpkg-gencontrol.pl:264 scripts/dpkg-source.pl:323
+#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:258
+#: scripts/dpkg-gencontrol.pl:265 scripts/dpkg-source.pl:323
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr ""
@@ -493,27 +493,27 @@ msgstr ""
 msgid "filename, section and priority may contain no whitespace"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:335
+#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:336
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:338
+#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:339
 msgid "chown new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:349
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:352
+#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:353
 msgid "read old files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:361
+#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:362
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:362
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:363
 msgid "close new files list file"
 msgstr ""
 
@@ -712,8 +712,8 @@ msgstr ""
 msgid "missing information for critical output field %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:280
-#: scripts/dpkg-gencontrol.pl:283 scripts/dpkg-source.pl:404
+#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:281
+#: scripts/dpkg-gencontrol.pl:284 scripts/dpkg-source.pl:404
 #, perl-format
 msgid "missing information for output field %s"
 msgstr ""
@@ -778,48 +778,48 @@ msgid ""
 "list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:291
+#: scripts/dpkg-gencontrol.pl:292
 #, perl-format
 msgid "%s package with udeb specific field %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:304
+#: scripts/dpkg-gencontrol.pl:305
 msgid "fork for du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:307
+#: scripts/dpkg-gencontrol.pl:308
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:308
+#: scripts/dpkg-gencontrol.pl:309
 msgid "exec du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:315
+#: scripts/dpkg-gencontrol.pl:316
 #, perl-format
 msgid "du in `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:317
+#: scripts/dpkg-gencontrol.pl:318
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:350
+#: scripts/dpkg-gencontrol.pl:351
 msgid "close old files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:363
+#: scripts/dpkg-gencontrol.pl:364
 msgid "install new files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:370
+#: scripts/dpkg-gencontrol.pl:371
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr ""
@@ -1347,23 +1347,31 @@ msgstr ""
 msgid "cannot open file %s"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:458
+#: scripts/dpkg-shlibdeps.pl:440
+#, perl-format
+msgid ""
+"$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
+"identified due to lack of DEBIAN sub-directory in the root of package's "
+"build tree"
+msgstr ""
+
+#: scripts/dpkg-shlibdeps.pl:470
 msgid "cannot fork for dpkg --search"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:465
+#: scripts/dpkg-shlibdeps.pl:477
 msgid "cannot exec dpkg"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:470
+#: scripts/dpkg-shlibdeps.pl:482
 msgid "diversions involved - output may be incorrect"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:472
+#: scripts/dpkg-shlibdeps.pl:484
 msgid "write diversion info to stderr"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:476
+#: scripts/dpkg-shlibdeps.pl:488
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr ""

scripts/po/fr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg scripts\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-11-19 08:48+0200\n"
+"POT-Creation-Date: 2007-11-20 06:56+0200\n"
 "PO-Revision-Date: 2007-07-08 12:27+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -529,8 +529,8 @@ msgstr "%s
 msgid "%s: Build conflicts: "
 msgstr "%s : conflits de construction du paquet : "
 
-#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:257
-#: scripts/dpkg-gencontrol.pl:264 scripts/dpkg-source.pl:323
+#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:258
+#: scripts/dpkg-gencontrol.pl:265 scripts/dpkg-source.pl:323
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "erreur rencontrée lors de l'analyse de %s"
@@ -569,27 +569,27 @@ msgstr "Il est demand
 msgid "filename, section and priority may contain no whitespace"
 msgstr "fichier, section et priorité ne peuvent contenir d'espace"
 
-#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:335
+#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:336
 msgid "open new files list file"
 msgstr "ouverture du nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:338
+#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:339
 msgid "chown new files list file"
 msgstr "modification du propriétaire du nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:349
 msgid "copy old entry to new files list file"
 msgstr "copie de l'ancienne entrée dans le nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:352
+#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:353
 msgid "read old files list file"
 msgstr "lecture du nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:361
+#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:362
 msgid "write new entry to new files list file"
 msgstr "écriture de la nouvelle entrée dans le nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:362
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:363
 msgid "close new files list file"
 msgstr "fermeture du nouveau fichier des fichiers"
 
@@ -841,8 +841,8 @@ msgstr ""
 msgid "missing information for critical output field %s"
 msgstr "il manque l'information pour l'important champ de sortie %s"
 
-#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:280
-#: scripts/dpkg-gencontrol.pl:283 scripts/dpkg-source.pl:404
+#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:281
+#: scripts/dpkg-gencontrol.pl:284 scripts/dpkg-source.pl:404
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "il manque l'information pour le champ de sortie %s"
@@ -936,48 +936,48 @@ msgid ""
 "list (%s)"
 msgstr "l'actuelle architecture de construction %s n'apparaît pas dans %s"
 
-#: scripts/dpkg-gencontrol.pl:291
+#: scripts/dpkg-gencontrol.pl:292
 #, perl-format
 msgid "%s package with udeb specific field %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:304
+#: scripts/dpkg-gencontrol.pl:305
 msgid "fork for du"
 msgstr "fork pour du"
 
-#: scripts/dpkg-gencontrol.pl:307
+#: scripts/dpkg-gencontrol.pl:308
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr "chdir pour du vers %s"
 
-#: scripts/dpkg-gencontrol.pl:308
+#: scripts/dpkg-gencontrol.pl:309
 msgid "exec du"
 msgstr "exec du"
 
-#: scripts/dpkg-gencontrol.pl:315
+#: scripts/dpkg-gencontrol.pl:316
 #, perl-format
 msgid "du in `%s'"
 msgstr "du dans %s"
 
-#: scripts/dpkg-gencontrol.pl:317
+#: scripts/dpkg-gencontrol.pl:318
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "résultat inattendu de du %s"
 
-#: scripts/dpkg-gencontrol.pl:350
+#: scripts/dpkg-gencontrol.pl:351
 msgid "close old files list file"
 msgstr "fermeture de l'ancien fichier des fichiers"
 
-#: scripts/dpkg-gencontrol.pl:363
+#: scripts/dpkg-gencontrol.pl:364
 msgid "install new files list file"
 msgstr "installation du nouveau fichier des fichiers"
 
-#: scripts/dpkg-gencontrol.pl:370
+#: scripts/dpkg-gencontrol.pl:371
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "impossible d'ouvrir nouveau fichier de sortie %s"
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "impossible d'installer nouveau fichier de sortie %s"
@@ -1586,23 +1586,31 @@ msgstr ""
 msgid "cannot open file %s"
 msgstr "impossible d'ouvrir %s : %s"
 
-#: scripts/dpkg-shlibdeps.pl:458
+#: scripts/dpkg-shlibdeps.pl:440
+#, perl-format
+msgid ""
+"$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
+"identified due to lack of DEBIAN sub-directory in the root of package's "
+"build tree"
+msgstr ""
+
+#: scripts/dpkg-shlibdeps.pl:470
 msgid "cannot fork for dpkg --search"
 msgstr "fork impossible pour dpkg --search"
 
-#: scripts/dpkg-shlibdeps.pl:465
+#: scripts/dpkg-shlibdeps.pl:477
 msgid "cannot exec dpkg"
 msgstr "impossible d'exécuter dpkg"
 
-#: scripts/dpkg-shlibdeps.pl:470
+#: scripts/dpkg-shlibdeps.pl:482
 msgid "diversions involved - output may be incorrect"
 msgstr "détournements en jeu, la sortie peut être incorrecte"
 
-#: scripts/dpkg-shlibdeps.pl:472
+#: scripts/dpkg-shlibdeps.pl:484
 msgid "write diversion info to stderr"
 msgstr "info sur le détournement envoyée sur stderr"
 
-#: scripts/dpkg-shlibdeps.pl:476
+#: scripts/dpkg-shlibdeps.pl:488
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "résultat de dpkg --search inconnu : %s"

scripts/po/pl.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.17\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-11-19 08:48+0200\n"
+"POT-Creation-Date: 2007-11-20 06:56+0200\n"
 "PO-Revision-Date: 2007-11-15 20:15+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -550,8 +550,8 @@ msgstr "%s: Niespe
 msgid "%s: Build conflicts: "
 msgstr "%s: Konfliktu budowania pakietu:"
 
-#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:257
-#: scripts/dpkg-gencontrol.pl:264 scripts/dpkg-source.pl:323
+#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:258
+#: scripts/dpkg-gencontrol.pl:265 scripts/dpkg-source.pl:323
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "wyst±pi³ b³±d podczas przetwarzania %s"
@@ -590,27 +590,27 @@ msgstr "nale
 msgid "filename, section and priority may contain no whitespace"
 msgstr "nazwa pliku, sekcja i priorytet nie mog± zawieraæ bia³ych znaków"
 
-#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:335
+#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:336
 msgid "open new files list file"
 msgstr "otwieranie nowego pliku z list± plików"
 
-#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:338
+#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:339
 msgid "chown new files list file"
 msgstr "zmiana praw nowego pliku z list± plików"
 
-#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:349
 msgid "copy old entry to new files list file"
 msgstr "kopiowanie starego pliku do nowego pliku z list± plików"
 
-#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:352
+#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:353
 msgid "read old files list file"
 msgstr "czytanie starego pliku z list± plików"
 
-#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:361
+#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:362
 msgid "write new entry to new files list file"
 msgstr "zapisywanie nowego wpisu do nowego pliku z list± plików"
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:362
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:363
 msgid "close new files list file"
 msgstr "zamykanie nowego pliku z list± plików"
 
@@ -847,8 +847,8 @@ msgstr "suma m5d pliku
 msgid "missing information for critical output field %s"
 msgstr "brak informacji o krytycznym polu wyj¶ciowym %s"
 
-#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:280
-#: scripts/dpkg-gencontrol.pl:283 scripts/dpkg-source.pl:404
+#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:281
+#: scripts/dpkg-gencontrol.pl:284 scripts/dpkg-source.pl:404
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "brak informacji o polu wyj¶ciowym %s"
@@ -942,48 +942,48 @@ msgstr ""
 "bie¿±ca architektura go¶cia %s nie jest wymieniona w li¶cie architektur "
 "pakietu (%s)"
 
-#: scripts/dpkg-gencontrol.pl:291
+#: scripts/dpkg-gencontrol.pl:292
 #, perl-format
 msgid "%s package with udeb specific field %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:304
+#: scripts/dpkg-gencontrol.pl:305
 msgid "fork for du"
 msgstr "fork dla du"
 
-#: scripts/dpkg-gencontrol.pl:307
+#: scripts/dpkg-gencontrol.pl:308
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr "zmiana katalogu dla du na `%s'"
 
-#: scripts/dpkg-gencontrol.pl:308
+#: scripts/dpkg-gencontrol.pl:309
 msgid "exec du"
 msgstr "uruchamianie du"
 
-#: scripts/dpkg-gencontrol.pl:315
+#: scripts/dpkg-gencontrol.pl:316
 #, perl-format
 msgid "du in `%s'"
 msgstr "du na `%s'"
 
-#: scripts/dpkg-gencontrol.pl:317
+#: scripts/dpkg-gencontrol.pl:318
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "du wypisa³o dziwny komunikat  `%s'"
 
-#: scripts/dpkg-gencontrol.pl:350
+#: scripts/dpkg-gencontrol.pl:351
 msgid "close old files list file"
 msgstr "zamykanie starego pliku z list± plików"
 
-#: scripts/dpkg-gencontrol.pl:363
+#: scripts/dpkg-gencontrol.pl:364
 msgid "install new files list file"
 msgstr "instalowanie nowego pliku z list± plików"
 
-#: scripts/dpkg-gencontrol.pl:370
+#: scripts/dpkg-gencontrol.pl:371
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "nie mo¿na otworzyæ nowego pliku kontrolnego `%s'"
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "nie mo¿na zainstalowaæ wyj¶ciowego pliku kontrolnego `%s'"
@@ -1617,23 +1617,31 @@ msgstr "plik bibliotek wsp
 msgid "cannot open file %s"
 msgstr "nie mo¿na otworzyæ pliku %s"
 
-#: scripts/dpkg-shlibdeps.pl:458
+#: scripts/dpkg-shlibdeps.pl:440
+#, perl-format
+msgid ""
+"$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
+"identified due to lack of DEBIAN sub-directory in the root of package's "
+"build tree"
+msgstr ""
+
+#: scripts/dpkg-shlibdeps.pl:470
 msgid "cannot fork for dpkg --search"
 msgstr "b³±d fork dla dpkg --search"
 
-#: scripts/dpkg-shlibdeps.pl:465
+#: scripts/dpkg-shlibdeps.pl:477
 msgid "cannot exec dpkg"
 msgstr "uruchamianie dpkg  nie powiod³o siê"
 
-#: scripts/dpkg-shlibdeps.pl:470
+#: scripts/dpkg-shlibdeps.pl:482
 msgid "diversions involved - output may be incorrect"
 msgstr "nadpisania u¿yte - wyj¶cie mo¿e byæ niepoprawne"
 
-#: scripts/dpkg-shlibdeps.pl:472
+#: scripts/dpkg-shlibdeps.pl:484
 msgid "write diversion info to stderr"
 msgstr "wypisywanie informacji o ominiêciach na stderr"
 
-#: scripts/dpkg-shlibdeps.pl:476
+#: scripts/dpkg-shlibdeps.pl:488
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "nierozpoznane wyj¶cie z dpkg --search: '%s'"

scripts/po/sv.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-11-19 08:48+0200\n"
-"PO-Revision-Date: 2007-10-26 10:19+0100\n"
+"POT-Creation-Date: 2007-11-20 06:56+0200\n"
+"PO-Revision-Date: 2007-11-20 14:22+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -552,8 +552,8 @@ msgstr "%s: Ej uppfyllda byggberoenden: "
 msgid "%s: Build conflicts: "
 msgstr "%s: Byggkonflikter: "
 
-#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:257
-#: scripts/dpkg-gencontrol.pl:264 scripts/dpkg-source.pl:323
+#: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:258
+#: scripts/dpkg-gencontrol.pl:265 scripts/dpkg-source.pl:323
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "fel vid tolkning av %s"
@@ -591,27 +591,27 @@ msgstr "beh
 msgid "filename, section and priority may contain no whitespace"
 msgstr "filnamn, sektion och prioritet kan inte innehålla blanktecken"
 
-#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:335
+#: scripts/dpkg-distaddfile.pl:65 scripts/dpkg-gencontrol.pl:336
 msgid "open new files list file"
 msgstr "öppnar ny fillistfil"
 
-#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:338
+#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:339
 msgid "chown new files list file"
 msgstr "byt ägare ny fillistfil"
 
-#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:349
 msgid "copy old entry to new files list file"
 msgstr "kopiera gammal post till ny fillistfil"
 
-#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:352
+#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:353
 msgid "read old files list file"
 msgstr "läs gammal fillistfil"
 
-#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:361
+#: scripts/dpkg-distaddfile.pl:78 scripts/dpkg-gencontrol.pl:362
 msgid "write new entry to new files list file"
 msgstr "skriv ny post i ny fillistfil"
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:362
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:363
 msgid "close new files list file"
 msgstr "stäng ny fillistfil"
 
@@ -842,8 +842,8 @@ msgstr ""
 msgid "missing information for critical output field %s"
 msgstr "saknar information för kritiskt utdatafält %s"
 
-#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:280
-#: scripts/dpkg-gencontrol.pl:283 scripts/dpkg-source.pl:404
+#: scripts/dpkg-genchanges.pl:441 scripts/dpkg-gencontrol.pl:281
+#: scripts/dpkg-gencontrol.pl:284 scripts/dpkg-source.pl:404
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "saknar information för utdatafält %s"
@@ -930,48 +930,48 @@ msgid ""
 "list (%s)"
 msgstr "aktuell värdarkitekturen \"%s\" finns i paketets arkitekturlista (%s)"
 
-#: scripts/dpkg-gencontrol.pl:291
+#: scripts/dpkg-gencontrol.pl:292
 #, perl-format
 msgid "%s package with udeb specific field %s"
-msgstr ""
+msgstr "%s-paket med udeb-specifikt fält %s"
 
-#: scripts/dpkg-gencontrol.pl:304
+#: scripts/dpkg-gencontrol.pl:305
 msgid "fork for du"
 msgstr "grenar för du"
 
-#: scripts/dpkg-gencontrol.pl:307
+#: scripts/dpkg-gencontrol.pl:308
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr "chdir för du till \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:308
+#: scripts/dpkg-gencontrol.pl:309
 msgid "exec du"
 msgstr "kör du"
 
-#: scripts/dpkg-gencontrol.pl:315
+#: scripts/dpkg-gencontrol.pl:316
 #, perl-format
 msgid "du in `%s'"
 msgstr "du i \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:317
+#: scripts/dpkg-gencontrol.pl:318
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "du gav oväntade utdata \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:350
+#: scripts/dpkg-gencontrol.pl:351
 msgid "close old files list file"
 msgstr "stänger gammal fillistfil"
 
-#: scripts/dpkg-gencontrol.pl:363
+#: scripts/dpkg-gencontrol.pl:364
 msgid "install new files list file"
 msgstr "installerar ny fillistfil"
 
-#: scripts/dpkg-gencontrol.pl:370
+#: scripts/dpkg-gencontrol.pl:371
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "kan inte skapa ny utdatastyrfil \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "kan inte installera utdatastyrfil \"%s\""
@@ -1142,7 +1142,7 @@ msgid "cannot exec format parser: %s"
 msgstr "kan inte exekvera formattolk: %s"
 
 #: scripts/dpkg-scanpackages.pl:57
-#, fuzzy, perl-format
+#, perl-format
 msgid ""
 "Usage: %s [<option> ...] <binarypath> [<overridefile> [<pathprefix>]] > "
 "Packages\n"
@@ -1159,7 +1159,8 @@ msgstr ""
 "Packages\n"
 "\n"
 "Flaggor:\n"
-"  -u, --udeb               sök efter udeb-paket.\n"
+"  -t, --type <typ>         sök efter <typ>-paket (standard är \"deb\").\n"
+"  -u, --udeb               sök efter udeb-paket (föråldrat alias till -tudeb).\n"
 "  -a, --arch <ark>         arkitektur att söka efter.\n"
 "  -m, --multiversion       tillåt flera versioner av samma paket.\n"
 "  -h, --help               visa detta hjälpmeddelande.\n"
@@ -1592,23 +1593,33 @@ msgstr ""
 msgid "cannot open file %s"
 msgstr "kan inte öppna filen %s"
 
-#: scripts/dpkg-shlibdeps.pl:458
+#: scripts/dpkg-shlibdeps.pl:440
+#, perl-format
+msgid ""
+"$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
+"identified due to lack of DEBIAN sub-directory in the root of package's "
+"build tree"
+msgstr ""
+"$ORIGIN används i RPATH för %s och motsvarande katalog kunde inte identifieras "
+"på grund av DEBIAN-underkatalogen saknas i roten av paketets byggträd"
+
+#: scripts/dpkg-shlibdeps.pl:470
 msgid "cannot fork for dpkg --search"
 msgstr "kunde inte grena för dpkg --search"
 
-#: scripts/dpkg-shlibdeps.pl:465
+#: scripts/dpkg-shlibdeps.pl:477
 msgid "cannot exec dpkg"
 msgstr "kunde inte exekvera dpkg"
 
-#: scripts/dpkg-shlibdeps.pl:470
+#: scripts/dpkg-shlibdeps.pl:482
 msgid "diversions involved - output may be incorrect"
 msgstr "omdirigeringar finns - utdata kan vara felaktiga"
 
-#: scripts/dpkg-shlibdeps.pl:472
+#: scripts/dpkg-shlibdeps.pl:484
 msgid "write diversion info to stderr"
 msgstr "skriv omdirigeringsinformation på standard fel"
 
-#: scripts/dpkg-shlibdeps.pl:476
+#: scripts/dpkg-shlibdeps.pl:488
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "okända utdata från dpkg --search: \"%s\""

scripts/t/200_Dpkg_Shlibs.t

@@ -1,6 +1,6 @@
 # -*- mode: cperl;-*-
 
-use Test::More tests => 27;
+use Test::More tests => 33;
 
 use strict;
 use warnings;
@@ -24,11 +24,30 @@ use_ok('Dpkg::Shlibs::Objdump');
 
 my $obj = Dpkg::Shlibs::Objdump::Object->new;
 
-open my $objdump, '<', "$srcdir/objdump.libc6-2.6"
+open my $objdump, '<', "$srcdir/objdump.dbd-pg"
+  or die "$srcdir/objdump.dbd-pg: $!";
+$obj->_parse($objdump);
+close $objdump;
+ok(!$obj->is_public_library(), 'Pg.so is not a public library');
+ok(!$obj->is_executable(), 'Pg.so is not an executable');
+
+open $objdump, '<', "$srcdir/objdump.ls"
+  or die "$srcdir/objdump.ls: $!";
+$obj->reset();
+$obj->_parse($objdump);
+close $objdump;
+ok(!$obj->is_public_library(), 'ls is not a public library');
+ok($obj->is_executable(), 'ls is an executable');
+
+open $objdump, '<', "$srcdir/objdump.libc6-2.6"
   or die "$srcdir/objdump.libc6-2.6: $!";
+$obj->reset();
 $obj->_parse($objdump);
 close $objdump;
 
+ok($obj->is_public_library(), 'libc6 is a public library');
+ok(!$obj->is_executable(), 'libc6 is not an executable');
+
 is($obj->{SONAME}, 'libc.so.6', 'SONAME');
 is($obj->{HASH}, '0x13d99c', 'HASH');
 is($obj->{GNU_HASH}, '0x194', 'GNU_HASH');

scripts/t/200_Dpkg_Shlibs/objdump.dbd-pg

@@ -0,0 +1,309 @@
+
+/usr/lib/perl5/auto/DBD/Pg/Pg.so:     file format elf32-i386
+architecture: i386, flags 0x00000150:
+HAS_SYMS, DYNAMIC, D_PAGED
+start address 0x000048f0
+
+Program Header:
+    LOAD off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**12
+         filesz 0x00020c10 memsz 0x00020c10 flags r-x
+    LOAD off    0x00021000 vaddr 0x00021000 paddr 0x00021000 align 2**12
+         filesz 0x00000c70 memsz 0x00000c74 flags rw-
+ DYNAMIC off    0x00021014 vaddr 0x00021014 paddr 0x00021014 align 2**2
+         filesz 0x000000d0 memsz 0x000000d0 flags rw-
+   STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**2
+         filesz 0x00000000 memsz 0x00000000 flags rw-
+
+Dynamic Section:
+  NEEDED      libpq.so.5
+  NEEDED      libc.so.6
+  INIT        0x3d00
+  FINI        0x1d854
+  HASH        0xb4
+  GNU_HASH    0x7e8
+  STRTAB      0x1c30
+  SYMTAB      0xbd0
+  STRSZ       0xfa4
+  SYMENT      0x10
+  PLTGOT      0x211c8
+  PLTRELSZ    0x5d8
+  PLTREL      0x11
+  JMPREL      0x3728
+  REL         0x2e20
+  RELSZ       0x908
+  RELENT      0x8
+  VERNEED     0x2de0
+  VERNEEDNUM  0x1
+  VERSYM      0x2bd4
+  RELCOUNT    0x52
+
+Version References:
+  required from libc.so.6:
+    0x09691f73 0x00 04 GLIBC_2.1.3
+    0x0d696911 0x00 03 GLIBC_2.1
+    0x0d696910 0x00 02 GLIBC_2.0
+
+DYNAMIC SYMBOL TABLE:
+00000000      D  *UND*	00000000              Perl_Top_ptr
+00000000      DF *UND*	00000034  GLIBC_2.0   sprintf
+00000000      DF *UND*	00000014              PQcmdStatus
+00000000      D  *UND*	00000000              Perl_mg_get
+00000000      D  *UND*	00000000              Perl_sv_setiv
+00000000      D  *UND*	00000000              Perl_is_utf8_string
+00000000      D  *UND*	00000000              Perl_sv_free
+00000000      DF *UND*	00000011              PQpass
+00000000      DF *UND*	00000191              PQputCopyEnd
+00000000      D  *UND*	00000000              Perl_av_len
+00000000      D  *UND*	00000000              Perl_get_sv
+00000000      D  *UND*	00000000              PerlIO_printf
+00000000      D  *UND*	00000000              Perl_Tstack_base_ptr
+00000000      D  *UND*	00000000              Perl_newRV_noinc
+00000000      DF *UND*	000000ba              lo_tell
+00000000      DF *UND*	00000058              PQconsumeInput
+00000000  w   D  *UND*	00000000              __gmon_start__
+00000000  w   D  *UND*	00000000              _Jv_RegisterClasses
+00000000      DF *UND*	00000175              PQgetResult
+00000000      D  *UND*	00000000              Perl_Tstack_max_ptr
+00000000      D  *UND*	00000000              Perl_av_make
+00000000      DF *UND*	0000004d              PQfmod
+00000000      DF *UND*	00000024              PQprotocolVersion
+00000000      D  *UND*	00000000              Perl_sv_2uv
+00000000      DF *UND*	00000021              PQsetNoticeProcessor
+00000000      DF *UND*	000000c6  GLIBC_2.0   strncpy
+00000000      DF *UND*	00000014              PQstatus
+00000000      D  *UND*	00000000              Perl_Isv_yes_ptr
+00000000      DF *UND*	00000058  GLIBC_2.0   memset
+00000000      D  *UND*	00000000              Perl_warn_nocontext
+00000000      D  *UND*	00000000              Perl_sv_2mortal
+00000000      D  *UND*	00000000              Perl_Tstack_sp_ptr
+00000000      DF *UND*	00000014              PQresultStatus
+00000000      DF *UND*	00000045  GLIBC_2.0   __strtol_internal
+00000000      DF *UND*	00000019              PQhost
+00000000      D  *UND*	00000000              Perl_sv_setpv
+00000000      D  *UND*	00000000              Perl_av_undef
+00000000      DF *UND*	000000e2              lo_lseek
+00000000      DF *UND*	0000004d              PQftable
+00000000      D  *UND*	00000000              Perl_form
+00000000      DF *UND*	00000024              PQbackendPID
+00000000      DF *UND*	00000010              PQntuples
+00000000      DF *UND*	00000099              PQoidValue
+00000000      DF *UND*	00000040              PQnotifies
+00000000      DF *UND*	0000004d              PQftype
+00000000      DF *UND*	00000048              PQgetisnull
+00000000      DF *UND*	00000033              PQresultErrorField
+00000000      D  *UND*	00000000              Perl_Tmarkstack_max_ptr
+00000000      DF *UND*	000000bb              lo_creat
+00000000      DF *UND*	00000245              lo_export
+00000000      D  *UND*	00000000              pthread_getspecific
+00000000      DF *UND*	0000005d              PQexec
+00000000      DF *UND*	00000020              PQsetErrorVerbosity
+00000000      DF *UND*	00000041              PQconnectdb
+00000000      DF *UND*	0000001c              PQserverVersion
+00000000      D  *UND*	00000000              Perl_sv_2iv
+00000000      DF *UND*	0000003e              PQuntrace
+00000000      DF *UND*	00000036              PQtrace
+00000000      D  *UND*	00000000              PerlIO_findFILE
+00000000      D  *UND*	00000000              Perl_av_extend
+00000000      DF *UND*	00000046  GLIBC_2.0   memcpy
+00000000      DF *UND*	000000af  GLIBC_2.0   strlen
+00000000      D  *UND*	00000000              Perl_sv_upgrade
+00000000      DF *UND*	00000041              PQendcopy
+00000000      D  *UND*	00000000              Perl_hv_store_ent
+00000000      D  *UND*	00000000              Perl_av_store
+00000000      DF *UND*	0000009e              PQexecPrepared
+00000000      D  *UND*	00000000              Perl_sv_setpvn
+00000000      DF *UND*	000000ce              lo_read
+00000000      DF *UND*	00000024  GLIBC_2.0   strcpy
+00000000      D  *UND*	00000000              Perl_hv_fetch
+00000000      DF *UND*	00000011              PQoptions
+00000000      D  *UND*	00000000              Perl_stack_grow
+00000000      DF *UND*	00000011              PQdb
+00000000      DF *UND*	000001fa              lo_import
+00000000      D  *UND*	00000000              Perl_Tcurpad_ptr
+00000000      DF *UND*	00000014              PQsocket
+00000000      D  *UND*	00000000              Perl_sv_newmortal
+00000000      D  *UND*	00000000              Perl_av_fetch
+00000000      DF *UND*	00000011              PQuser
+00000000      DF *UND*	00000084              PQprepare
+00000000      DF *UND*	00000023              PQfreemem
+00000000      D  *UND*	00000000              Perl_Tdirty_ptr
+00000000      DF *UND*	00000062  GLIBC_2.0   strcasecmp
+00000000      DF *UND*	0000004d              PQftablecol
+00000000      DF *UND*	000000ba              lo_unlink
+00000000      D  *UND*	00000000              Perl_call_method
+00000000      D  *UND*	00000000              Perl_Tmarkstack_ptr_ptr
+00000000      DF *UND*	00000029              PQtransactionStatus
+00000000      DF *UND*	0000002c              PQfname
+00000000      D  *UND*	00000000              Perl_newSV
+00000000      D  *UND*	00000000              Perl_mg_set
+00000000      D  *UND*	00000000              Perl_sv_2io
+00000000      DF *UND*	0000012c              PQputCopyData
+00000000      D  *UND*	00000000              Perl_safesysrealloc
+00000000      DF *UND*	000000ab              PQexecParams
+00000000      D  *UND*	00000000              Perl_newSViv
+00000000      DF *UND*	000000a4              PQgetCopyData
+00000000      D  *UND*	00000000              Perl_sv_unref
+00000000      DF *UND*	00000027              PQfinish
+00000000      D  *UND*	00000000              Perl_Isv_no_ptr
+00000000      D  *UND*	00000000              Perl_mg_find
+00000000      DF *UND*	00000035              PQerrorMessage
+00000000      D  *UND*	00000000              Perl_newAV
+00000000      DF *UND*	000001aa  GLIBC_2.0   strcat
+00000000      D  *UND*	00000000              Perl_croak_nocontext
+00000000      D  *UND*	00000000              Perl_sv_grow
+00000000      DF *UND*	000000c6  GLIBC_2.1   __rawmemchr
+00000000      DF *UND*	00000011              PQnfields
+00000000      D  *UND*	00000000              Perl_av_pop
+00000000      DF *UND*	000000cd              lo_open
+00000000      D  *UND*	00000000              Perl_safesysmalloc
+00000000      D  *UND*	00000000              Perl_newSVpv
+00000000      D  *UND*	00000000              pow
+00000000      DF *UND*	00000034  GLIBC_2.0   sscanf
+00000000      D  *UND*	00000000              Perl_mg_size
+00000000      D  *UND*	00000000              Perl_av_push
+00000000      D  *UND*	00000000              Perl_Tna_ptr
+00000000      DF *UND*	000000f3  GLIBC_2.0   strncmp
+00000000      D  *UND*	00000000              PL_memory_wrap
+00000000      D  *UND*	00000000              Perl_croak
+00000000      D  *UND*	00000000              Perl_Isv_undef_ptr
+00000000      D  *UND*	00000000              Perl_safesysfree
+00000000      DF *UND*	00000011              PQport
+00000000      DF *UND*	0000003f              PQgetvalue
+00000000      DF *UND*	0000003b  GLIBC_2.0   snprintf
+00000000      D  *UND*	00000000              Perl_newXS
+00000000      DF *UND*	000000ba              lo_close
+00000000      D  *UND*	00000000              Perl_newSVuv
+00000000      D  *UND*	00000000              Perl_sv_2bool
+00000000      D  *UND*	00000000              Perl_newHV
+00000000      D  *UND*	00000000              Perl_Gthr_key_ptr
+00000000      DF *UND*	00000054  GLIBC_2.0   strcmp
+00000000  w   DF *UND*	00000176  GLIBC_2.1.3 __cxa_finalize
+00000000      D  *UND*	00000000              Perl_newSVpvn
+00000000      D  *UND*	00000000              Perl_markstack_grow
+00000000      DF *UND*	000000eb              lo_write
+00000000      DF *UND*	00000175              PQcmdTuples
+00000000      D  *UND*	00000000              Perl_newRV
+00000000      DF *UND*	0000004d              PQfsize
+00000000      D  *UND*	00000000              Perl_sv_backoff
+00000000      D  *UND*	00000000              Perl_dowantarray
+00000000      DF *UND*	0000006e              PQclear
+00000000      D  *UND*	00000000              Perl_sv_2pv_flags
+0000b0b0 g    DF .text	000001a6  Base        XS_DBD__Pg__db__ping
+00006bc0 g    DF .text	0000025f  Base        XS_DBD__Pg__db__pg_type_info
+0001cac0 g    DF .text	00000059  Base        dequote_bool
+00007f00 g    DF .text	0000026b  Base        XS_DBD__Pg__db_putline
+00007100 g    DF .text	000001a0  Base        XS_DBD__Pg__db_endcopy
+00006e20 g    DF .text	00000133  Base        XS_DBD__Pg__db_pg_server_untrace
+0000a750 g    DF .text	000002d3  Base        XS_DBD__Pg__db_pg_rollback_to
+00012e00 g    DF .text	00000211  Base        pg_db_release
+00018120 g    DF .text	00001707  Base        dbd_st_prepare
+000138a0 g    DF .text	00000234  Base        pg_db_getline
+00010800 g    DF .text	0000062a  Base        XS_DBD__Pg__db_selectall_arrayref
+0000ad10 g    DF .text	000001a6  Base        XS_DBD__Pg__db_pg_notifies
+00007990 g    DF .text	0000056c  Base        XS_DBD__Pg__db_pg_getline
+00013270 g    DF .text	0000020a  Base        pg_db_savepoint
+00009640 g    DF .text	00000619  Base        XS_DBD__Pg__db_lo_read
+00010e30 g    DF .text	00000413  Base        XS_DBD__Pg__db__login
+0001a890 g    DF .text	00000022  Base        dbd_db_rollback
+0001b150 g    DF .text	000006d7  Base        dbd_db_login
+00019a60 g    DF .text	000000ae  Base        dbd_db_getfd
+00019e60 g    DF .text	00000657  Base        dbd_db_FETCH_attrib
+0001d020 g    DF .text	000000b2  Base        quote_bool
+00010020 g    DF .text	0000020e  Base        XS_DBD__Pg__db_commit
+0001ca90 g    DF .text	00000028  Base        dequote_char
+00012cf0 g    DF .text	00000104  Base        pg_db_lo_creat
+00007440 g    DF .text	00000542  Base        XS_DBD__Pg__db_getline
+00006f60 g    DF .text	00000194  Base        XS_DBD__Pg__db_pg_server_trace
+00012be0 g    DF .text	00000103  Base        pg_db_lo_write
+0000db20 g    DF .text	00000608  Base        XS_DBD__Pg__st_blob_read
+0000aa30 g    DF .text	000002d3  Base        XS_DBD__Pg__db_pg_savepoint
+0000bcb0 g    DF .text	000002d8  Base        XS_DBD__Pg__st_execute
+0001d0e0 g    DF .text	00000156  Base        quote_bytea
+00008e70 g    DF .text	000003db  Base        XS_DBD__Pg__db_lo_lseek
+0001cb20 g    DF .text	000000c2  Base        quote_circle
+0000e950 g    DF .text	00000266  Base        XS_DBD__Pg__st_fetchall_arrayref
+0001d780 g    DF .text	0000009b  Base        sql_type_data
+00021c70 g    D  *ABS*	00000000  Base        _edata
+00015df0 g    DF .text	00000155  Base        dbd_st_finish
+0000d220 g    DF .text	000003f4  Base        XS_DBD__Pg__st_DESTROY
+0000aec0 g    DF .text	000001e5  Base        XS_DBD__Pg__db_getfd
+0001ccc0 g    DF .text	000000b2  Base        quote_geom
+0001d2e0 g    DF .text	00000497  Base        pg_type_data
+00015c30 g    DF .text	000001b5  Base        dbd_db_ping
+0001d854 g    DF .fini	00000000  Base        _fini
+00013560 g    DF .text	000000e7  Base        pg_db_pg_server_trace
+000127b0 g    DF .text	00000118  Base        pg_db_lo_open
+00003d00 g    DF .init	00000000  Base        _init
+0000e130 g    DF .text	0000022f  Base        XS_DBD__Pg__st_fetchrow_array
+0001cbf0 g    DF .text	000000c2  Base        quote_path
+00015930 g    DF .text	000002f9  Base        dbd_st_destroy
+00011450 g    DF .text	00000336  Base        XS_DBD__Pg_constant
+00014fb0 g    DF .text	0000029e  Base        dbd_st_STORE_attrib
+0000cac0 g    DF .text	000004bc  Base        XS_DBD__Pg__st_bind_param
+0000f190 g    DF .text	0000020e  Base        XS_DBD__Pg__db_rollback
+00004990 g    DF .text	00001e07  Base        boot_DBD__Pg
+00021c70 g    D  *ABS*	00000000  Base        __bss_start
+0001ca60 g    DF .text	00000028  Base        dequote_string
+0000d840 g    DF .text	000002d2  Base        XS_DBD__Pg__st_STORE
+00008170 g    DF .text	0000026b  Base        XS_DBD__Pg__db_pg_putline
+0001c790 g    DF .text	00000295  Base        pg_quickexec
+000072a0 g    DF .text	0000019f  Base        XS_DBD__Pg__db_pg_endcopy
+00008700 g    DF .text	0000028b  Base        XS_DBD__Pg__db_lo_import
+00019830 g    DF .text	0000022b  Base        dbd_db_pg_notifies
+00011ab0 g    DF .text	000000ee  Base        pg_db_lo_close
+0001ae70 g    DF .text	000001c6  Base        dbd_db_disconnect
+00021c74 g    D  *ABS*	00000000  Base        _end
+0000cf80 g    DF .text	000002a0  Base        XS_DBD__Pg__st_finish
+00019b10 g    DF .text	00000343  Base        dbd_discon_all
+00011790 g    DF .text	00000050  Base        dbd_init
+000117e0 g    DF .text	000000a9  Base        dbd_st_rows
+0001a8c0 g    DF .text	00000022  Base        dbd_db_commit
+00009ec0 g    DF .text	0000032b  Base        XS_DBD__Pg__db_lo_open
+0001ce70 g    DF .text	000000fe  Base        dequote_bytea
+0000ebc0 g    DF .text	000001f0  Base        XS_DBD__Pg__st_rows
+0000bf90 g    DF .text	0000056d  Base        XS_DBD__Pg__db_quote
+0001cfb0 g    DF .text	0000006c  Base        quote_integer
+0000d620 g    DF .text	0000021b  Base        XS_DBD__Pg__st_FETCH_attrib
+00013480 g    DF .text	000000e0  Base        pg_db_pg_server_untrace
+0000a1f0 g    DF .text	0000027c  Base        XS_DBD__Pg__db_lo_creat
+00009250 g    DF .text	000003eb  Base        XS_DBD__Pg__db_lo_write
+000067a0 g    DF .text	00000208  Base        XS_DBD__Pg__st_state
+0001ca30 g    DF .text	00000028  Base        null_dequote
+00013020 g    DF .text	00000250  Base        pg_db_rollback_to
+00010230 g    DF .text	000005cb  Base        XS_DBD__Pg__db_selectrow_arrayref
+00008990 g    DF .text	0000025b  Base        XS_DBD__Pg__db_lo_unlink
+000128d0 g    DF .text	00000104  Base        pg_db_lo_import
+0000fb30 g    DF .text	0000020a  Base        XS_DBD__Pg__db_FETCH
+00012af0 g    DF .text	000000ee  Base        pg_db_lo_tell
+0000a470 g    DF .text	000002d3  Base        XS_DBD__Pg__db_pg_release
+00011250 g    DF .text	000001fa  Base        XS_DBD__Pg__dr_discon_all_
+00013ce0 g    DF .text	000012cd  Base        dbd_st_FETCH_attrib
+0000b860 g    DF .text	00000450  Base        XS_DBD__Pg__db_do
+0000edb0 g    DF .text	000003d6  Base        XS_DBD__Pg__st__prepare
+0001d240 g    DF .text	0000003f  Base        quote_sql_binary
+0000fd40 g    DF .text	000002d2  Base        XS_DBD__Pg__db_STORE
+000083e0 g    DF .text	0000031b  Base        XS_DBD__Pg__db_lo_export
+0001cd80 g    DF .text	000000e4  Base        quote_string
+0000f3a0 g    DF .text	00000378  Base        XS_DBD__Pg__db_disconnect
+0000c500 g    DF .text	000005be  Base        XS_DBD__Pg__st_bind_param_inout
+0000f720 g    DF .text	0000040e  Base        XS_DBD__Pg__db_DESTROY
+00013ae0 g    DF .text	000001f4  Base        pg_db_putline
+00013650 g    DF .text	00000244  Base        pg_db_endcopy
+00016b40 g    DF .text	000015d1  Base        dbd_st_execute
+000129e0 g    DF .text	00000110  Base        pg_db_lo_unlink
+0001cf70 g    DF .text	00000038  Base        dequote_sql_binary
+00011890 g    DF .text	0000010a  Base        pg_db_lo_lseek
+0001d280 g    DF .text	00000055  Base        null_quote
+00008bf0 g    DF .text	0000027c  Base        XS_DBD__Pg__db_lo_tell
+0001a8f0 g    DF .text	00000579  Base        dbd_db_STORE_attrib
+0001b9a0 g    DF .text	00000def  Base        dbd_bind_ph
+000119a0 g    DF .text	00000103  Base        pg_db_lo_read
+00015f50 g    DF .text	000006ed  Base        dbd_st_fetch
+0000e360 g    DF .text	00000224  Base        XS_DBD__Pg__st_fetchrow_arrayref
+000069b0 g    DF .text	00000208  Base        XS_DBD__Pg__db_state
+00012690 g    DF .text	00000118  Base        pg_db_lo_export
+0001b040 g    DF .text	0000010f  Base        dbd_db_destroy
+00009c60 g    DF .text	0000025b  Base        XS_DBD__Pg__db_lo_close
+00011ea0 g    DF .text	00000379  Base        dbd_st_blob_read
+
+

scripts/t/200_Dpkg_Shlibs/objdump.ls

@@ -0,0 +1,172 @@
+
+/bin/ls:     file format elf32-i386
+architecture: i386, flags 0x00000112:
+EXEC_P, HAS_SYMS, D_PAGED
+start address 0x08049b50
+
+Program Header:
+    PHDR off    0x00000034 vaddr 0x08048034 paddr 0x08048034 align 2**2
+         filesz 0x00000100 memsz 0x00000100 flags r-x
+  INTERP off    0x00000134 vaddr 0x08048134 paddr 0x08048134 align 2**0
+         filesz 0x00000013 memsz 0x00000013 flags r--
+    LOAD off    0x00000000 vaddr 0x08048000 paddr 0x08048000 align 2**12
+         filesz 0x00012478 memsz 0x00012478 flags r-x
+    LOAD off    0x00012478 vaddr 0x0805b478 paddr 0x0805b478 align 2**12
+         filesz 0x000003b4 memsz 0x00000818 flags rw-
+ DYNAMIC off    0x0001248c vaddr 0x0805b48c paddr 0x0805b48c align 2**2
+         filesz 0x000000e8 memsz 0x000000e8 flags rw-
+    NOTE off    0x00000148 vaddr 0x08048148 paddr 0x08048148 align 2**2
+         filesz 0x00000020 memsz 0x00000020 flags r--
+EH_FRAME off    0x000123b0 vaddr 0x0805a3b0 paddr 0x0805a3b0 align 2**2
+         filesz 0x0000002c memsz 0x0000002c flags r--
+   STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**2
+         filesz 0x00000000 memsz 0x00000000 flags rw-
+
+Dynamic Section:
+  NEEDED      librt.so.1
+  NEEDED      libacl.so.1
+  NEEDED      libselinux.so.1
+  NEEDED      libc.so.6
+  INIT        0x8049510
+  FINI        0x8056768
+  HASH        0x8048168
+  GNU_HASH    0x80484a4
+  STRTAB      0x8048bc0
+  SYMTAB      0x8048500
+  STRSZ       0x4a0
+  SYMENT      0x10
+  DEBUG       0x0
+  PLTGOT      0x805b57c
+  PLTRELSZ    0x300
+  PLTREL      0x11
+  JMPREL      0x8049210
+  REL         0x80491e8
+  RELSZ       0x28
+  RELENT      0x8
+  VERNEED     0x8049138
+  VERNEEDNUM  0x3
+  VERSYM      0x8049060
+
+Version References:
+  required from librt.so.1:
+    0x0d696912 0x00 08 GLIBC_2.2
+  required from libacl.so.1:
+    0x05822450 0x00 06 ACL_1.0
+  required from libc.so.6:
+    0x09691a73 0x00 09 GLIBC_2.2.3
+    0x0d696913 0x00 07 GLIBC_2.3
+    0x0d696911 0x00 05 GLIBC_2.1
+    0x09691f73 0x00 04 GLIBC_2.1.3
+    0x0d696912 0x00 03 GLIBC_2.2
+    0x0d696910 0x00 02 GLIBC_2.0
+
+DYNAMIC SYMBOL TABLE:
+00000000      DF *UND*	0000026e  GLIBC_2.0   abort
+00000000      DF *UND*	0000001d  GLIBC_2.0   __errno_location
+00000000      DF *UND*	0000004d  GLIBC_2.0   sigemptyset
+00000000      DF *UND*	00000034  GLIBC_2.0   sprintf
+00000000      DF *UND*	000001a2  GLIBC_2.2   localeconv
+00000000      DF *UND*	0000000a  GLIBC_2.0   dirfd
+00000000      DF *UND*	00000057  GLIBC_2.1.3 __cxa_atexit
+00000000      DF *UND*	00000037  GLIBC_2.0   strcoll
+00000000      DF *UND*	00000150  GLIBC_2.0   qsort
+00000000      DF *UND*	00000094  GLIBC_2.1   fputs_unlocked
+00000000      DF *UND*	0000001e  GLIBC_2.0   __ctype_get_mb_cur_max
+00000000      DF *UND*	000000d9  GLIBC_2.0   signal
+00000000      DF *UND*	0000006e  GLIBC_2.0   sigismember
+00000000  w   D  *UND*	00000000              __gmon_start__
+00000000  w   D  *UND*	00000000              _Jv_RegisterClasses
+00000000      DF *UND*	00000490  GLIBC_2.0   realloc
+00000000      DF *UND*	0000003f  GLIBC_2.2   __xstat64
+00000000      DF *UND*	00000035  GLIBC_2.0   localtime
+00000000      DF *UND*	00000132  GLIBC_2.0   getgrnam
+00000000      DF *UND*	00000167  GLIBC_2.0   strchr
+00000000      DF *UND*	000000dc  GLIBC_2.0   getenv
+00000000      DF *UND*	00000304  GLIBC_2.0   calloc
+00000000      DF *UND*	000000c6  GLIBC_2.0   strncpy
+00000000      DF *UND*	00000023              freecon
+00000000      DF *UND*	00000058  GLIBC_2.0   memset
+00000000      DF *UND*	000001b2  GLIBC_2.0   __libc_start_main
+00000000      DF *UND*	00000044  GLIBC_2.1   mempcpy
+00000000      DF *UND*	000000c9  GLIBC_2.0   _obstack_begin
+00000000      DF *UND*	000001b9  GLIBC_2.0   strrchr
+00000000      DF *UND*	00000038  GLIBC_2.0   chmod
+00000000      DF *UND*	00000150  GLIBC_2.0   __assert_fail
+00000000      DF *UND*	00000015  GLIBC_2.0   bindtextdomain
+00000000      DF *UND*	00000215  GLIBC_2.0   mbrtowc
+00000000      DF *UND*	00000046  ACL_1.0     acl_delete_def_file
+00000000      DF *UND*	00000038  GLIBC_2.0   gettimeofday
+00000000      DF *UND*	0000003c  GLIBC_2.3   __ctype_toupper_loc
+00000000      DF *UND*	0000003f  GLIBC_2.2   __lxstat64
+00000000      DF *UND*	00000195  GLIBC_2.0   _obstack_newchunk
+00000000      DF *UND*	00000066  GLIBC_2.0   __overflow
+00000000      DF *UND*	00000049  GLIBC_2.0   dcgettext
+00000000      DF *UND*	00000160  GLIBC_2.0   sigaction
+00000000      DF *UND*	00000127  GLIBC_2.1   strverscmp
+00000000      DF *UND*	00000092  GLIBC_2.0   opendir
+00000000      DF *UND*	00000047  GLIBC_2.0   getopt_long
+00000000      DF *UND*	0000003a  GLIBC_2.0   ioctl
+00000000      DF *UND*	0000003c  GLIBC_2.3   __ctype_b_loc
+00000000      DF *UND*	000000c9  GLIBC_2.0   iswcntrl
+00000000      DF *UND*	00000032  GLIBC_2.0   isatty
+00000000      DF *UND*	000001e8  GLIBC_2.1   fclose
+00000000      DF *UND*	00000019  GLIBC_2.0   mbsinit
+00000000      DF *UND*	00000036  GLIBC_2.0   _setjmp
+00000000      DF *UND*	00000038  GLIBC_2.0   tcgetpgrp
+00000000      DF *UND*	0000003c  GLIBC_2.0   mktime
+00000000      DF *UND*	000000af  GLIBC_2.2   readdir64
+00000000      DF *UND*	00000046  GLIBC_2.0   memcpy
+00000000      DF *UND*	000000af  GLIBC_2.0   strlen
+00000000      DF *UND*	00000132  GLIBC_2.0   getpwuid
+00000000      DF *UND*	00000094  ACL_1.0     acl_extended_file
+00000000      DF *UND*	00000195  ACL_1.0     acl_get_file
+00000000      DF *UND*	000006b5  GLIBC_2.0   setlocale
+00000000      DF *UND*	0000002a  ACL_1.0     acl_entries
+00000000      DF *UND*	00000024  GLIBC_2.0   strcpy
+00000000      DF *UND*	00000039  GLIBC_2.0   printf
+00000000      DF *UND*	0000008c  GLIBC_2.0   raise
+00000000      DF *UND*	000000a2  GLIBC_2.1   fwrite_unlocked
+00000000      DF *UND*	00000115  GLIBC_2.2   clock_gettime
+00000000      DF *UND*	00000075              getfilecon
+00000000      DF *UND*	00000055  GLIBC_2.0   closedir
+00000000      DF *UND*	00000024  GLIBC_2.0   fprintf
+00000000      DF *UND*	00000114  ACL_1.0     acl_set_file
+00000000      DF *UND*	0000009e  GLIBC_2.0   sigprocmask
+00000000      DF *UND*	0000002a  GLIBC_2.2   __fpending
+00000000      DF *UND*	00000075              lgetfilecon
+00000000      DF *UND*	000000d7  GLIBC_2.0   error
+00000000      DF *UND*	00000132  GLIBC_2.0   getgrgid
+00000000      DF *UND*	00000045  GLIBC_2.0   __strtoull_internal
+00000000      DF *UND*	0000006a  GLIBC_2.0   sigaddset
+00000000      DF *UND*	0000003a  GLIBC_2.0   readlink
+00000000      DF *UND*	0000008e  GLIBC_2.0   memmove
+00000000      DF *UND*	0000003c  GLIBC_2.3   __ctype_tolower_loc
+00000000      DF *UND*	00000045  GLIBC_2.0   __strtoul_internal
+00000000      DF *UND*	0000011d  GLIBC_2.0   textdomain
+00000000      DF *UND*	0000003f  GLIBC_2.2   __fxstat64
+00000000      DF *UND*	000002d9  GLIBC_2.2.3 fnmatch
+00000000      DF *UND*	000000f3  GLIBC_2.0   strncmp
+00000000      DF *UND*	00004373  GLIBC_2.0   vfprintf
+00000000      DF *UND*	0000006e  ACL_1.0     acl_free
+00000000      DF *UND*	00000042  GLIBC_2.0   fflush_unlocked
+00000000      DF *UND*	00000045  GLIBC_2.0   strftime
+00000000      DF *UND*	00000078  GLIBC_2.0   wcwidth
+00000000      DF *UND*	000000cb  GLIBC_2.0   iswprint
+00000000      DF *UND*	00000132  GLIBC_2.0   getpwnam
+00000000      DF *UND*	00000054  GLIBC_2.0   strcmp
+00000000      DF *UND*	000000fa  GLIBC_2.0   exit
+00000000      DF *UND*	000004bc  ACL_1.0     acl_from_text
+0805bc90 g    D  *ABS*	00000000  Base        _end
+0805b860 g    DO .bss	00000004  GLIBC_2.0   stdout
+0805b82c g    D  *ABS*	00000000  Base        _edata
+080567a4 g    DO .rodata	00000004  Base        _IO_stdin_used
+08049780      DF *UND*	000001e5  GLIBC_2.0   free
+0805b844 g    DO .bss	00000004  GLIBC_2.0   stderr
+0805b82c g    D  *ABS*	00000000  Base        __bss_start
+080499a0      DF *UND*	00000178  GLIBC_2.0   malloc
+08049510 g    DF .init	00000000  Base        _init
+08056768 g    DF .fini	00000000  Base        _fini
+0805b840 g    DO .bss	00000004  GLIBC_2.0   optind
+0805b864 g    DO .bss	00000004  GLIBC_2.0   optarg
+
+

scripts/t/400_Dpkg_Deps.t

@@ -1,16 +1,16 @@
 # -*- mode: cperl;-*-
 
-use Test::More tests => 12;
+use Test::More tests => 14;
 
 use strict;
 use warnings;
 
 use_ok('Dpkg::Deps');
 
-my $field_multiline = "libgtk2.0-common (= 2.10.13-1)  , libatk1.0-0 (>=
+my $field_multiline = " , , libgtk2.0-common (= 2.10.13-1)  , libatk1.0-0 (>=
 1.13.2), libc6 (>= 2.5-5), libcairo2 (>= 1.4.0), libcupsys2 (>= 1.2.7),
 libfontconfig1 (>= 2.4.0), libglib2.0-0  (  >= 2.12.9), libgnutls13 (>=
-1.6.3-0), libjpeg62, python (<< 2.5)";
+1.6.3-0), libjpeg62, python (<< 2.5) , , ";
 my $field_multiline_sorted = "libatk1.0-0 (>= 1.13.2), libc6 (>= 2.5-5), libcairo2 (>= 1.4.0), libcupsys2 (>= 1.2.7), libfontconfig1 (>= 2.4.0), libglib2.0-0 (>= 2.12.9), libgnutls13 (>= 1.6.3-0), libgtk2.0-common (= 2.10.13-1), libjpeg62, python (<< 2.5)";
 
 my $dep_multiline = Dpkg::Deps::parse($field_multiline);
@@ -53,4 +53,9 @@ my $dep_dup_union = Dpkg::Deps::parse($field_dup_union, union => 1);
 $dep_dup_union->simplify_deps($facts);
 is($dep_dup_union->dump(), "libc6 (>> 2.3), fake (<< 2.0), fake (>> 3.0), fake (= 2.5), python (<< 2.5)", "Simplify union deps");
 
+my $dep_empty1 = Dpkg::Deps::parse("");
+is($dep_empty1->dump(), "", "Empty dependency");
+
+my $dep_empty2 = Dpkg::Deps::parse(" , , ", union => 1);
+is($dep_empty2->dump(), "", "' , , ' is also an empty dependency");