diff -Nru p11-kit-0.20.2/debian/changelog p11-kit-0.20.2/debian/changelog --- p11-kit-0.20.2/debian/changelog 2014-03-20 17:28:52.000000000 +0000 +++ p11-kit-0.20.2/debian/changelog 2014-04-13 16:32:55.000000000 +0000 @@ -1,17 +1,27 @@ -p11-kit (0.20.2-2ubuntu2) trusty; urgency=medium +p11-kit (0.20.2-5) unstable; urgency=medium - * Add Breaks and Replaces for p11-kit-modules file move. (LP: #1295240) + [ Manuel A. Fernandez Montecelo ] + * Build-Depend on and use dh-autoreconf to regenerate config.{sub,guess} and + support new architectures more easily. Closes: #744400 + + [ Andreas Metzler ] + * Drop 31_autoreconf.diff, and change enable_locale.diff to patch + configure.ac instead of configure. - -- Iain Lane Thu, 20 Mar 2014 17:20:08 +0000 + -- Andreas Metzler Sun, 13 Apr 2014 18:20:40 +0200 -p11-kit (0.20.2-2ubuntu1) trusty; urgency=medium +p11-kit (0.20.2-4) unstable; urgency=medium - * Resynchronise with Debian, remaining changes: - - Use dh-autoreconf - - Update debian/patches/enable_locale.diff to act on configure.ac too. - Thanks to Chris J Arges. + * Add missing Breaks/Replaces p11-kit to p11-kit-modules. (Thanks, Iain + Lane) Closes: #742204 - -- Iain Lane Thu, 20 Mar 2014 14:22:25 +0000 + -- Andreas Metzler Thu, 20 Mar 2014 18:52:42 +0100 + +p11-kit (0.20.2-3) unstable; urgency=medium + + * Upload to unstable. + + -- Andreas Metzler Thu, 20 Mar 2014 16:42:15 +0100 p11-kit (0.20.2-2) experimental; urgency=medium diff -Nru p11-kit-0.20.2/debian/control p11-kit-0.20.2/debian/control --- p11-kit-0.20.2/debian/control 2014-03-20 17:26:33.000000000 +0000 +++ p11-kit-0.20.2/debian/control 2014-04-13 16:18:09.000000000 +0000 @@ -1,9 +1,8 @@ Source: p11-kit Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian GnuTLS Maintainers +Maintainer: Debian GnuTLS Maintainers Uploaders: Andreas Metzler -Build-Depends: debhelper (>= 9), dh-autoreconf, autotools-dev, pkg-config, libtasn1-6-dev, +Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, libtasn1-6-dev, libffi-dev Standards-Version: 3.9.5 Section: libs @@ -62,9 +61,9 @@ Section: misc Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libp11-kit0 (= ${binary:Version}) +Breaks: p11-kit (<= 0.20.2-1) +Replaces: p11-kit (<= 0.20.2-1) Multi-Arch: same -Breaks: p11-kit (<< 0.20.2-2) -Replaces: p11-kit (<< 0.20.2-2) Description: p11-glue proxy and trust modules Provides a way to load and enumerate PKCS#11 modules. Provides a standard configuration setup for installing PKCS#11 modules in such a way that diff -Nru p11-kit-0.20.2/debian/patches/31_autoreconf.diff p11-kit-0.20.2/debian/patches/31_autoreconf.diff --- p11-kit-0.20.2/debian/patches/31_autoreconf.diff 2013-12-01 13:25:05.000000000 +0000 +++ p11-kit-0.20.2/debian/patches/31_autoreconf.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -Description: autoconf-changes for 30_nogetauxvalonbsd.diff. -Origin: vendor -Bug-Debian: http://bugs.debian.org/718285 -Author: Andreas Metzler -Last-Update: 2013-09-07 - ---- p11-kit-0.20.0.orig/configure -+++ p11-kit-0.20.0/configure -@@ -15832,6 +15832,16 @@ _ACEOF - os_win32=yes - os_unix=no - ;; -+ *-*-linux*) -+ -+cat >>confdefs.h <<_ACEOF -+#define OS_UNIX 1 -+_ACEOF -+ -+ os_win32=no -+ os_unix=yes -+ os_linux=yes -+ ;; - *) - - cat >>confdefs.h <<_ACEOF -@@ -16353,6 +16363,7 @@ _ACEOF - fi - done - -+ if test "$os_linux" = "yes"; then - for ac_func in getauxval issetugid getresuid - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -@@ -16365,6 +16376,22 @@ _ACEOF - fi - done - -+ else -+ # Do not use getauxval on non-linux, e.g BSD. -+ for ac_func in issetugid getresuid -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ -+ fi -+ - for ac_func in strnstr memdup strndup strerror_r - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff -Nru p11-kit-0.20.2/debian/patches/enable_locale.diff p11-kit-0.20.2/debian/patches/enable_locale.diff --- p11-kit-0.20.2/debian/patches/enable_locale.diff 2014-01-18 22:09:46.000000000 +0000 +++ p11-kit-0.20.2/debian/patches/enable_locale.diff 2014-04-13 16:30:35.000000000 +0000 @@ -1,26 +1,11 @@ Description: enable building of gettext translations. Author: Andreas Metzler -Last-Update: 2013-09-07 +Last-Update: 2014-04-13 +Origin: vendor -Index: b/configure -=================================================================== ---- a/configure -+++ b/configure -@@ -14752,9 +14752,6 @@ - fi - fi - --LINGUAS="" -- -- - - - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -37,7 +37,6 @@ +--- p11-kit-0.20.2.orig/configure.ac ++++ p11-kit-0.20.2/configure.ac +@@ -37,7 +37,6 @@ AC_PROG_CPP AM_PROG_CC_C_O PKG_PROG_PKG_CONFIG diff -Nru p11-kit-0.20.2/debian/patches/series p11-kit-0.20.2/debian/patches/series --- p11-kit-0.20.2/debian/patches/series 2014-01-18 18:36:09.000000000 +0000 +++ p11-kit-0.20.2/debian/patches/series 2014-04-13 16:27:25.000000000 +0000 @@ -1,3 +1,2 @@ 30_nogetauxvalonbsd.diff -31_autoreconf.diff enable_locale.diff