Subject: unblock: gnupg/1.4.12-5 Package: release.debian.org User: release.debian....@packages.debian.org Usertags: unblock Severity: normal X-Debbugs-CC: 685...@bugs.debian.org X-Debbugs-CC: Daniel Leidert <daniel.leid...@wgdd.de>
Hi, I should have filled this request as a bug to ease the tracking, fixing that now. Le 26/08/2012 15:38, David Prévot a écrit : > Hi Daniel, RT wizards, > > Le 26/08/2012 05:36, Daniel Leidert a écrit : >> Am Mittwoch, den 22.08.2012, 13:29 -0400 schrieb David Prévot: >> >>> Please find attached the French translation updated, proofread by the >>> traduc.org mailing list of contributors. >>> >>> This has already been reported upstream, but it would be nice to ship a >>> proofread and finally complete version in the upcoming Wheezy >>> (translations are still granted a freeze exception). >> >> It's true, that they are granted a freeze exception. But a udeb is >> involved too. Therefor I'm not in favor of touching the package. Other >> opinions? > > CCing the release team who can provide more insight about it. I'm of > course to blame for not providing an updated translation sooner (it's a > huge one, and I updated the upstream 2.0 and 2.1 branches too, allowing > a more complete review process), but would really like to finally see an > up to date translation of this widely used package, especially during > the lifetime of Wheezy. > > Thanks in advance for considering. Attached the current (from the gnupg package repository) debdiff, excluding the translation, since it contains other pending changes that may not be in line with the current freeze policy (so the release team may point what changes could be acceptable or not). Regards David
diffstat for gnupg-1.4.12 gnupg-1.4.12
README.BUGS.Debian | 17 ++++++++++++++++-
changelog | 15 +++++++++++++++
control | 2 +-
rules | 14 +++++++-------
source.lintian-overrides | 2 ++
5 files changed, 41 insertions(+), 9 deletions(-)
diff -Nru --exclude patches gnupg-1.4.12/debian/changelog gnupg-1.4.12/debian/changelog
--- gnupg-1.4.12/debian/changelog 2012-03-10 14:08:15.000000000 -0400
+++ gnupg-1.4.12/debian/changelog 2012-08-26 20:46:23.000000000 -0400
@@ -1,3 +1,17 @@
+gnupg (1.4.12-5) UNRELEASED; urgency=low
+
+ [ Thijs Kinkhorst ]
+ * Build udebs with --enable-minimal.
+ * Add lintian override for gnupg-curl non-conflict.
+
+ [ Daniel Leidert ]
+ * debian/README.BUGS.Debian: Added note about gpg not returning an error
+ message if junk is given after --edit-key/--send-keys (closes: #630388).
+ * patches/685627_french_translation_update.patch: Added.
+ - po/fr.po: French translation proofread and updated (closes: #685627).
+
+ -- Thijs Kinkhorst <th...@debian.org> Mon, 09 Apr 2012 18:44:33 +0200
+
gnupg (1.4.12-4) unstable; urgency=low
* Move mingw64 to B-D-I, adjust make targets. This helps debian-ports
@@ -27,6 +41,7 @@
- Documents keyid-format and with-colons combination (LP: #808295).
- No longer requires readline for gpgv (closes: #592902).
- Fixes man page format error for gpg-zip (closes: #606072).
+ - Fixes gpg manual page (closes: #640140).
* As we're now on 0 patches, and dpatch is supposedly obsoleted,
take the chance to switch to dpkg-source 3.0 (quilt) format.
* Several packaging tweaks to keep Lintian happy.
diff -Nru --exclude patches gnupg-1.4.12/debian/control gnupg-1.4.12/debian/control
--- gnupg-1.4.12/debian/control 2012-03-05 18:19:23.000000000 -0400
+++ gnupg-1.4.12/debian/control 2012-08-26 20:46:23.000000000 -0400
@@ -3,7 +3,7 @@
Priority: important
Maintainer: Debian GnuPG-Maintainers <pkg-gnupg-ma...@lists.alioth.debian.org>
Uploaders: Sune Vuorela <deb...@pusling.com>,
- Daniel Leidert (dale) <daniel.leid...@wgdd.de>,
+ Daniel Leidert <dleid...@debian.org>,
Thijs Kinkhorst <th...@debian.org>
Standards-Version: 3.9.3
Build-Depends: debhelper (>> 7), libz-dev, libldap2-dev, libbz2-dev,
diff -Nru --exclude patches gnupg-1.4.12/debian/README.BUGS.Debian gnupg-1.4.12/debian/README.BUGS.Debian
--- gnupg-1.4.12/debian/README.BUGS.Debian 2012-03-01 05:35:36.000000000 -0400
+++ gnupg-1.4.12/debian/README.BUGS.Debian 2012-08-26 20:46:23.000000000 -0400
@@ -109,4 +109,19 @@
Debian #485458 <URL:http://bugs.debian.org/485458>
- -- Daniel Leidert <daniel.leid...@wgdd.de>, 2009
+gnupg: gpg doesn't print an error if junk is given after --edit-key or
+ --send-key.
+
+ Citing the upstream author in https://bugs.g10code.com/gnupg/issue1090:
+
+ We can't print an error message because that would let gpg treturn with
+ an error code and lead to problems with scripts which assume the current
+ way of doing things. A warning is possible but Unix tools generally
+ don't do that.
+
+ Debian #567597 <URL:http://bugs.debian.org/567597>
+ Debian #630388 <URL:http://bugs.debian.org/630388>
+ Ubuntu #389694 <URL:http://launchpad.net/bugs/389694>
+
+
+ -- Daniel Leidert <daniel.leid...@wgdd.de>, 2012
diff -Nru --exclude patches gnupg-1.4.12/debian/rules gnupg-1.4.12/debian/rules
--- gnupg-1.4.12/debian/rules 2012-03-05 18:20:14.000000000 -0400
+++ gnupg-1.4.12/debian/rules 2012-08-26 20:46:23.000000000 -0400
@@ -19,9 +19,11 @@
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
CONFARGS = --prefix=/usr --libexecdir=/usr/lib/ \
- --enable-mailto --with-mailprog=/usr/sbin/sendmail \
--enable-noexecstack
+CONFARGS_FULL = --enable-mailto --with-mailprog=/usr/sbin/sendmail
+CONFARGS_MINIMAL = --enable-minimal --disable-nls --disable-regex --disable-gnupg-iconv --disable-gettext --without-iconv --without-readline --without-zlib
+
ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
HOSTARG += --host=$(DEB_HOST_GNU_TYPE)
endif
@@ -41,24 +43,22 @@
build-deb/config.status:
dh_testdir
(mkdir -p $(@D); cd $(@D); \
- ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(HOSTARG) --without-libcurl)
+ ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(CONFARGS_FULL) $(HOSTARG) --without-libcurl)
build-deb-curl/config.status:
dh_testdir
(mkdir -p $(@D); cd $(@D); \
- ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(HOSTARG))
+ ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(CONFARGS_FULL) $(HOSTARG))
build-udeb/config.status:
dh_testdir
(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
- ../configure $(CONFARGS) $(HOSTARG) \
- --without-bzip2 --without-readline --without-libcurl)
+ ../configure $(CONFARGS) $(CONFARGS_MINIMAL) $(HOSTARG) )
build-win32/config.status:
dh_testdir
(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
- ../configure $(CONFARGS) --host i686-w64-mingw32 \
- --disable-gnupg-iconv --without-bzip2 --without-readline --without-libcurl --disable-ldap)
+ ../configure $(CONFARGS) $(CONFARGS_MINIMAL) --host i686-w64-mingw32 )
##################################### build ##################################
diff -Nru --exclude patches gnupg-1.4.12/debian/source.lintian-overrides gnupg-1.4.12/debian/source.lintian-overrides
--- gnupg-1.4.12/debian/source.lintian-overrides 1969-12-31 20:00:00.000000000 -0400
+++ gnupg-1.4.12/debian/source.lintian-overrides 2012-08-26 20:46:23.000000000 -0400
@@ -0,0 +1,2 @@
+gnupg source: binaries-have-file-conflict gnupg gnupg-curl usr/lib/gnupg/gpgkeys_curl
+gnupg source: binaries-have-file-conflict gnupg gnupg-curl usr/lib/gnupg/gpgkeys_hkp
signature.asc
Description: OpenPGP digital signature
