r49138 - in /desktop/unstable/evince/debian: changelog patches/01_nautilus_extension_path.patch patches/Remove-the-MimeType-association-from-the-evince-prev.patch patches/git_fix_gesture_shortcut_help.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jun 23 22:11:06 2016
New Revision: 49138

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49138
Log:
Refresh patches, drop those which have been applied upstream.

Removed:
    desktop/unstable/evince/debian/patches/Remove-the-MimeType-association-from-the-evince-prev.patch
    desktop/unstable/evince/debian/patches/git_fix_gesture_shortcut_help.patch
Modified:
    desktop/unstable/evince/debian/changelog
    desktop/unstable/evince/debian/patches/01_nautilus_extension_path.patch
    desktop/unstable/evince/debian/patches/series

Modified: desktop/unstable/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/changelog?rev=49138&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog	[utf-8] (original)
+++ desktop/unstable/evince/debian/changelog	[utf-8] Thu Jun 23 22:11:06 2016
@@ -1,6 +1,7 @@
 evince (3.20.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches, drop those which have been applied upstream.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 23 Jun 2016 23:57:22 +0200
 

Modified: desktop/unstable/evince/debian/patches/01_nautilus_extension_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/01_nautilus_extension_path.patch?rev=49138&op=diff
==============================================================================
--- desktop/unstable/evince/debian/patches/01_nautilus_extension_path.patch	[utf-8] (original)
+++ desktop/unstable/evince/debian/patches/01_nautilus_extension_path.patch	[utf-8] Thu Jun 23 22:11:06 2016
@@ -1,10 +1,12 @@
 Description: Fix path of the libnautilus-extension with multi-arch
 Author: Laurent Bigonville <bigon at debian.org>
 
+Index: b/configure.ac
+===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -413,8 +413,6 @@ if test "$enable_nautilus" = "yes" ; the
-   PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-3.0 $MM gthread-2.0 libnautilus-extension >= $NAUTILUS_REQUIRED],
+@@ -417,8 +417,6 @@
+   PKG_CHECK_MODULES([NAUTILUS],[gtk+-3.0 $MM gthread-2.0 libnautilus-extension >= $NAUTILUS_REQUIRED],
                      [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])])
    NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
 -  NAUTILUS_EXTENSION_DIR=${NAUTILUS_EXTENSION_DIR#`$PKG_CONFIG --variable=libdir libnautilus-extension`}
@@ -12,9 +14,11 @@
    AC_SUBST(NAUTILUS_EXTENSION_DIR)
    AC_SUBST(NAUTILUS_CFLAGS)
    AC_SUBST(NAUTILUS_LIBS)
+Index: b/properties/Makefile.am
+===================================================================
 --- a/properties/Makefile.am
 +++ b/properties/Makefile.am
-@@ -15,7 +15,7 @@ libevproperties_la_CFLAGS = \
+@@ -15,7 +15,7 @@
  
  if ENABLE_NAUTILUS
  

Modified: desktop/unstable/evince/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/series?rev=49138&op=diff
==============================================================================
--- desktop/unstable/evince/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/evince/debian/patches/series	[utf-8] Thu Jun 23 22:11:06 2016
@@ -1,3 +1 @@
 01_nautilus_extension_path.patch
-git_fix_gesture_shortcut_help.patch
-Remove-the-MimeType-association-from-the-evince-prev.patch