Merge branch 'master' into dpkg-shlibdeps-buxy. Prepare 1.14.8~newshlib

release.

Conflicts:

	configure.ac
	debian/changelog

ChangeLog

@@ -1,3 +1,73 @@
+2007-10-08  Guillem Jover  <guillem@debian.org>
+
+	* configure.ac: Release 1.14.7.
+
+2007-10-08  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-source.pl: Do not replace substvars for build
+	dependencies.
+
+2007-10-08  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-gencontrol.pl: Refer to host architecture (instead of
+	build) in error string, and quote architecture name.
+
+2007-10-08  Frank Lichtenheld  <djpig@debian.org>,
+            Guillem Jover  <guillem@debian.org>
+
+	* scripts/controllib.pl (debarch_is): Check if $alias is equal to
+	$real or 'any' before mapping them to debtriplets.
+	(debarch_to_debtriplet): Do not special case 'any' nor 'all'.
+	(debarch_eq): Check if $a and $b are equal before mapping them to
+	debtriplets.
+
+2007-10-07  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-buildpackage.pl: Warn if run as root and $rootcommand
+	has been specified. Error if run as non-root and $rootcommand is not
+	found.
+
+2007-10-07  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-buildpackage.pl (usage): Remove details about running
+	fakeroot only if it's available.
+
+2007-10-07  Frank Lichtenheld  <djpig@debian.org>
+	    Marcel Toele  <mtoele@kern.nl>
+
+	* scripts/dpkg-source.pl (handleformat): Include
+	a trailing HT character in the diff labels if
+	the filename contains spaces. Apparantly this is
+	standard but undocumented diff behaviour.
+
+2007-09-29  Frank Lichtenheld  <djpig@debian.org>
+
+	* scripts/dpkg-buildpackage.pl: Call checkversion()
+	on version extracted from changelog. Since other
+	program we call later will do the same there is
+	really no reason not to fail early.
+
+	* scripts/dpkg-buildpackage.pl (testcommand):
+	Make the check more sensible. Instead of testing
+	/usr/bin/$cmd, test `which $cmd`.
+
+	* scripts/dpkg-buildpackage.pl (signfile): Call
+	gpg with --utf8-strings since otherwise the key
+	lookup fails with non-ASCII UTF8-encoded names.
+	Since Debian changelogs should be UTF8 encoded,
+	this is probably the more sane default. This
+	will probably break if one uses a non-UTF8 locale
+	and tries to give a uid on the commandline that
+	contains non-ASCII chars. I think we can live with
+	that.
+
+2007-09-28  Frank Lichtenheld  <djpig@debian.org>
+
+	* scripts/dpkg-buildpackage.pl (withecho): Remove
+	empty strings at the begin of the command array.
+	These can be caused by e.g. an emtpy $rootcommando.
+	It is easiest to filter them out here.
+
 2007-09-24  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-buildpackage.pl (signfile): Do not use absolute path

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.7~newshlib], [debian-dpkg@lists.debian.org])
+AC_INIT([dpkg], [1.14.8~newshlib], [debian-dpkg@lists.debian.org])
 AC_CONFIG_SRCDIR([lib/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])

debian/changelog

@@ -1,40 +1,15 @@
-dpkg (1.14.7~newshlib.1) experimental; urgency=low
+dpkg (1.14.8~newshlib) experimental; urgency=low
 
-  * Fixes dpkg-gensymbols to use Dpkg::Gettext instead of recently
-    removed dpkg-gettext.pl.
+  [ Raphael Hertzog ]
+  * Snapshot of upcoming dpkg 1.14.8 with improved dpkg-shlibdeps
+    supporting symbols files.
 
- -- Raphael Hertzog <hertzog@debian.org>  Tue, 25 Sep 2007 13:42:20 +0200
+  [ Updated man pages translations ]
+  * German (Helge Kreutzmann).
 
-dpkg (1.14.7~newshlib) experimental; urgency=low
+ -- Raphael Hertzog <hertzog@debian.org>  Mon, 08 Oct 2007 20:22:57 +0200
 
