Merge branch 'master' of git+ssh://kreutzm-guest@git.debian.org/git/dpkg/dpkg

Conflicts:

	man/ChangeLog

ChangeLog

@@ -1,3 +1,24 @@
+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

debian/changelog

@@ -30,6 +30,11 @@ dpkg (1.14.7) UNRELEASED; 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
 
   [ Updated dpkg translations ]
   * Basque (Piarres Beobide). Closes: #440859

man/ChangeLog

@@ -2,6 +2,16 @@
 
 	* 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.

man/deb-control.5

@@ -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.

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/dpkg-buildpackage.pl

@@ -79,7 +79,9 @@ Options:
 sub testcommand {
     my ($cmd) = @_;
 
-    return -x "/usr/bin/$cmd";
+    my $fullcmd = `which $cmd`;
+    chomp $fullcmd;
+    return $fullcmd && -x $fullcmd;
 }
 
 my $rootcommand = '';
@@ -258,6 +260,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 +303,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).