r40663 - in /desktop/experimental/gedit/debian: changelog control.in patches/08_multiarch_fallback.patch

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Feb 19 22:10:35 2014
New Revision: 40663

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40663
Log:
* New upstream release.
* Bump build-dependencies according to configure.ac:
  - intltool >= 0.50.1
  - gtksourceview 3.11.2
  - glib 2.39.5
  - gtk+ 3.11.6
* Have quilt refresh debian/patches/08_multiarch_fallback.patch

Modified:
    desktop/experimental/gedit/debian/changelog
    desktop/experimental/gedit/debian/control.in
    desktop/experimental/gedit/debian/patches/08_multiarch_fallback.patch

Modified: desktop/experimental/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/changelog?rev=40663&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gedit/debian/changelog	[utf-8] Wed Feb 19 22:10:35 2014
@@ -1,9 +1,19 @@
-gedit (3.10.4-2) UNRELEASED; urgency=medium
-
+gedit (3.11.90-1) experimental; urgency=medium
+
+  [ Laurent Bigonville ]
   * debian/control.in: Depends against python3-gi-cairo instead of
     python-gi-cairo as we are using python3 for the plugins
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 17 Feb 2014 13:50:22 +0100
+  [ Andreas Henriksson ]
+  * New upstream release.
+  * Bump build-dependencies according to configure.ac:
+    - intltool >= 0.50.1
+    - gtksourceview 3.11.2
+    - glib 2.39.5
+    - gtk+ 3.11.6
+  * Have quilt refresh debian/patches/08_multiarch_fallback.patch
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 19 Feb 2014 23:11:49 +0100
 
 gedit (3.10.4-1) unstable; urgency=medium
 

Modified: desktop/experimental/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control.in?rev=40663&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gedit/debian/control.in	[utf-8] Wed Feb 19 22:10:35 2014
@@ -8,15 +8,15 @@
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
                autotools-dev,
-               intltool (>= 0.40.0),
+               intltool (>= 0.50.1),
                gsettings-desktop-schemas-dev,
                gtk-doc-tools (>= 1.0),
                libenchant-dev (>= 1.2.0),
                iso-codes (>= 0.35),
                libxml2-dev (>= 2.5.0),
-               libglib2.0-dev (>= 2.37.5),
-               libgtk-3-dev (>= 3.9.0),
-               libgtksourceview-3.0-dev (>= 3.9.5),
+               libglib2.0-dev (>= 2.39.5),
+               libgtk-3-dev (>= 3.11.6),
+               libgtksourceview-3.0-dev (>= 3.11.2),
                libpeas-dev (>= 1.7.0),
                libx11-dev,
                python3-dev (>= 3.2.3),

Modified: desktop/experimental/gedit/debian/patches/08_multiarch_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/patches/08_multiarch_fallback.patch?rev=40663&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/patches/08_multiarch_fallback.patch	[utf-8] (original)
+++ desktop/experimental/gedit/debian/patches/08_multiarch_fallback.patch	[utf-8] Wed Feb 19 22:10:35 2014
@@ -3,7 +3,7 @@
 Forwarded: not-needed
 --- a/gedit/gedit-dirs.c
 +++ b/gedit/gedit-dirs.c
-@@ -38,6 +38,7 @@
+@@ -36,6 +36,7 @@
  static gchar *gedit_locale_dir       = NULL;
  static gchar *gedit_lib_dir          = NULL;
  static gchar *gedit_plugins_dir      = NULL;
@@ -11,7 +11,7 @@
  static gchar *gedit_plugins_data_dir = NULL;
  
  void
-@@ -113,6 +114,9 @@
+@@ -111,6 +112,9 @@
  	gedit_plugins_dir = g_build_filename (gedit_lib_dir,
  					      "plugins",
  					      NULL);
@@ -21,7 +21,7 @@
  	gedit_plugins_data_dir = g_build_filename (gedit_data_dir,
  						   "plugins",
  						   NULL);
-@@ -129,6 +133,7 @@
+@@ -127,6 +131,7 @@
  	g_free (gedit_locale_dir);
  	g_free (gedit_lib_dir);
  	g_free (gedit_plugins_dir);
@@ -29,7 +29,7 @@
  	g_free (gedit_plugins_data_dir);
  }
  
-@@ -181,6 +186,12 @@
+@@ -179,6 +184,12 @@
  }
  
  const gchar *
@@ -44,7 +44,7 @@
  	return gedit_plugins_data_dir;
 --- a/gedit/gedit-dirs.h
 +++ b/gedit/gedit-dirs.h
-@@ -50,6 +50,8 @@
+@@ -48,6 +48,8 @@
  
  const gchar	*gedit_dirs_get_gedit_plugins_dir	(void);
  
@@ -55,7 +55,7 @@
  gchar		*gedit_dirs_get_ui_file			(const gchar *file);
 --- a/gedit/gedit-plugins-engine.c
 +++ b/gedit/gedit-plugins-engine.c
-@@ -108,6 +108,10 @@
+@@ -98,6 +98,10 @@
  	                             gedit_dirs_get_gedit_plugins_dir (),
  	                             gedit_dirs_get_gedit_plugins_data_dir ());