-  [ Raphael Hertzog ]
-  * dpkg-shlibdeps has been heavily reworked:
-    * it supports "symbols" files to generate finer-grained
-      dependencies. Closes: #430367
-      Those files can be created by the new dpkg-gensymbols
-      command.
-    * it uses now all paths in RPATH (instead of only the first).
-      Closes: #395942
-    * it's now able to parse include directives in /etc/ld.so.conf.
-      Closes: #431597
-    * libraries are also searched in the public directories of packages
-      being built and thus debian/shlibs.local can effectively define
-      dependencies for libraries that are being built. Closes: #80340
-    * "symbols" files use the full SONAME as key instead of splitting it in
-      (name, version) like the "shlibs" format requires it. This allows
-      binaries to be linked with unversioned libraries and not fail.
-      Closes: #48208
-      Note that unversioned libraries are still a very bad idea.
-    * dpkg-shlibdeps now supports "-x<package>" options that can be used
-      to exclude packages from generated dependencies. This is
-      particalularly useful to avoid dependencies on ourselves when a
-      package contains a binary and a library (without requiring an
-      shlibs.local file to override the usual shlibs file). It might also
-      be used to avoid other unwanted dependencies (use with care though).
-      Closes: #41907, #109954
-    * If dpkg-shlibdeps doesn't find any dependency information for a
-      shared library that is actively used, then it will fail. This can be
-      disabled with the option --ignore-missing-info. Closes: #10807
+dpkg (1.14.7) unstable; urgency=low
 
   [ Guillem Jover ]
   * Add back $dpkglib into @INC, needed by the controllib.pl require in
@@ -51,10 +26,19 @@ dpkg (1.14.7~newshlib) experimental; urgency=low
     instead of unconditionally setting it to 'Installed'. Closes: #432893
     Thanks to Brian M. Carlson.
   * Add Vcs-Browser and Vcs-Git fields to debian/control.
