The branch, master has been updated
via 5ccf37476af8770e152d5c7f630984f8b39403e2 (commit)
via da1ac541d9db84cdaedc32ebce2878e0091e45c7 (commit)
via a129e78367a93df262eb3bae368852c75e2d53dc (commit)
from 6ec95b294ac8c985c5b3738b24cd9b5dc0d57ed7 (commit)
- Shortlog ------------------------------------------------------------
5ccf374 dpkg-buildpackage: check version validity early
da1ac54 dpkg-buildpackage: Make the testcommand more sensible
a129e78 dpkg-buildpackage: Call gpg with --utf8-strings
Summary of changes:
ChangeLog | 21 +++++++++++++++++++++
debian/changelog | 5 +++++
scripts/dpkg-buildpackage.pl | 8 ++++++--
3 files changed, 32 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 5ccf37476af8770e152d5c7f630984f8b39403e2
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sat Sep 29 16:45:24 2007 +0200
dpkg-buildpackage: check version validity early
error out early if the version number from the changelog
is not a valid Debian version.
diff --git a/ChangeLog b/ChangeLog
index 6fa71cc..b1eafab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-09-29 Frank Lichtenheld <[EMAIL PROTECTED]>
+ * 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`.
diff --git a/debian/changelog b/debian/changelog
index c18f59d..6c33f1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ dpkg (1.14.7) UNRELEASED; urgency=low
* 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
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 1387cab..f34a8c6 100644
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -260,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) {
commit da1ac541d9db84cdaedc32ebce2878e0091e45c7
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sat Sep 29 16:36:18 2007 +0200
dpkg-buildpackage: Make the testcommand more sensible
Instead of testing /usr/bin/$cmd, test `which $cmd`.
diff --git a/ChangeLog b/ChangeLog
index 1eef0d5..6fa71cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-09-29 Frank Lichtenheld <[EMAIL PROTECTED]>
+ * 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.
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 88b3d12..1387cab 100644
--- a/scripts/dpkg-buildpackage.pl
+++ b/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 = '';
commit a129e78367a93df262eb3bae368852c75e2d53dc
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sat Sep 29 16:20:11 2007 +0200
dpkg-buildpackage: Call gpg with --utf8-strings
(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.
diff --git a/ChangeLog b/ChangeLog
index e2f2981..1eef0d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-09-29 Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* scripts/dpkg-buildpackage.pl (withecho): Remove
diff --git a/debian/changelog b/debian/changelog
index 410c703..c18f59d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ 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
[ Updated dpkg translations ]
* Basque (Piarres Beobide). Closes: #440859
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 73beace..88b3d12 100644
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -300,7 +300,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).
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
