r46011 - in /desktop/unstable/gedit/debian: changelog control control.in patches/03_no_gnu_gettext.patch patches/08_multiarch_fallback.patch
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Tue Sep 22 12:53:09 UTC 2015
Author: ah
Date: Tue Sep 22 12:53:09 2015
New Revision: 46011
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46011
Log:
* New upstream release.
* Update (build-)dependencies according to configure.ac changes:
- bump gtksourceview >= 3.17.3
- bump libpeas >= 1.14.1
- bump glib >= 2.44
* Update debian/patches/08_multiarch_fallback.patch to apply
Modified:
desktop/unstable/gedit/debian/changelog
desktop/unstable/gedit/debian/control
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
Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=46011&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog [utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog [utf-8] Tue Sep 22 12:53:09 2015
@@ -1,8 +1,17 @@
-gedit (3.16.3-2) UNRELEASED; urgency=medium
-
+gedit (3.18.0-1) unstable; urgency=medium
+
+ [ Josselin Mouette ]
* Remove Debian menu entry.
- -- Josselin Mouette <joss at debian.org> Fri, 04 Sep 2015 09:28:24 +0200
+ [ Andreas Henriksson ]
+ * New upstream release.
+ * Update (build-)dependencies according to configure.ac changes:
+ - bump gtksourceview >= 3.17.3
+ - bump libpeas >= 1.14.1
+ - bump glib >= 2.44
+ * Update debian/patches/08_multiarch_fallback.patch to apply
+
+ -- Andreas Henriksson <andreas at fatal.se> Tue, 22 Sep 2015 13:40:35 +0200
gedit (3.16.3-1) unstable; urgency=medium
Modified: desktop/unstable/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control?rev=46011&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control [utf-8] (original)
+++ desktop/unstable/gedit/debian/control [utf-8] Tue Sep 22 12:53:09 2015
@@ -18,10 +18,10 @@
libenchant-dev (>= 1.2.0),
iso-codes (>= 0.35),
libxml2-dev (>= 2.5.0),
- libglib2.0-dev (>= 2.40.0),
+ libglib2.0-dev (>= 2.44),
libgtk-3-dev (>= 3.16),
- libgtksourceview-3.0-dev (>= 3.16),
- libpeas-dev (>= 1.7.0),
+ libgtksourceview-3.0-dev (>= 3.17.3),
+ libpeas-dev (>= 1.14.1),
libx11-dev,
python3,
python-gi-dev (>= 3.0.0),
@@ -91,8 +91,8 @@
Depends: ${misc:Depends},
gedit (>= ${gnome:Version}),
gedit (<< ${gnome:NextVersion}),
- libgtksourceview-3.0-dev (>= 3.16),
- libpeas-dev (>= 1.7.0)
+ libgtksourceview-3.0-dev (>= 3.17.3),
+ libpeas-dev (>= 1.14.1)
Description: official text editor of the GNOME desktop environment (development files)
gedit is a text editor which supports most standard editor features,
extending this basic functionality with other features not usually
Modified: desktop/unstable/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control.in?rev=46011&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control.in [utf-8] (original)
+++ desktop/unstable/gedit/debian/control.in [utf-8] Tue Sep 22 12:53:09 2015
@@ -14,10 +14,10 @@
libenchant-dev (>= 1.2.0),
iso-codes (>= 0.35),
libxml2-dev (>= 2.5.0),
- libglib2.0-dev (>= 2.40.0),
+ libglib2.0-dev (>= 2.44),
libgtk-3-dev (>= 3.16),
- libgtksourceview-3.0-dev (>= 3.16),
- libpeas-dev (>= 1.7.0),
+ libgtksourceview-3.0-dev (>= 3.17.3),
+ libpeas-dev (>= 1.14.1),
libx11-dev,
python3,
python-gi-dev (>= 3.0.0),
@@ -87,8 +87,8 @@
Depends: ${misc:Depends},
gedit (>= ${gnome:Version}),
gedit (<< ${gnome:NextVersion}),
- libgtksourceview-3.0-dev (>= 3.16),
- libpeas-dev (>= 1.7.0)
+ libgtksourceview-3.0-dev (>= 3.17.3),
+ libpeas-dev (>= 1.14.1)
Description: official text editor of the GNOME desktop environment (development files)
gedit is a text editor which supports most standard editor features,
extending this basic functionality with other features not usually
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=46011&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] Tue Sep 22 12:53:09 2015
@@ -1,8 +1,6 @@
-Index: gedit-3.16.2/configure.ac
-===================================================================
---- gedit-3.16.2.orig/configure.ac 2015-06-15 15:06:08.832722161 +0200
-+++ gedit-3.16.2/configure.ac 2015-06-15 15:06:08.828722100 +0200
-@@ -190,9 +190,6 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -177,9 +177,6 @@
IT_PROG_INTLTOOL([0.50.1])
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=46011&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] Tue Sep 22 12:53:09 2015
@@ -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.16.2/gedit/gedit-dirs.c
-===================================================================
---- gedit-3.16.2.orig/gedit/gedit-dirs.c 2015-06-15 15:06:14.172803327 +0200
-+++ gedit-3.16.2/gedit/gedit-dirs.c 2015-06-15 15:06:14.168803267 +0200
+--- a/gedit/gedit-dirs.c
++++ b/gedit/gedit-dirs.c
@@ -36,6 +36,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.16.2/gedit/gedit-dirs.h
-===================================================================
---- gedit-3.16.2.orig/gedit/gedit-dirs.h 2015-06-15 15:06:14.172803327 +0200
-+++ gedit-3.16.2/gedit/gedit-dirs.h 2015-06-15 15:06:14.168803267 +0200
+--- a/gedit/gedit-dirs.h
++++ b/gedit/gedit-dirs.h
@@ -48,6 +48,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.16.2/gedit/gedit-plugins-engine.c
-===================================================================
---- gedit-3.16.2.orig/gedit/gedit-plugins-engine.c 2015-06-15 15:06:14.172803327 +0200
-+++ gedit-3.16.2/gedit/gedit-plugins-engine.c 2015-06-15 15:06:14.168803267 +0200
-@@ -99,6 +99,10 @@
+--- a/gedit/gedit-plugins-engine.c
++++ b/gedit/gedit-plugins-engine.c
+@@ -95,6 +95,11 @@
gedit_dirs_get_gedit_plugins_dir (),
gedit_dirs_get_gedit_plugins_data_dir ());
@@ -69,6 +63,7 @@
+ gedit_dirs_get_gedit_fallback_plugins_dir (),
+ gedit_dirs_get_gedit_plugins_data_dir ());
+
- g_settings_bind (engine->priv->plugin_settings,
++
+ g_settings_bind (engine->plugin_settings,
GEDIT_SETTINGS_ACTIVE_PLUGINS,
engine,
More information about the pkg-gnome-commits
mailing list