+  * Add a Homepage field to debian/control (to be changed later when
+    there's a more formal site).
+  * Allow comparing unsupported architectures for equality and identity.
+    Based on a patch by Frank Lichtenheld. Closes: #427210
+  * Document Origin and Bugs fields in deb-control.5. Closes: #173463
+  * Do not replace substvars for build dependencies (it was not supported
+    anyway).
 
   [ Frank Lichtenheld ]
   * Add _MTN to dpkg-source -i default regex. Suggested by Jari Aalto.
   * Convert dpkg-buildpackage to a Perl script.
+    Fix some bugs in the new script detected in experimental:
+    Closes: #444362
   * dpkg-buildpackage accepts a -j<n> option now which will set
     MAKEFLAGS(-j<n>) and DEB_BUILD_OPTIONS(parallel=<n>) accordingly.
     parallel=<n> in DEB_BUILD_OPTIONS will be passed to MAKEFLAGS as
@@ -64,6 +48,14 @@ dpkg (1.14.7~newshlib) experimental; urgency=low
     Jari Aalto. Closes: #440972
   * Rework documentation of dpkg-source's -i and -I options.
     Closes: #323911, #440956
+  * Add --utf8-strings to gpg call in dpkg-buildpackage since
+    that seems to be the better default. Suggested by Székelyi Szabolcs.
+    Closes: #379418
+  * Let dpkg-buildpackage error out early if the version number from
+    the changelog is not a valid Debian version. Closes: #216075
+  * Fix dpkg-source to create correct diffs for files with spaces in
+    their name (apparantly we don't have many of those ;).
+    Based on a patch by Marcel Toele. Closes: #445380
 
   [ Updated dpkg translations ]
   * Basque (Piarres Beobide). Closes: #440859
@@ -83,6 +75,47 @@ dpkg (1.14.7~newshlib) experimental; urgency=low
 
   [ Updated scripts translations ]
   * Correct a typo in the French translation. Closes: #443276
+  * Swedish (Peter Karlsson).
+
+ -- Guillem Jover <guillem@debian.org>  Mon, 08 Oct 2007 07:31:34 +0300
+
+dpkg (1.14.7~newshlib.1) experimental; urgency=low
+
+  * Fixes dpkg-gensymbols to use Dpkg::Gettext instead of recently
+    removed dpkg-gettext.pl.
+
+ -- Raphael Hertzog <hertzog@debian.org>  Tue, 25 Sep 2007 13:42:20 +0200
+
+dpkg (1.14.7~newshlib) experimental; urgency=low
+
+  [ Raphael Hertzog ]
+  * dpkg-shlibdeps has been heavily reworked:
+    * it supports "symbols" files to generate finer-grained
+      dependencies. Closes: #430367
+      Those files can be created by the new dpkg-gensymbols
+      command.
+    * it uses now all paths in RPATH (instead of only the first).
+      Closes: #395942
+    * it's now able to parse include directives in /etc/ld.so.conf.
+      Closes: #431597
+    * libraries are also searched in the public directories of packages
+      being built and thus debian/shlibs.local can effectively define
+      dependencies for libraries that are being built. Closes: #80340
+    * "symbols" files use the full SONAME as key instead of splitting it in
+      (name, version) like the "shlibs" format requires it. This allows
+      binaries to be linked with unversioned libraries and not fail.
+      Closes: #48208
+      Note that unversioned libraries are still a very bad idea.
+    * dpkg-shlibdeps now supports "-x<package>" options that can be used
+      to exclude packages from generated dependencies. This is
+      particalularly useful to avoid dependencies on ourselves when a
+      package contains a binary and a library (without requiring an
+      shlibs.local file to override the usual shlibs file). It might also
+      be used to avoid other unwanted dependencies (use with care though).
+      Closes: #41907, #109954
+    * If dpkg-shlibdeps doesn't find any dependency information for a
+      shared library that is actively used, then it will fail. This can be
+      disabled with the option --ignore-missing-info. Closes: #10807
 
  -- Raphael Hertzog <hertzog@debian.org>  Tue, 25 Sep 2007 08:43:45 +0200
 

debian/control

@@ -5,6 +5,7 @@ Maintainer: Dpkg Developers <team@dpkg.org>
 Uploaders: Frank Lichtenheld <djpig@debian.org>, Guillem Jover <guillem@debian.org>, Brendan O'Dea <bod@debian.org>, Christian Perrier <bubulle@debian.org>
 Origin: debian
 Bugs: debbugs://bugs.debian.org
+Homepage: http://wiki.debian.org/Teams/Dpkg
 Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git
 Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git
 Standards-Version: 3.7.2

man/ChangeLog

@@ -1,3 +1,40 @@
+2007-10-08  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Updated to 1249t0f54u.
+	* Removed the FIXMEs left in de.po by accident
+
+2007-10-08  Guillem Jover  <guillem@debian.org>
+
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot.
+
+2007-10-08  Guillem Jover  <guillem@debian.org>
+
+	* deb-control.5: Document Origin and Bugs fields.
+
+2007-10-07  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-buildpackage.1: Document that fakeroot is now the default
+	value in case -r is not specified.
+
+2007-10-07  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Updated to 1238t0f52u.
+
+2007-09-30  Frank Lichtenheld  <djpig@debian.org>
+
+	* deb-control.5: Remove obsolete sentence regarding
+	the role of the Priority and Section field. They
+	have nothing to do with the archive layout since
+	woody.
+
+	* dpkg-source.1: Remove superfluous [options] from
+	-b command description.
+
+2007-09-28  Peter Karlsson  <peter@softwolves.pp.se>
+
+	* po/sv.po: Updated to 1290t.
+
 2007-09-24  Frank Lichtenheld  <djpig@debian.org>
 
 	* dpkg-source.1: Rework documentation of -i
@@ -26,7 +63,7 @@
 
 2007-09-09  Helge Kreutzmann  <debian@helgefjell.de>
 
-	* po/de.po: Updated to 1254t135f.
+	* po/de.po: Updated to 1254t135u.
 
 2007-09-08  Guillem Jover  <guillem@debian.org>
 

man/deb-control.5

@@ -1,6 +1,6 @@
 .\" Author: Raul Miller
 .\" Includes text from the debian Guidelines by Ian Jackson, Ian Murdock
-.TH deb\-control 5 "2007-08-31" "Debian Project" "Debian"
+.TH deb\-control 5 "2007-10-08" "Debian Project" "Debian"
 .SH NAME
 deb\-control \- Debian packages' master control file format
 .
@@ -65,7 +65,6 @@ In Debian, the
 and
 .B Priority
 fields have a defined set of accepted values based on the Policy Manual.
-They are used to decide how the packages are layed out in the archive.
 A list of these values can be obtained from the latest version of the
 .B debian-policy
 package.
@@ -85,6 +84,13 @@ etc. Note that the
 option is meant for packages that are architecture independent. Some examples
 of this are shell and Perl scripts, and documentation.
 .TP
+.BR Origin: " <name>"
+The name of the distribution this package is originating from.
+.TP
+.BR Bugs: " <url>"
+The url of the bug tracking system for this package. The current used format
+is \fB<bts_type>://<bts_address>\fP, like \fBdebbugs://bugs.debian.org\fP.
+.TP
 .BR Homepage: " <url>"
 The upstream project home page URL.
 .TP

man/dpkg-buildpackage.1

@@ -1,4 +1,4 @@
-.TH dpkg\-buildpackage 1 "2007-07-18" "Debian Project" "dpkg utilities"
+.TH dpkg\-buildpackage 1 "2007-09-28" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-buildpackage \- build binary or source packages from sources
 .
@@ -114,7 +114,8 @@ When
 needs to execute part of the build process as root, it prefixes the
 command it executes with
 .I gain-root-command
-if one has been specified.
+if one has been specified. Otherwise, if none has been specified,
+\fBfakeroot\fP will be used by default, if the command is present.
 .I gain-root-command
 should be the name of a program on the
 .B PATH

man/dpkg-source.1

@@ -42,7 +42,7 @@ extractors' umask; if the parent directory is setgid then the
 extracted directories will be too, and all the files and directories
 will inherit its group ownership.
 .TP
-.RI "\fB\-b\fP [" options "] " directory " [" orig-directory | orig-targz |'']
+.RI "\fB\-b\fP " directory " [" orig-directory | orig-targz |'']
 Build a source package. One or two non-option arguments should
 be supplied. The first is taken as the name of the directory
 containing the unpacked source tree. If a second argument is supplied

