r47768 - in /desktop/experimental/gedit/debian: changelog control control.in gedit-common.install patches/01_gedit-bugreport-location.patch patches/03_no_gnu_gettext.patch patches/08_multiarch_fallback.patch
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Fri Apr 1 15:02:55 UTC 2016
Author: ah
Date: Fri Apr 1 15:02:55 2016
New Revision: 47768
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47768
Log:
* New upstream release.
* Update build-dependencies according to configure.ac changes:
- Drop libenchant-dev (>= 1.2.0)
- Drop iso-codes (>= 0.35)
- Add (replacement for above) libgspell-1-dev (>= 0.2.5)
- Bump libgtk-3-dev to (>= 3.19.0)
- Bump libgtksourceview-3.0-dev to (>= 3.19.4)
* Bump Standards-Version to 3.9.7
* Fix debian/patches/08_multiarch_fallback.patch to apply again
* Have quilt refresh remaining patches.
* Add missing libsoup2.4-dev build-dependency
* gedit-common: don't ship logo directory, now built into gresource.
Modified:
desktop/experimental/gedit/debian/changelog
desktop/experimental/gedit/debian/control
desktop/experimental/gedit/debian/control.in
desktop/experimental/gedit/debian/gedit-common.install
desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch
desktop/experimental/gedit/debian/patches/03_no_gnu_gettext.patch
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=47768&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/changelog [utf-8] (original)
+++ desktop/experimental/gedit/debian/changelog [utf-8] Fri Apr 1 15:02:55 2016
@@ -1,3 +1,20 @@
+gedit (3.20.1-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Update build-dependencies according to configure.ac changes:
+ - Drop libenchant-dev (>= 1.2.0)
+ - Drop iso-codes (>= 0.35)
+ - Add (replacement for above) libgspell-1-dev (>= 0.2.5)
+ - Bump libgtk-3-dev to (>= 3.19.0)
+ - Bump libgtksourceview-3.0-dev to (>= 3.19.4)
+ * Bump Standards-Version to 3.9.7
+ * Fix debian/patches/08_multiarch_fallback.patch to apply again
+ * Have quilt refresh remaining patches.
+ * Add missing libsoup2.4-dev build-dependency
+ * gedit-common: don't ship logo directory, now built into gresource.
+
+ -- Andreas Henriksson <andreas at fatal.se> Fri, 01 Apr 2016 16:14:49 +0200
+
gedit (3.18.3-1) unstable; urgency=medium
* New upstream release.
Modified: desktop/experimental/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control?rev=47768&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control [utf-8] (original)
+++ desktop/experimental/gedit/debian/control [utf-8] Fri Apr 1 15:02:55 2016
@@ -15,12 +15,12 @@
intltool (>= 0.50.1),
gsettings-desktop-schemas-dev,
gtk-doc-tools (>= 1.0),
- libenchant-dev (>= 1.2.0),
- iso-codes (>= 0.35),
+ libsoup2.4-dev,
+ libgspell-1-dev (>= 0.2.5),
libxml2-dev (>= 2.5.0),
libglib2.0-dev (>= 2.44),
- libgtk-3-dev (>= 3.16),
- libgtksourceview-3.0-dev (>= 3.18),
+ libgtk-3-dev (>= 3.19.0),
+ libgtksourceview-3.0-dev (>= 3.19.4),
libpeas-dev (>= 1.14.1),
libx11-dev,
python3,
@@ -32,7 +32,7 @@
Build-Depends-Indep: libglib2.0-doc,
libgtk-3-doc,
libgtksourceview-3.0-doc
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gedit/
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gedit/
Homepage: https://wiki.gnome.org/Apps/Gedit
Modified: desktop/experimental/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control.in?rev=47768&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control.in [utf-8] (original)
+++ desktop/experimental/gedit/debian/control.in [utf-8] Fri Apr 1 15:02:55 2016
@@ -11,12 +11,12 @@
intltool (>= 0.50.1),
gsettings-desktop-schemas-dev,
gtk-doc-tools (>= 1.0),
- libenchant-dev (>= 1.2.0),
- iso-codes (>= 0.35),
+ libsoup2.4-dev,
+ libgspell-1-dev (>= 0.2.5),
libxml2-dev (>= 2.5.0),
libglib2.0-dev (>= 2.44),
- libgtk-3-dev (>= 3.16),
- libgtksourceview-3.0-dev (>= 3.18),
+ libgtk-3-dev (>= 3.19.0),
+ libgtksourceview-3.0-dev (>= 3.19.4),
libpeas-dev (>= 1.14.1),
libx11-dev,
python3,
@@ -28,7 +28,7 @@
Build-Depends-Indep: libglib2.0-doc,
libgtk-3-doc,
libgtksourceview-3.0-doc
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gedit/
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gedit/
Homepage: https://wiki.gnome.org/Apps/Gedit
Modified: desktop/experimental/gedit/debian/gedit-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/gedit-common.install?rev=47768&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/gedit-common.install [utf-8] (original)
+++ desktop/experimental/gedit/debian/gedit-common.install [utf-8] Fri Apr 1 15:02:55 2016
@@ -1,4 +1,3 @@
-usr/share/gedit/logo
usr/share/gedit/plugins
usr/share/glib-2.0
usr/share/GConf
Modified: desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch?rev=47768&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch [utf-8] (original)
+++ desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch [utf-8] Fri Apr 1 15:02:55 2016
@@ -1,8 +1,6 @@
-Index: gedit-3.16.2/data/org.gnome.gedit.desktop.in.in
-===================================================================
---- gedit-3.16.2.orig/data/org.gnome.gedit.desktop.in.in 2015-06-15 15:05:15.271907586 +0200
-+++ gedit-3.16.2/data/org.gnome.gedit.desktop.in.in 2015-06-15 15:06:04.940662998 +0200
-@@ -15,7 +15,7 @@
+--- a/data/org.gnome.gedit.desktop.in.in
++++ b/data/org.gnome.gedit.desktop.in.in
+@@ -14,7 +14,7 @@
X-GNOME-Bugzilla-Product=gedit
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=@VERSION@
Modified: desktop/experimental/gedit/debian/patches/03_no_gnu_gettext.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/patches/03_no_gnu_gettext.patch?rev=47768&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/patches/03_no_gnu_gettext.patch [utf-8] (original)
+++ desktop/experimental/gedit/debian/patches/03_no_gnu_gettext.patch [utf-8] Fri Apr 1 15:02:55 2016
@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -177,9 +177,6 @@
+@@ -176,9 +176,6 @@
IT_PROG_INTLTOOL([0.50.1])
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=47768&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] Fri Apr 1 15:02:55 2016
@@ -3,7 +3,7 @@
Forwarded: not-needed
--- a/gedit/gedit-dirs.c
+++ b/gedit/gedit-dirs.c
-@@ -36,6 +36,7 @@
+@@ -35,6 +35,7 @@
static gchar *gedit_locale_dir = NULL;
static gchar *gedit_lib_dir = NULL;
static gchar *gedit_plugins_dir = NULL;
@@ -11,17 +11,17 @@
static gchar *gedit_plugins_data_dir = NULL;
void
-@@ -111,6 +112,9 @@
+@@ -114,6 +115,9 @@
gedit_plugins_dir = g_build_filename (gedit_lib_dir,
"plugins",
NULL);
+ gedit_fallback_plugins_dir = g_build_filename ("/usr/lib/gedit",
+ "plugins",
+ NULL);
- gedit_plugins_data_dir = g_build_filename (gedit_data_dir,
- "plugins",
- NULL);
-@@ -127,6 +131,7 @@
+ }
+
+ void
+@@ -126,6 +130,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);
}
-@@ -179,6 +184,12 @@
+@@ -172,6 +177,12 @@
}
const gchar *
@@ -44,7 +44,7 @@
return gedit_plugins_data_dir;
--- a/gedit/gedit-dirs.h
+++ b/gedit/gedit-dirs.h
-@@ -48,6 +48,8 @@
+@@ -46,6 +46,8 @@
const gchar *gedit_dirs_get_gedit_plugins_dir (void);
@@ -52,7 +52,7 @@
+
const gchar *gedit_dirs_get_gedit_plugins_data_dir (void);
- gchar *gedit_dirs_get_ui_file (const gchar *file);
+ G_END_DECLS
--- a/gedit/gedit-plugins-engine.c
+++ b/gedit/gedit-plugins-engine.c
@@ -95,6 +95,11 @@
More information about the pkg-gnome-commits
mailing list