r49520 - in /desktop/unstable/libcryptui/debian: changelog patches/02_seahorse-daemon_libcryptui_static_link.patch patches/git_allow-gpg2-2.1.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Mon Aug 15 16:09:57 2016
New Revision: 49520

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49520
Log:
* debian/copyright: Use https for copyright headers
* debian/watch: Use https and use new "special strings"
* Have quilt refresh d/p/02_seahorse-daemon_libcryptui_static_link.patch
* Add debian/patch/git_allow-gpg2-2.1.patch (Closes: #834008)

Added:
    desktop/unstable/libcryptui/debian/patches/git_allow-gpg2-2.1.patch
Modified:
    desktop/unstable/libcryptui/debian/changelog
    desktop/unstable/libcryptui/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch
    desktop/unstable/libcryptui/debian/patches/series

Modified: desktop/unstable/libcryptui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/changelog?rev=49520&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libcryptui/debian/changelog	[utf-8] Mon Aug 15 16:09:57 2016
@@ -1,4 +1,4 @@
-libcryptui (3.12.2-2) UNRELEASED; urgency=medium
+libcryptui (3.12.2-2) unstable; urgency=medium
 
   [ Laurent Bigonville ]
   * Drop debian/patches/01_autostart_path.patch: Almost all the .desktop files
@@ -6,9 +6,15 @@
     nothing in the code uses the define.
 
   [ Jeremy Bicha ]
+  * debian/copyright: Use https for copyright headers
+  * debian/watch: Use https and use new "special strings"
   * Have seahorse-daemon depend on gnupg2 to match seahorse
 
- -- Laurent Bigonville <bigon at debian.org>  Wed, 04 May 2016 13:43:59 +0200
+  [ Andreas Henriksson ]
+  * Have quilt refresh d/p/02_seahorse-daemon_libcryptui_static_link.patch
+  * Add debian/patch/git_allow-gpg2-2.1.patch (Closes: #834008)
+
+ -- Andreas Henriksson <andreas at fatal.se>  Mon, 15 Aug 2016 18:01:29 +0200
 
 libcryptui (3.12.2-1) unstable; urgency=medium
 

Modified: desktop/unstable/libcryptui/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch?rev=49520&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch	[utf-8] (original)
+++ desktop/unstable/libcryptui/debian/patches/02_seahorse-daemon_libcryptui_static_link.patch	[utf-8] Mon Aug 15 16:09:57 2016
@@ -3,11 +3,9 @@
  statically linking seahorse-daemon to libcryptui.
 
 
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index c84dc5c..267d1bf 100644
 --- a/daemon/Makefile.am
 +++ b/daemon/Makefile.am
-@@ -73,7 +73,7 @@ seahorse_daemon_SOURCES = \
+@@ -74,7 +74,7 @@
  	$(BUILT_SOURCES)
  
  seahorse_daemon_LDADD = \
@@ -16,11 +14,9 @@
  	$(top_builddir)/libegg/libeggdatetime.la \
  	$(top_builddir)/libegg/libeggsmclient.la \
  	$(SEAHORSE_LIBS)
-diff --git a/libcryptui/Makefile.am b/libcryptui/Makefile.am
-index 8fca33b..9a15530 100644
 --- a/libcryptui/Makefile.am
 +++ b/libcryptui/Makefile.am
-@@ -40,6 +40,7 @@ cryptui-marshal.c: cryptui-marshal.list $(GLIB_GENMARSHAL)
+@@ -34,6 +34,7 @@
  # 
  
  lib_LTLIBRARIES = libcryptui.la
@@ -28,7 +24,7 @@
  
  libcryptui_src = \
      $(srcdir)/cryptui.c \
-@@ -61,6 +62,9 @@ libcryptui_la_LDFLAGS = \
+@@ -55,6 +56,9 @@
      
  libcryptui_la_LIBADD = $(LIBCRYPTUI_LIBS) 
  

Added: desktop/unstable/libcryptui/debian/patches/git_allow-gpg2-2.1.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/patches/git_allow-gpg2-2.1.patch?rev=49520&op=file
==============================================================================
--- desktop/unstable/libcryptui/debian/patches/git_allow-gpg2-2.1.patch	(added)
+++ desktop/unstable/libcryptui/debian/patches/git_allow-gpg2-2.1.patch	[utf-8] Mon Aug 15 16:09:57 2016
@@ -0,0 +1,25 @@
+From 183d7619c29482a5d4ae8019692899f87f198171 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot at gnome.org>
+Date: Sat, 17 Oct 2015 08:52:35 +0200
+Subject: Allow building with gnupg 2.1.
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 406b9f3..b621b23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
+ 	DO_CHECK=$enableval, DO_CHECK=yes)
+ 
+ if test	"$DO_CHECK" = "yes"; then
+-	accepted_versions="1.2 1.4 2.0"
++	accepted_versions="1.2 1.4 2.0 2.1"
+ 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
+ 	ok="no"
+-- 
+cgit v0.12
+

Modified: desktop/unstable/libcryptui/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/patches/series?rev=49520&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/libcryptui/debian/patches/series	[utf-8] Mon Aug 15 16:09:57 2016
@@ -1 +1,2 @@
 02_seahorse-daemon_libcryptui_static_link.patch
+git_allow-gpg2-2.1.patch