[Pkg-gnupg-commit] r286 - in /gpa/branches/experimental/debian: changelog control patches/ patches/gnupg2.patch patches/series rules

[dleidert at users.alioth.debian.org]

Author: dleidert
Date: Sat Aug 11 17:02:11 2012
New Revision: 286

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=286
Log:
* debian/control (Build-Depends): Added dh-autoreconf.
* debian/rules: Added autoreconf addon.
* debian/patches/gnupg2.patch: Added.
  - configure.ac: Check for gnupg2 binary and helpers.
* debian/patches/series: Adjusted.

Added:
    gpa/branches/experimental/debian/patches/
    gpa/branches/experimental/debian/patches/gnupg2.patch
    gpa/branches/experimental/debian/patches/series
Modified:
    gpa/branches/experimental/debian/changelog
    gpa/branches/experimental/debian/control
    gpa/branches/experimental/debian/rules

Modified: gpa/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/branches/experimental/debian/changelog?rev=286&op=diff
==============================================================================
--- gpa/branches/experimental/debian/changelog (original)
+++ gpa/branches/experimental/debian/changelog Sat Aug 11 17:02:11 2012
@@ -2,8 +2,12 @@
 
   * NOT RELEASED YET
   * New upstream release.
+  * debian/control (Build-Depends): Added dh-autoreconf.
+  * debian/rules: Added autoreconf addon.
   * debian/patches/fix_segfault_filehandler.patch: Dropped (applied upstream).
-  * debian/patches/series: Removed.
+  * debian/patches/gnupg2.patch: Added.
+    - configure.ac: Check for gnupg2 binary and helpers.
+  * debian/patches/series: Adjusted.
 
  -- Daniel Leidert <dleidert at debian.org>  Sun, 08 Jul 2012 14:26:14 +0200
 

Modified: gpa/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/branches/experimental/debian/control?rev=286&op=diff
==============================================================================
--- gpa/branches/experimental/debian/control (original)
+++ gpa/branches/experimental/debian/control Sat Aug 11 17:02:11 2012
@@ -5,6 +5,7 @@
 Uploaders: Daniel Leidert <dleidert at debian.org>
 Build-Depends: autotools-dev (>> 20100122.1~),
                debhelper (>> 7.0.50~),
+               dh-autoreconf,
                gnupg2,
                libassuan-dev (>> 2),
                libgpg-error-dev (>> 1.4),

Added: gpa/branches/experimental/debian/patches/gnupg2.patch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/branches/experimental/debian/patches/gnupg2.patch?rev=286&op=file
==============================================================================
--- gpa/branches/experimental/debian/patches/gnupg2.patch (added)
+++ gpa/branches/experimental/debian/patches/gnupg2.patch Sat Aug 11 17:02:11 2012
@@ -1,0 +1,24 @@
+Author: Daniel Leidert <dleidert at debian.org>
+Description: Make sure to check for gnupg2 binary and helpers.
+Forwarded: no
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,7 +145,7 @@
+ AC_CHECK_TOOL(WINDRES, windres, :)
+ 
+ if test -z "$GPG"; then
+-  AC_PATH_PROG(GPG, gpg)
++  AC_PATH_PROG(GPG, gpg2)
+   if test -z "$GPG"; then
+        AC_MSG_ERROR([[
+ ***
+@@ -157,7 +157,7 @@
+ fi
+ 
+ dnl Find the keyserver plugins. Assume that gpgkeys_ldap is always available
+-AC_PATH_PROGS(GPGKEYS_LDAP, gpg2keys_ldap gpgkeys_ldap,
++AC_PATH_PROGS(GPGKEYS_LDAP, gpg2keys_ldap,
+              [${libexecdir}/gnupg/gpg2keys_ldap],
+              [$PATH:/usr/libexec/gnupg:/usr/lib/gnupg2:/usr/lib/gnupg])
+ KEYSERVER_HELPERS_DIR=`dirname $GPGKEYS_LDAP`

Added: gpa/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/branches/experimental/debian/patches/series?rev=286&op=file
==============================================================================
--- gpa/branches/experimental/debian/patches/series (added)
+++ gpa/branches/experimental/debian/patches/series Sat Aug 11 17:02:11 2012
@@ -1,0 +1,1 @@
+gnupg2.patch

Modified: gpa/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/branches/experimental/debian/rules?rev=286&op=diff
==============================================================================
--- gpa/branches/experimental/debian/rules (original)
+++ gpa/branches/experimental/debian/rules Sat Aug 11 17:02:11 2012
@@ -8,7 +8,7 @@
 export LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 %:
-	dh $@ --with autotools_dev --parallel
+	dh $@ --with autotools_dev,autoreconf --parallel
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS