Merge branch 'debian/master' into debian/stretch-backports
Roger Shimizu
5 years ago
| 0 | gpgme1.0 (1.11.1-2) unstable; urgency=medium | |
| 1 | ||
| 2 | * acknowledge NMU (thanks, Adrian!) | |
| 3 | * allow rebuild with older versions of libgpg-error | |
| 4 | * drop python3.5, try to add 3.7 | |
| 5 | * d/changelog: strip trailing whitespace | |
| 6 | * Standards-Version: bump to 4.2.1 (no changes needed) | |
| 7 | * use dh_missing explicitly | |
| 8 | * avoid shipping gpgme-json yet (we will ship it next release) | |
| 9 | ||
| 10 | -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 09 Oct 2018 01:42:48 -0400 | |
| 11 | ||
| 12 | gpgme1.0 (1.11.1-1.1) unstable; urgency=medium | |
| 13 | ||
| 14 | * Non-maintainer upload. | |
| 15 | * Bump the libgpg-error-dev build dependency to >= 1.28. | |
| 16 | (Closes: #898120) | |
| 17 | ||
| 18 | -- Adrian Bunk <bunk@debian.org> Sun, 23 Sep 2018 12:57:39 +0300 | |
| 19 | ||
| 0 | 20 | gpgme1.0 (1.11.1-1~bpo9+1) stretch-backports; urgency=medium |
| 1 | 21 | |
| 2 | 22 | [ Jacob Adams ] |
| 840 | 860 | * Initial Release (closes: #84233) |
| 841 | 861 | |
| 842 | 862 | -- Jose Carlos Garcia Sogo <jose@jaimedelamo.eu.org> Mon, 30 Apr 2001 19:34:26 +0200 |
| 843 | ||
| 12 | 12 | gnupg2 | gnupg (>= 2), |
| 13 | 13 | gpgsm, |
| 14 | 14 | libassuan-dev (>= 2.4.2), |
| 15 | libgpg-error-dev (>= 1.29), | |
| 15 | libgpg-error-dev (>= 1.24), | |
| 16 | 16 | pkg-config, |
| 17 | 17 | python-all-dev, |
| 18 | 18 | python3-dev, |
| 23 | 23 | Build-Depends-Indep: |
| 24 | 24 | doxygen, |
| 25 | 25 | graphviz, |
| 26 | Standards-Version: 4.1.4 | |
| 26 | Standards-Version: 4.2.1 | |
| 27 | 27 | Homepage: https://www.gnupg.org/related_software/gpgme/ |
| 28 | 28 | Vcs-Git: https://salsa.debian.org/debian/gpgme.git |
| 29 | 29 | Vcs-Browser: https://salsa.debian.org/debian/gpgme |
| 0 | From: Werner Koch <wk@gnupg.org> | |
| 1 | Date: Tue, 5 Jun 2018 09:40:17 +0200 | |
| 2 | Subject: json: Allow compiling with libgpg-error < 1.28 | |
| 3 | ||
| 4 | * src/cJSON.c: Use gpgrt functions only if available. | |
| 5 | -- | |
| 6 | ||
| 7 | We have a hack in gpgme-json to allow building with older libgpg-error | |
| 8 | versions. That whole thing will not work but the instead the binary | |
| 9 | will print an error at runtime that it needs to be build with a newer | |
| 10 | libgcrypt. There was a little bug here for the Debian packages | |
| 11 | libgpg-error versions which failed to build cJSON. cJSON is only | |
| 12 | needed be the full gpgme-json but nevertheless the Makefile wants to | |
| 13 | build it. The fix is straightforward. | |
| 14 | ||
| 15 | GnuPG-bug-id: 3971 | |
| 16 | Signed-off-by: Werner Koch <wk@gnupg.org> | |
| 17 | (cherry picked from commit 998fec8a4fbc46315fe6836980954eed402b38c5) | |
| 18 | --- | |
| 19 | src/cJSON.c | 4 ++-- | |
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 21 | ||
| 22 | diff --git a/src/cJSON.c b/src/cJSON.c | |
| 23 | index cf0cb13..38cb152 100644 | |
| 24 | --- a/src/cJSON.c | |
| 25 | +++ b/src/cJSON.c | |
| 26 | @@ -41,13 +41,13 @@ | |
| 27 | #include "cJSON.h" | |
| 28 | ||
| 29 | /* We use malloc function wrappers from gpgrt (aka libgpg-error). */ | |
| 30 | -#if 1 | |
| 31 | +#if GPGRT_VERSION_NUMBER >= 0x011c00 /* 1.28 */ | |
| 32 | # include <gpgrt.h> | |
| 33 | # define xtrymalloc(a) gpgrt_malloc ((a)) | |
| 34 | # define xtrycalloc(a,b) gpgrt_calloc ((a), (b)) | |
| 35 | # define xtrystrdup(a) gpgrt_strdup ((a)) | |
| 36 | # define xfree(a) gpgrt_free ((a)) | |
| 37 | -#else | |
| 38 | +#else /* Without gpgrt (aka libgpg-error). */ | |
| 39 | # define xtrymalloc(a) malloc ((a)) | |
| 40 | # define xtrycalloc(a,b) calloc ((a), (b)) | |
| 41 | # define xtrystrdup(a) strdup ((a)) |
| 11 | 11 | dh_auto_configure -- \ |
| 12 | 12 | --enable-static \ |
| 13 | 13 | --enable-languages="python cpp qt" \ |
| 14 | PYTHON_VERSIONS="2.7 3.5 3.6" \ | |
| 14 | PYTHON_VERSIONS="2.7 3.6 3.7" \ | |
| 15 | 15 | --infodir=/usr/share/info |
| 16 | 16 | |
| 17 | override_dh_install: | |
| 18 | dh_install --list-missing -X.la -Xinfo/dir -X.pyc -Xinstall_files.txt -X__pycache__ | |
| 17 | override_dh_missing: | |
| 18 | dh_missing --list-missing -X.la -Xinfo/dir -X.pyc -Xinstall_files.txt -X__pycache__ -Xgpgme-json | |
| 19 | 19 | |
| 20 | 20 | override_dh_makeshlibs: |
| 21 | 21 | dh_makeshlibs -V |