diff -Nru gpgme1.0-1.4.3/debian/changelog gpgme1.0-1.4.3/debian/changelog --- gpgme1.0-1.4.3/debian/changelog 2013-12-22 11:36:34.000000000 +0100 +++ gpgme1.0-1.4.3/debian/changelog 2014-04-07 21:55:13.000000000 +0200 @@ -1,3 +1,13 @@ +gpgme1.0 (1.4.3-0.1ubuntu4) trusty; urgency=medium + + * Re-enable support for gpgsm and gpgconf. (LP: #1293704) + * Disable test that checks if the backend exectuable is the configured one. + gpgme prefers gpg2 when installed but is configured to use gpg which + causes a mismatch in the test. + - Add test_engine_ignore_filename.diff + + -- Felix Geyer Fri, 04 Apr 2014 18:58:01 +0200 + gpgme1.0 (1.4.3-0.1ubuntu3) trusty; urgency=medium * Build using dh-autoreconf. diff -Nru gpgme1.0-1.4.3/debian/control gpgme1.0-1.4.3/debian/control --- gpgme1.0-1.4.3/debian/control 2013-12-22 11:36:13.000000000 +0100 +++ gpgme1.0-1.4.3/debian/control 2014-04-07 21:52:30.000000000 +0200 @@ -7,6 +7,8 @@ debhelper (>> 9~), gnupg-agent, gnupg, + gnupg2, + gpgsm, libassuan-dev (>> 2.0.2), libgpg-error-dev (>> 1.8), scdaemon diff -Nru gpgme1.0-1.4.3/debian/patches/series gpgme1.0-1.4.3/debian/patches/series --- gpgme1.0-1.4.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ gpgme1.0-1.4.3/debian/patches/series 2014-04-07 21:52:30.000000000 +0200 @@ -0,0 +1 @@ +test_engine_ignore_filename.diff diff -Nru gpgme1.0-1.4.3/debian/patches/test_engine_ignore_filename.diff gpgme1.0-1.4.3/debian/patches/test_engine_ignore_filename.diff --- gpgme1.0-1.4.3/debian/patches/test_engine_ignore_filename.diff 1970-01-01 01:00:00.000000000 +0100 +++ gpgme1.0-1.4.3/debian/patches/test_engine_ignore_filename.diff 2014-04-07 21:54:04.000000000 +0200 @@ -0,0 +1,20 @@ +Description: Disable test that checks if the backend exectuable is the + configured one. gpgme prefers gpg2 when installed but is configured to + use gpg which causes a mismatch in the test. +Author: Felix Geyer + +--- gpgme1.0-1.4.3.orig/tests/t-engine-info.c ++++ gpgme1.0-1.4.3/tests/t-engine-info.c +@@ -52,12 +52,6 @@ check_engine_info (gpgme_engine_info_t i + info->protocol, protocol); + exit (1); + } +- if (strcmp (info->file_name, file_name)) +- { +- fprintf (stderr, "Unexpected file name to executable %s (expected %s instead)\n", +- info->file_name, file_name); +- exit (1); +- } + if (strcmp (info->req_version, req_version)) + { + fprintf (stderr, "Unexpected required version %s (expected %s instead)\n", diff -Nru gpgme1.0-1.4.3/debian/rules gpgme1.0-1.4.3/debian/rules --- gpgme1.0-1.4.3/debian/rules 2013-12-22 11:35:59.000000000 +0100 +++ gpgme1.0-1.4.3/debian/rules 2014-04-07 21:52:30.000000000 +0200 @@ -14,7 +14,9 @@ --enable-static \ --disable-fd-passing \ --infodir=/usr/share/info \ - --with-gpg=/usr/bin/gpg + --with-gpg=/usr/bin/gpg \ + --with-gpgsm=/usr/bin/gpgsm \ + --with-gpgconf=/usr/bin/gpgconf override_dh_install: dh_install --list-missing -X.la -Xinfo/dir