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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Apr 17 23:03:15 2016
New Revision: 48195

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48195
Log:
Drop debian/patches/fix_conflicting_types.patch, merged upstream.

Removed:
    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=48195&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog	[utf-8] Sun Apr 17 23:03:15 2016
@@ -1,6 +1,7 @@
 gnome-keyring (3.20.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop debian/patches/fix_conflicting_types.patch, merged upstream.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 16 Apr 2016 16:01:30 +0200
 

Modified: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=48195&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] Sun Apr 17 23:03:15 2016
@@ -1,2 +1 @@
 03_kfreebsd.patch
-fix_conflicting_types.patch