po/fr.po

@@ -24,7 +24,7 @@ msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2007-08-18 03:58+0300\n"
-"PO-Revision-Date: 2007-05-21 21:20+0200\n"
+"PO-Revision-Date: 2007-10-03 18:09+0200\n"
 "Last-Translator: Frederic Bothamy <frederic.bothamy@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -350,7 +350,7 @@ msgstr ""
 #: lib/ehandle.c:111
 #, c-format
 msgid "dpkg: too many nested errors during error recovery !!\n"
-msgstr "dpkg : trop d'erreurs imbriquées lors d'une réparation !\n"
+msgstr "dpkg : trop d'erreurs imbriquées lors d'une réparation.\n"
 
 #: lib/ehandle.c:186
 msgid "out of memory for new cleanup entry with many arguments"
@@ -963,7 +963,7 @@ msgstr "
 
 #: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
-msgstr "process_archive ... a déjà disparu !"
+msgstr "process_archive ... a déjà disparu."
 
 #: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
@@ -1180,18 +1180,18 @@ msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
-"dpkg : non, impossible d'autoriser %s (voir --auto-deconfigure) :\n"
+"dpkg : non, impossible d'effectuer %s (voir --auto-deconfigure) :\n"
 "%s"
 
 #: src/archives.c:888
 #, c-format
 msgid "removal of %.250s"
-msgstr "suppression de %.250s"
+msgstr "la suppression de %.250s"
 
 #: src/archives.c:915
 #, c-format
 msgid "installation of %.250s"
-msgstr "installation de %.250s"
+msgstr "l'installation de %.250s"
 
 #: src/archives.c:916
 #, c-format
@@ -1217,7 +1217,7 @@ msgstr ""
 #: src/archives.c:935
 #, c-format
 msgid "dpkg: warning - ignoring breakage, may proceed anyway !\n"
-msgstr "dpkg : avertissement - cassure ignorée, poursuite possible !\n"
+msgstr "dpkg : avertissement - cassure ignorée, poursuite possible.\n"
 
 #: src/archives.c:941
 #, c-format
@@ -1284,7 +1284,7 @@ msgstr "paquets en conflit - %.250s non install
 #: src/archives.c:1052
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
-msgstr "dpkg : avertissement - conflit ignoré, poursuite possible !\n"
+msgstr "dpkg : avertissement - conflit ignoré, poursuite possible.\n"
 
 #: src/archives.c:1090
 #, c-format
@@ -1595,7 +1595,7 @@ msgstr "
 msgid "Don't forget to foreground (`fg') this process when you're done !\n"
 msgstr ""
 "N'oubliez pas de mettre à l'avant-plan (« fg ») ce processus lorsque vous "
-"aurez fini !\n"
+"aurez fini.\n"
 
 #: src/configure.c:561
 #, c-format
