r52624 - in /desktop/unstable/libcryptui/debian: changelog patches/daemon-fix-conflicting-return-types.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Jul  9 22:13:44 2017
New Revision: 52624

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52624
Log:
* debian/patches/daemon-fix-conflicting-return-types.patch
  - Fix conflicting return types in functions
    seahorse_dbus_server_{init,cleanup}. (Closes: #749001)

Added:
    desktop/unstable/libcryptui/debian/patches/daemon-fix-conflicting-return-types.patch
Modified:
    desktop/unstable/libcryptui/debian/changelog
    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=52624&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libcryptui/debian/changelog	[utf-8] Sun Jul  9 22:13:44 2017
@@ -9,6 +9,9 @@
     Mark gir1.2-cryptui-0.0 and libcryptui-dev as Multi-Arch: same and
     libcryptui-doc as Multi-Arch: foreign.
   * Bump Standards-Version to 4.0.0.
+  * debian/patches/daemon-fix-conflicting-return-types.patch
+    - Fix conflicting return types in functions
+      seahorse_dbus_server_{init,cleanup}. (Closes: #749001)
 
  -- Michael Biebl <biebl at debian.org>  Sun, 09 Jul 2017 23:50:05 +0200
 

Added: desktop/unstable/libcryptui/debian/patches/daemon-fix-conflicting-return-types.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/patches/daemon-fix-conflicting-return-types.patch?rev=52624&op=file
==============================================================================
--- desktop/unstable/libcryptui/debian/patches/daemon-fix-conflicting-return-types.patch	(added)
+++ desktop/unstable/libcryptui/debian/patches/daemon-fix-conflicting-return-types.patch	[utf-8] Sun Jul  9 22:13:44 2017
@@ -0,0 +1,35 @@
+From 4b62178d9b89fb5c62dc2b81bdfd52d6c50ff85b Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Mon, 15 Aug 2016 18:12:06 +0200
+Subject: [PATCH] daemon: fix conflicting return types
+
+... in functions seahorse_dbus_server_{init,cleanup}
+
+Reported-by: Michael Tautschnig <mt at debian.org>
+Bug-Debian: https://bugs.debian.org/749001
+
+https://bugzilla.gnome.org/show_bug.cgi?id=769943
+(cherry picked from commit a576e407d913b35804f838d615da52899681d61d)
+---
+ daemon/seahorse-daemon.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/seahorse-daemon.h b/daemon/seahorse-daemon.h
+index 93c0c452..09716bb5 100644
+--- a/daemon/seahorse-daemon.h
++++ b/daemon/seahorse-daemon.h
+@@ -24,9 +24,9 @@
+ /* seahorse-dbus-server.c --------------------------------------------------- */
+ 
+ 
+-gboolean            seahorse_dbus_server_init ();
++void                seahorse_dbus_server_init ();
+ 
+-gboolean            seahorse_dbus_server_cleanup ();
++void                seahorse_dbus_server_cleanup ();
+ 
+ DBusGConnection*    seahorse_dbus_server_get_connection ();
+ 
+-- 
+2.13.2
+

Modified: desktop/unstable/libcryptui/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libcryptui/debian/patches/series?rev=52624&op=diff
==============================================================================
--- desktop/unstable/libcryptui/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/libcryptui/debian/patches/series	[utf-8] Sun Jul  9 22:13:44 2017
@@ -1,2 +1,3 @@
 02_seahorse-daemon_libcryptui_static_link.patch
 git_allow-gpg2-2.1.patch
+daemon-fix-conflicting-return-types.patch