On 2014-06-29 Andreas Metzler <[email protected]> wrote: [...] > libgcrypt20 (1.6) has dropped the module register subsystem and therefore > the configure test which checks for GCRY_MODULE_ID_USER fails.
> Please make the necessary chages to allow building against > libgcrypt20-dev. Find a patch attached. cu Andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
diff -Nru shishi-1.0.2/debian/changelog shishi-1.0.2/debian/changelog --- shishi-1.0.2/debian/changelog 2014-07-18 13:15:14.000000000 +0200 +++ shishi-1.0.2/debian/changelog 2014-07-18 16:21:55.000000000 +0200 @@ -1,3 +1,13 @@ +shishi (1.0.2-3.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use dh-autoreconf instead of autotools-dev. (Thanks, Logan Rosen) + Closes: #733582 + * fix_gcrypt_detection.diff: Correct autoconf macro to also accept gcrypt + 1.6. Closes: #753150 + + -- Andreas Metzler <[email protected]> Fri, 18 Jul 2014 15:22:51 +0200 + shishi (1.0.2-3.1) unstable; urgency=medium * Non-maintainer upload. (LowNMU) diff -Nru shishi-1.0.2/debian/control shishi-1.0.2/debian/control --- shishi-1.0.2/debian/control 2014-07-18 13:08:31.000000000 +0200 +++ shishi-1.0.2/debian/control 2014-07-18 16:12:43.000000000 +0200 @@ -3,8 +3,8 @@ Priority: extra Maintainer: Debian Shishi Team <[email protected]> Uploaders: Simon Josefsson <[email protected]>, Russ Allbery <[email protected]> -Build-Depends: debhelper (>= 5.0.24), cdbs, autotools-dev, libidn11-dev, - libgnutls28-dev, libgcrypt11-dev, libtasn1-6-dev, libpam0g-dev, +Build-Depends: debhelper (>= 5.0.24), cdbs, dh-autoreconf, libidn11-dev, + libgnutls28-dev, libgcrypt20-dev, libtasn1-6-dev, libpam0g-dev, valgrind [amd64 i386 powerpc], texinfo, texlive-latex-base, gtk-doc-tools Standards-Version: 3.9.4 Vcs-Git: git://gitorious.org/gss/shishi-dpkg.git diff -Nru shishi-1.0.2/debian/patches/fix_gcrypt_detection.diff shishi-1.0.2/debian/patches/fix_gcrypt_detection.diff --- shishi-1.0.2/debian/patches/fix_gcrypt_detection.diff 1970-01-01 01:00:00.000000000 +0100 +++ shishi-1.0.2/debian/patches/fix_gcrypt_detection.diff 2014-07-18 16:20:31.000000000 +0200 @@ -0,0 +1,26 @@ +Description: Fix autoconf gnutls detection to also accept gcrypt 1.6. +Author: Andreas Metzler <[email protected]> +Bug-Debian: http://bugs.debian.org/753150 +Origin: vendor +Forwarded: no +Last-Update: 2014-07-18 + +--- shishi-1.0.2.orig/gl/m4/gc.m4 ++++ shishi-1.0.2/gl/m4/gc.m4 +@@ -12,10 +12,12 @@ AC_DEFUN([gl_GC], + if test "$libgcrypt" != no; then + AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [ + #include <gcrypt.h> +-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c +- will fail on startup if we don't have 1.4.4 or later, so +- test for it early. */ +-#if !defined GCRY_MODULE_ID_USER ++/* gc-libgcrypt.c will fail on startup if we don't have libgcrypt 1.4.4 or ++ later, test for it early. by checking for either ++ - GCRY_MODULE_ID_USER which was added in 1.4.4 and dropped in 1.6 or ++ - GCRYPT_VERSION_NUMBER which was added in 1.6. ++ */ ++#if !defined GCRY_MODULE_ID_USER && !defined GCRYPT_VERSION_NUMBER + error too old libgcrypt + #endif + ]) diff -Nru shishi-1.0.2/debian/patches/series shishi-1.0.2/debian/patches/series --- shishi-1.0.2/debian/patches/series 2013-11-03 21:27:39.000000000 +0100 +++ shishi-1.0.2/debian/patches/series 2014-07-18 16:20:59.000000000 +0200 @@ -1 +1,2 @@ 64bigendian-ftbfs.diff +fix_gcrypt_detection.diff diff -Nru shishi-1.0.2/debian/rules shishi-1.0.2/debian/rules --- shishi-1.0.2/debian/rules 2013-11-03 20:21:18.000000000 +0100 +++ shishi-1.0.2/debian/rules 2014-07-18 15:23:17.000000000 +0200 @@ -3,6 +3,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=shishi-dbg include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/class/autotools.mk DEB_DH_MAKESHLIBS_ARGS_libshishi0 = -V'libshishi0 (>= $(DEB_UPSTREAM_VERSION))'
_______________________________________________ Help-shishi mailing list [email protected] https://lists.gnu.org/mailman/listinfo/help-shishi