@@ -1944,7 +1944,7 @@ msgstr ""
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
 msgstr ""
 "dpkg non enregistré comme installé, impossible de vérifier s'il accepte la\n"
-"notion d'époque !\n"
+"notion d'époque.\n"
 
 #: src/enquiry.c:307
 msgid "--predep-package does not take any argument"
@@ -2839,7 +2839,7 @@ msgid ""
 " in this run !  Only configuring it once.\n"
 msgstr ""
 "Plus d'une copie du paquet %s ont été dépaquetées\n"
-" lors de ce traitement ! Une seule configuration effectuée.\n"
+" lors de ce traitement. Une seule configuration effectuée.\n"
 
 #: src/packages.c:269
 #, c-format
@@ -2939,7 +2939,7 @@ msgstr "
 #: src/processarc.c:152
 #, c-format
 msgid "Verification on package %s failed!"
-msgstr "La vérification du paquet %s a échoué !"
+msgstr "La vérification du paquet %s a échoué."
 
 #: src/processarc.c:154
 #, c-format
@@ -2994,7 +2994,7 @@ msgstr "probl
 #: src/processarc.c:273
 #, c-format
 msgid "dpkg: warning - ignoring pre-dependency problem !\n"
-msgstr "dpkg : avertissement - problème de pré-dépendance ignoré !\n"
+msgstr "dpkg : avertissement - problème de pré-dépendance ignoré\n"
 
 #: src/processarc.c:288
 #, c-format

scripts/controllib.pl

@@ -249,10 +249,7 @@ sub debarch_to_debtriplet($)
     local ($_) = @_;
     my $arch;
 
