r40537 - in /desktop/unstable/gedit: ./ debian/changelog debian/control.in debian/patches/03_no_gnu_gettext.patch debian/patches/08_multiarch_fallback.patch debian/patches/series debian/patches/snippets-cairo.patch

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Sun Feb 16 16:17:22 UTC 2014 

Author: bigon
Date: Sun Feb 16 16:17:22 2014
New Revision: 40537

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40537
Log:
Merge from experimental

Removed:
    desktop/unstable/gedit/debian/patches/snippets-cairo.patch
Modified:
    desktop/unstable/gedit/   (props changed)
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/control.in
    desktop/unstable/gedit/debian/patches/03_no_gnu_gettext.patch
    desktop/unstable/gedit/debian/patches/08_multiarch_fallback.patch
    desktop/unstable/gedit/debian/patches/series

Propchange: desktop/unstable/gedit/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Feb 16 16:17:22 2014
@@ -1 +1,2 @@
+/desktop/experimental/gedit:39968-40536
 /desktop/unstable/gedit:27001-28168

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=40537&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog	[utf-8] Sun Feb 16 16:17:22 2014
@@ -1,3 +1,18 @@
+gedit (3.10.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump build-dependencies according to configure.ac:
+    - libglib2.0-dev to >= 2.37.5
+    - libgtk-3-dev to >= 3.9.0
+    - libgtksourceview-3.0-dev to >= 3.9.5
+  * Refresh patches to apply cleanly:
+    - debian/patches/08_multiarch_fallback.patch
+    - debian/patches/03_no_gnu_gettext.patch
+  * Drop debian/patches/snippets-cairo.patch
+    - now included in upstream release
+
+ -- Andreas Henriksson <andreas at fatal.se>  Thu, 17 Oct 2013 17:22:59 +0200
+
 gedit (3.8.3-4) unstable; urgency=low
 
   [ Andreas Henriksson ]

Modified: desktop/unstable/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control.in?rev=40537&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gedit/debian/control.in	[utf-8] Sun Feb 16 16:17:22 2014
@@ -14,9 +14,9 @@
                libenchant-dev (>= 1.2.0),
                iso-codes (>= 0.35),
                libxml2-dev (>= 2.5.0),
-               libglib2.0-dev (>= 2.35.4),
-               libgtk-3-dev (>= 3.7.10),
-               libgtksourceview-3.0-dev (>= 3.2.0),
+               libglib2.0-dev (>= 2.37.5),
+               libgtk-3-dev (>= 3.9.0),
+               libgtksourceview-3.0-dev (>= 3.9.5),
                libpeas-dev (>= 1.7.0),
                libx11-dev,
                python3-dev (>= 3.2.3),

Modified: desktop/unstable/gedit/debian/patches/03_no_gnu_gettext.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/03_no_gnu_gettext.patch?rev=40537&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/03_no_gnu_gettext.patch	[utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/03_no_gnu_gettext.patch	[utf-8] Sun Feb 16 16:17:22 2014
@@ -1,8 +1,8 @@
---- gedit-3.5.2/configure.ac	2012-08-31 04:44:10.000000000 +1200
-+++ gedit-3.5.1/configure.ac	2012-08-31 10:54:01.373723220 +1200
-@@ -167,9 +167,6 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -165,9 +165,6 @@
  
- IT_PROG_INTLTOOL([0.40.0])
+ IT_PROG_INTLTOOL([0.50.1])
  
 -AM_GNU_GETTEXT_VERSION([0.18])
 -AM_GNU_GETTEXT([external])

Modified: desktop/unstable/gedit/debian/patches/08_multiarch_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/08_multiarch_fallback.patch?rev=40537&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/08_multiarch_fallback.patch	[utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/08_multiarch_fallback.patch	[utf-8] Sun Feb 16 16:17:22 2014
@@ -1,10 +1,8 @@
 Description: Also load plugins from pre-multiarch directory
 Author: Jeremy Bicha <jbicha at ubuntu.com>
 Forwarded: not-needed
-Index: gedit-3.8.3/gedit/gedit-dirs.c
-===================================================================
---- gedit-3.8.3.orig/gedit/gedit-dirs.c	2013-07-13 21:36:30.069700110 -0400
-+++ gedit-3.8.3/gedit/gedit-dirs.c	2013-07-13 21:36:30.065700110 -0400
+--- a/gedit/gedit-dirs.c
++++ b/gedit/gedit-dirs.c
 @@ -38,6 +38,7 @@
  static gchar *gedit_locale_dir       = NULL;
  static gchar *gedit_lib_dir          = NULL;
@@ -44,10 +42,8 @@
  gedit_dirs_get_gedit_plugins_data_dir (void)
  {
  	return gedit_plugins_data_dir;
-Index: gedit-3.8.3/gedit/gedit-dirs.h
-===================================================================
---- gedit-3.8.3.orig/gedit/gedit-dirs.h	2013-03-12 02:35:32.000000000 -0400
-+++ gedit-3.8.3/gedit/gedit-dirs.h	2013-07-13 21:36:55.081699064 -0400
+--- a/gedit/gedit-dirs.h
++++ b/gedit/gedit-dirs.h
 @@ -50,6 +50,8 @@
  
  const gchar	*gedit_dirs_get_gedit_plugins_dir	(void);
@@ -57,11 +53,9 @@
  const gchar	*gedit_dirs_get_gedit_plugins_data_dir	(void);
  
  gchar		*gedit_dirs_get_ui_file			(const gchar *file);
-Index: gedit-3.8.3/gedit/gedit-plugins-engine.c
-===================================================================
---- gedit-3.8.3.orig/gedit/gedit-plugins-engine.c	2013-07-13 21:36:30.069700110 -0400
-+++ gedit-3.8.3/gedit/gedit-plugins-engine.c	2013-07-13 21:36:30.065700110 -0400
-@@ -110,6 +110,10 @@
+--- a/gedit/gedit-plugins-engine.c
++++ b/gedit/gedit-plugins-engine.c
+@@ -108,6 +108,10 @@
  	                             gedit_dirs_get_gedit_plugins_dir (),
  	                             gedit_dirs_get_gedit_plugins_data_dir ());
  

Modified: desktop/unstable/gedit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/series?rev=40537&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/series	[utf-8] Sun Feb 16 16:17:22 2014
@@ -1,4 +1,3 @@
 01_gedit-bugreport-location.patch
 03_no_gnu_gettext.patch
 08_multiarch_fallback.patch
-snippets-cairo.patch

More information about the pkg-gnome-commits mailing list