[Pkg-privacy-commits] [seahorse-nautilus] 14/26: Do not patch configure script directly.

[Carlos Maddela]

This is an automated email from the git hooks/post-receive script.

maddela-guest pushed a commit to branch master
in repository seahorse-nautilus.

commit 5f55ac9c88864306962e4d9a91d8b9f55e29670d
Author: Carlos Maddela <e7appew at gmail.com>
Date:   Sun Jan 8 08:58:47 2017 +1100

    Do not patch configure script directly.
    
    Directly patching the configure script interferes with the
    backing up and restoration of mutable files, so we instead
    just patch configure.ac and let autoreconf handle the rest.
---
 debian/patches/gpg21.patch | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/patches/gpg21.patch b/debian/patches/gpg21.patch
index 15a62a6..9b52246 100644
--- a/debian/patches/gpg21.patch
+++ b/debian/patches/gpg21.patch
@@ -1,12 +1,24 @@
+From: Adrian Bunk <bunk at stusta.de>
+Date: Tue, 20 Sep 2016 12:23:21 +0300
+Subject: Accept GnuPG 2.1
+
 Description: Accept GnuPG 2.1
  This is the minimum change to fix the build,
  upstream fixed this as part of a bigger change in 3.18
 Author: Adrian Bunk <bunk at stusta.de>
 Bug-Debian: https://bugs.debian.org/835675
 Forwarded: not-needed
+Last-Update: 2017-01-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
---- seahorse-nautilus-3.11.92.orig/configure.ac
-+++ seahorse-nautilus-3.11.92/configure.ac
+diff --git a/configure.ac b/configure.ac
+index 471b34d..ac56984 100644
+--- a/configure.ac
++++ b/configure.ac
 @@ -57,7 +57,7 @@ AC_ARG_ENABLE(gpg-check,
  	DO_CHECK=$enableval, DO_CHECK=yes)
  
@@ -16,14 +28,3 @@ Forwarded: not-needed
  	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
  	ok="no"
  	if test "$GNUPG" != "no"; then
---- seahorse-nautilus-3.11.92.orig/configure
-+++ seahorse-nautilus-3.11.92/configure
-@@ -14879,7 +14891,7 @@ fi
- 
- 
- if test	"$DO_CHECK" = "yes"; then
--	accepted_versions="1.2 1.4 2.0"
-+	accepted_versions="1.2 1.4 2.0 2.1"
- 	for ac_prog in gpg gpg2
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/seahorse-nautilus.git