-    # FIXME: 'any' is handled here, to be able to do debarch_eq('any', foo).
-    if (/^any$/ || /^all$/) {
-	return ($_, $_, $_);
-    } elsif (/^linux-([^-]*)/) {
+    if (/^linux-([^-]*)/) {
 	# XXX: Might disappear in the future, not sure yet.
 	$arch = $1;
     } else {
@@ -288,6 +285,9 @@ sub debwildcard_to_debtriplet($)
 sub debarch_eq($$)
 {
     my ($a, $b) = @_;
+
+    return 1 if ($a eq $b);
+
     my @a = debarch_to_debtriplet($a);
     my @b = debarch_to_debtriplet($b);
 
@@ -299,6 +299,9 @@ sub debarch_eq($$)
 sub debarch_is($$)
 {
     my ($real, $alias) = @_;
+
+    return 1 if ($alias eq $real or $alias eq 'any');
+
     my @real = debarch_to_debtriplet($real);
     my @alias = debwildcard_to_debtriplet($alias);
 

scripts/dpkg-buildpackage.pl

@@ -37,8 +37,7 @@ Usage: %s [<options> ...]
 
 Options:
   -r<gain-root-command>
-                 command to gain root privileges (default is fakeroot if it
-                 exists).
+                 command to gain root privileges (default is fakeroot).
   -p<sign-command>
   -d             do not check build dependencies and conflicts.
   -D             check build dependencies and conflicts.
@@ -79,14 +78,12 @@ Options:
 sub testcommand {
     my ($cmd) = @_;
 
-    return -x "/usr/bin/$cmd";
+    my $fullcmd = `which $cmd`;
+    chomp $fullcmd;
+    return $fullcmd && -x $fullcmd;
 }
 
 my $rootcommand = '';
-if (testcommand('fakeroot')) {
-    $rootcommand = 'fakeroot';
-}
-
 my $signcommand = '';
 if ( ( ($ENV{GNUPGHOME} && -e $ENV{GNUPGHOME})
        || ($ENV{HOME} && -e "$ENV{HOME}/.gnupg") )
@@ -199,6 +196,22 @@ while (@ARGV) {
     }
 }
 
+if ($< == 0) {
+    warning(_g("using a gain-root-command while being root")) if ($rootcommand);
+} else {
+    $rootcommand ||= 'fakeroot';
+
+    if (!testcommand($rootcommand)) {
+	if ($rootcommand eq 'fakeroot') {
+	    error(_g("fakeroot not found, either install the fakeroot\n" .
+	             "package, specify a command with the -r option, " .
+	             "or run this as root"));
+	} else {
+	    error(sprintf(_g("gain-root-commmand '%s' not found"), $rootcommand));
+	}
+    }
+}
+
 unless ($signcommand) {
     $signsource = 0;
     $signchanges = 0;
@@ -258,6 +271,7 @@ sub mustsetvar {
 
 my $pkg = mustsetvar($changes{source}, _g('source package'));
 my $version = mustsetvar($changes{version}, _g('source version'));
+checkversion($version);
 
 my $maintainer;
 if ($changedby) {
@@ -300,7 +314,8 @@ sub signfile {
 
     if ($signinterface eq 'gpg') {
 	system("(cat ../$qfile ; echo '') | ".
-	       "$signcommand --local-user ".quotemeta($signkey||$maintainer).
+	       "$signcommand --utf8-strings --local-user "
+	       .quotemeta($signkey||$maintainer).
 	       " --clearsign --armor --textmode  > ../$qfile.asc");
     } else {
 	system("$signcommand -u ".quotemeta($signkey||$maintainer).
@@ -320,6 +335,7 @@ sub signfile {
 
 
 sub withecho {
+    shift while !$_[0];
     print STDERR " @_\n";
     system(@_)
 	and subprocerr("@_");

scripts/dpkg-gencontrol.pl

@@ -183,8 +183,9 @@ for $_ (keys %fi) {
 		              join("' `", @invalid_archs)))
 		    if @invalid_archs >= 1;
 		grep(debarch_is($host_arch, $_), @archlist) ||
-                    &error(sprintf(_g("current build architecture %s does not".
-                                      " appear in package's list (%s)"),
+		    error(sprintf(_g("current host architecture '%s' does " .
+		                     "not appear in package's architecture " .
+		                     "list (%s)"),
 		                   $host_arch, "@archlist"));
 		$f{$_} = $host_arch;
             }

scripts/dpkg-source.pl

@@ -289,7 +289,7 @@ if ($opmode eq 'build') {
 	    }
 	    elsif (m/^Uploaders$/i) { ($f{$_}= $v) =~ s/[\r\n]//g; }
 	    elsif (m/^Build-(Depends|Conflicts)(-Indep)?$/i) {
-		my $dep = parsedep(substvars($v),1);
+		my $dep = parsedep($v, 1);
 		&error(sprintf(_g("error occurred while parsing %s"), $_)) unless defined $dep;
 		$f{$_}= showdep($dep, 1);
 	    }
@@ -594,10 +594,11 @@ if ($opmode eq 'build') {
 		    $ENV{'LC_ALL'}= 'C';
 		    $ENV{'LANG'}= 'C';
 		    $ENV{'TZ'}= 'UTC0';
-                    exec('diff','-u',
-                         '-L',"$basedirname.orig/$fn",
-                         '-L',"$basedirname/$fn",
-                         '--',"$ofnread","$dir/$fn") or &syserr(_g("exec diff"));
+		    my $tab = ("$basedirname/$fn" =~ / /) ? "\t" : '';
+		    exec('diff','-u',
+			 '-L',"$basedirname.orig/$fn$tab",
+			 '-L',"$basedirname/$fn$tab",
+			 '--',"$ofnread","$dir/$fn") or &syserr(_g("exec diff"));
                 }
 		my $difflinefound = 0;
                 $/= "\n";

scripts/po/ChangeLog

@@ -1,3 +1,7 @@
+2007-09-28  Peter Karlsson  <peterk@debian.org>
+
+	* sv.po: Updated Swedish to 462t.
+
 2007-09-23  Frank Lichtenheld  <djpig@debian.org>
 
 	* dpkg-dev.pot: Regenerated.

scripts/po/sv.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: dpkg 1.14.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2007-09-23 02:59+0200\n"
-"PO-Revision-Date: 2007-08-30 19:55+0100\n"
+"PO-Revision-Date: 2007-09-28 14:18+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"
@@ -381,7 +381,6 @@ msgid "%s is not a supported variable name"
 msgstr "%s är inte ett variabelnamn som stöds"
 
 #: scripts/dpkg-buildpackage.pl:20
-#, fuzzy
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -391,7 +390,7 @@ msgstr ""
 "\n"
 "Copyright © 1996 Ian Jackson.\n"
 "Copyright © 2000 Wichert Akkerman.\n"
-"Copyright © 2006 Frank Lichtenheld."
+"Copyright © 2007 Frank Lichtenheld."
 
 #: scripts/dpkg-buildpackage.pl:32
 #, perl-format
@@ -438,103 +437,140 @@ msgid ""
 "  -h, --help     show this help message.\n"
 "      --version  show the version.\n"
 msgstr ""
+"\n"
+"Använd: %s [<flaggor> ...]\n"
+"\n"
+"Flaggor:\n"
+"  -r<få-root-kommando>\n"
+"                 kommando för att få root-behörighet (standard är fakeroot\n"
+"                 om det finns).\n"
+"  -p<signeringskommando>\n"
+"  -d             kontrollera inte byggberoenden och -konflikter.\n"
+"  -D             kontrollera byggberoenden och -konflikter.\n"
+"  -k<nyckelid>   nyckeln som skall användas vid signering.\n"
+"  -sgpg          signeringskommandot anropas som GPG.\n"
+"  -spgp          signeringskommandot anropas som PGP.\n"
+"  -us            osignerad källkod.\n"
+"  -uc            osignerad changes-fil.\n"
+"  -a<arch>       Debianarkitektur vi bygger för (implicerar -d).\n"
+"  -b             endast binär, bygger inte källkod.  } sänds även till\n"
+"  -B             endast binär, inga ark-ober. filer. } dpkg-genchanges\n"
+"  -S             endast källkod, inga binärfiler     }\n"
+"  -t<system>     välj GNU-systemtyp.           } sänds till dpkg-"
+"architecture\n"
+"  -v<version>    ändringar sedan version <version>.     }\n"
+"  -m<ansvarig>   ansvarig för paketet är <ansvarig>.   }\n"
+"  -e<ansvarig>   ansvarig för utgivningen är <maint>.  } sänds bara\n"
+"  -C<ändrfil>    ändringar beskrivs i <ändrfil>.       } till dpkg-genchangs\n"
+"  -si (standard) källk innehåller orig. för rev. 0/1.  }\n"
+"  -sa            insänd källkod innehåller alltid orig.}\n"
+"  -sd            insänd källkod är endast diff och .dsc}\n"
+"  -sn            force Debian native source format.      } only passed\n"
+"  -s[sAkurKUR]   see dpkg-source for explanation.        } to dpkg-source\n"
+"  -nc            do not clean source tree (implies -b).\n"
+"  -tc            clean source tree when finished.\n"
+"  -ap            add pause before starting signature process.\n"
+"  -W             turn certain errors into warnings.       } passed to\n"
+"  -E             when -W is turned on, -E turns it off.   } dpkg-source\n"
+"  -i[<regex>]    ignore diffs of files matching regex.    } only passed\n"
+"  -I<filename>   filter out files when building tarballs. } to dpkg-source\n"
+"  --admindir=<directory>\n"
+"                 change the administrative directory.\n"
+"  -h, --help     show this help message.\n"
+"      --version  show the version.\n"
 
 #: scripts/dpkg-buildpackage.pl:152 scripts/dpkg-buildpackage.pl:162
 #: scripts/dpkg-buildpackage.pl:169 scripts/dpkg-buildpackage.pl:175
-#, fuzzy, perl-format
+#, perl-format
 msgid "cannot combine %s and %s"
-msgstr "kan inte kombinera -b eller -B och -S"
+msgstr "kan inte kombinera %s och %s"
 
 #: scripts/dpkg-buildpackage.pl:192
-#, fuzzy, perl-format
+#, perl-format
 msgid "unknown option or argument %s"
-msgstr "okänd flagga \"%s\""
+msgstr "okänd flagga eller argument %s"
 
 #: scripts/dpkg-buildpackage.pl:209
 msgid "unknown sign command, assuming pgp style interface"
-msgstr ""
+msgstr "okänt signeringskommando, antar pgp-gränssnittstyp"
 
 #: scripts/dpkg-buildpackage.pl:230
-#, fuzzy, perl-format
+#, perl-format
 msgid "unable to determine %s"
-msgstr "kan inte skapa \"%s\""
+msgstr "kan inte bestämma %s"
 
 #: scripts/dpkg-buildpackage.pl:237
 msgid "source package"
-msgstr ""
+msgstr "källkodspaket"
 
 #: scripts/dpkg-buildpackage.pl:238
 msgid "source version"
-msgstr ""
+msgstr "källkodsversion"
 
 #: scripts/dpkg-buildpackage.pl:246
 msgid "source changed by"
-msgstr ""
+msgstr "källkod ändrad av"
 
 #: scripts/dpkg-buildpackage.pl:264
 msgid "host architecture"
-msgstr ""
+msgstr "värdarkitektur"
 
 #: scripts/dpkg-buildpackage.pl:312
 msgid "Build dependencies/conflicts unsatisfied; aborting.\n"
-msgstr ""
+msgstr "Byggberoenden/-konflikter ej uppfyllda; avbryter.\n"
 
 #: scripts/dpkg-buildpackage.pl:313
 msgid "(Use -d flag to override.)"
-msgstr ""
+msgstr "(Använd flaggan -d för att överstyra.)"
 
 #: scripts/dpkg-buildpackage.pl:335
 msgid "Press the return key to start signing process\n"
-msgstr ""
+msgstr "Tryck på Enter för att inleda signeringsproceduren\n"
 
 #: scripts/dpkg-buildpackage.pl:342
 msgid "Failed to sign .dsc and .changes file"
-msgstr ""
+msgstr "Misslyckades att signera .dsc- och .changes-filerna"
 
 #: scripts/dpkg-buildpackage.pl:363 scripts/dpkg-buildpackage.pl:367
 #: scripts/dpkg-buildpackage.pl:380
-#, fuzzy
 msgid "write changes file"
-msgstr "tolkar ändringslogg"
+msgstr "skriv ändringsfil"
 
 #: scripts/dpkg-buildpackage.pl:379
 msgid "dpkg-genchanges"
-msgstr ""
+msgstr "dpkg-genchanges"
 
 #: scripts/dpkg-buildpackage.pl:392
 msgid "source only upload: Debian-native package"
-msgstr ""
+msgstr "insändning med endast källkod: Debianeget paket"
 
 #: scripts/dpkg-buildpackage.pl:394
 msgid "source only, diff-only upload (original source NOT included)"
-msgstr ""
+msgstr "insändning enbart med källkod, enbart med diff (originalkällkod tas EJ med)"
 
 #: scripts/dpkg-buildpackage.pl:396
-#, fuzzy
 msgid "source only upload (original source is included)"
-msgstr "tar inte med ursprunglig källkod i denna insändning"
+msgstr "insändning enbart med källkod (originalkällkod tas med)"
 
 #: scripts/dpkg-buildpackage.pl:399 scripts/dpkg-buildpackage.pl:407
 msgid "full upload (original source is included)"
-msgstr ""
+msgstr "komplett insändning (originalkällkod tas med)"
 
 #: scripts/dpkg-buildpackage.pl:401
-#, fuzzy
 msgid "binary only upload (no source included)"
-msgstr "endast binär insändning - tar inte med någon källkod"
+msgstr "endast binär insändning (ingen källkod tas med)"
 
 #: scripts/dpkg-buildpackage.pl:403
 msgid "full upload; Debian-native package (full source is included)"
-msgstr ""
+msgstr "komplett insändnig; Debianeget paket (komplett källkod tas med)"
 
 #: scripts/dpkg-buildpackage.pl:405
-#, fuzzy
 msgid "binary and diff upload (original source NOT included)"
-msgstr "endast binär insändning - tar inte med någon källkod"
+msgstr "binär- och diffinsändning (originalkällkod tas EJ med)"
 
 #: scripts/dpkg-buildpackage.pl:412
 msgid "Failed to sign .changes file"
-msgstr ""
+msgstr "Misslyckades att signera .changes-fil"
 
 #: scripts/dpkg-checkbuilddeps.pl:20
 #, perl-format
@@ -932,11 +968,11 @@ msgid "must specify package since control info has many (%s)"
 msgstr "måste ange paket eftersom styrinfo har flera (%s)"
 
 #: scripts/dpkg-gencontrol.pl:180
-#, fuzzy, perl-format
+#, perl-format
 msgid "`%s' is not a legal architecture string."
 msgid_plural "`%s' are not legal architecture strings."
 msgstr[0] "\"%s\" är inte en giltig arkitektursträng."
-msgstr[1] "\"%s\" är inte en giltig arkitektursträng."
+msgstr[1] "\"%s\" är inte giltiga arkitektursträngar."
 
 #: scripts/dpkg-gencontrol.pl:186
 #, perl-format