r47211 - in /desktop/unstable/gnome-keyring/debian: changelog patches/fix_conflicting_types.patch patches/series

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Sat Jan  2 20:13:42 2016
New Revision: 47211

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47211
Log:
Fix conflicting return types of function gkm_secret_binary_read, thanks
to Michael Tautschnig for the bug report (fix_conflicting_types.patch,
closes: #747182).

Added:
    desktop/unstable/gnome-keyring/debian/patches/fix_conflicting_types.patch
Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/patches/series

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=47211&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog	[utf-8] Sat Jan  2 20:13:42 2016
@@ -2,6 +2,9 @@
 
   * New upstream bugfix release.
   * Drop handle_aliases.patch, applied upstream.
+  * Fix conflicting return types of function gkm_secret_binary_read, thanks
+    to Michael Tautschnig for the bug report (fix_conflicting_types.patch,
+    closes: #747182).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 31 Oct 2015 14:56:26 +0300
 

Added: desktop/unstable/gnome-keyring/debian/patches/fix_conflicting_types.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/fix_conflicting_types.patch?rev=47211&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/fix_conflicting_types.patch	(added)
+++ desktop/unstable/gnome-keyring/debian/patches/fix_conflicting_types.patch	[utf-8] Sat Jan  2 20:13:42 2016
@@ -0,0 +1,15 @@
+Description: pkcs11: fix return value of method
+Origin: upstream, https://git.gnome.org/browse/gnome-keyring/commit/?id=28d07c9d9bf9ca6a
+Last-Update: 2016-01-02
+
+--- a/pkcs11/secret-store/gkm-secret-binary.c
++++ b/pkcs11/secret-store/gkm-secret-binary.c
+@@ -846,7 +846,7 @@
+ 	gkm_secret_compat_acl_free (info->acl);
+ }
+ 
+-gint
++GkmDataResult
+ gkm_secret_binary_read (GkmSecretCollection *collection, GkmSecretData *sdata,
+                         gconstpointer data, gsize n_data)
+ {

Modified: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=47211&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] Sat Jan  2 20:13:42 2016
@@ -1 +1,2 @@
 03_kfreebsd.patch
+fix_conflicting_types.patch