r19678 - in /desktop/unstable/gedit/debian: changelog control control.in copyright gedit.install patches/02_externaltools_locale.patch patches/03_python_path.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Apr 22 21:46:45 UTC 2009


Author: joss
Date: Wed Apr 22 21:46:45 2009
New Revision: 19678

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

Removed:
    desktop/unstable/gedit/debian/patches/02_externaltools_locale.patch
Modified:
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/control
    desktop/unstable/gedit/debian/control.in
    desktop/unstable/gedit/debian/copyright
    desktop/unstable/gedit/debian/gedit.install
    desktop/unstable/gedit/debian/patches/03_python_path.patch

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=19678&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog (original)
+++ desktop/unstable/gedit/debian/changelog Wed Apr 22 21:46:45 2009
@@ -1,9 +1,31 @@
-gedit (2.24.3-2) UNRELEASED; urgency=low
-
-  * Add libglib2.0-doc, libgtk2.0-doc and libgtksourceview2.0-doc to 
+gedit (2.26.0-1) UNRELEASED; urgency=low
+
+  [ Josselin Mouette ]
+  * Add libglib2.0-doc, libgtk2.0-doc and libgtksourceview2.0-doc to
     b-d-i to ensure proper xrefs.
 
- -- Josselin Mouette <joss at debian.org>  Sun, 15 Mar 2009 15:04:09 +0100
+  [ Luca Bruno ]
+  * New upstream release.
+  * debian/control.in:
+    + Build-Depends version bumps:
+      - libgtksourceview2.0-dev to 2.4.0
+      - liblibglib2.0-dev to 2.18.0
+      - intltool to 0.40.0
+    + Update Standards-Version to 3.8.1. No changes needed.
+  * debian/patches:
+    + Removed 02_externaltools_locale.patch, applied upstream.
+    + Updated 03_python_path.patch to use a modified version of the
+      upstream patch.
+  * debian/gedit.install:
+    + Plugins ui files are now installed under share/ in gedit-common.
+    + Install usr/lib/gedit-2/plugin-loaders.
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/copyright: point to GPL-2 rather than GPL.
+  * debian/control.in: remove unneeded Section entries, they are
+    inherited from the source.
+
+ -- Luca Bruno <lethalman88 at gmail.com>  Mon, 23 Mar 2009 16:16:41 +0100
 
 gedit (2.24.3-1) unstable; urgency=low
 

Modified: desktop/unstable/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control?rev=19678&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control (original)
+++ desktop/unstable/gedit/debian/control Wed Apr 22 21:46:45 2009
@@ -8,7 +8,7 @@
                gnome-pkg-tools (>= 0.10),
                dpkg-dev (>= 1.13.19),
                python-support (>= 0.3),
-               intltool (>= 0.35.0),
+               intltool (>= 0.40.0),
                gnome-doc-utils (>= 0.3.2),
                gtk-doc-tools (>= 1.0),
                libenchant-dev (>= 1.2.0),
@@ -16,9 +16,9 @@
                libattr1-dev,
                libsm-dev (>= 2:1.0),
                libxml2-dev (>= 2.5.0),
-               libglib2.0-dev (>= 2.16.0),
+               libglib2.0-dev (>= 2.18.0),
                libgtk2.0-dev (>= 2.13.0),
-               libgtksourceview2.0-dev (>= 2.2.0),
+               libgtksourceview2.0-dev (>= 2.4.0),
                libgconf2-dev,
                python-dev (>= 2.3),
                python-gobject-dev (>= 2.15.4),
@@ -28,7 +28,7 @@
 Build-Depends-Indep: libglib2.0-doc,
                      libgtk2.0-doc,
                      libgtksourceview2.0-doc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 XS-Python-Version: >= 2.3
 Homepage: http://www.gnome.org/projects/gedit/
 

Modified: desktop/unstable/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control.in?rev=19678&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control.in (original)
+++ desktop/unstable/gedit/debian/control.in Wed Apr 22 21:46:45 2009
@@ -8,7 +8,7 @@
                gnome-pkg-tools (>= 0.10),
                dpkg-dev (>= 1.13.19),
                python-support (>= 0.3),
-               intltool (>= 0.35.0),
+               intltool (>= 0.40.0),
                gnome-doc-utils (>= 0.3.2),
                gtk-doc-tools (>= 1.0),
                libenchant-dev (>= 1.2.0),
@@ -16,9 +16,9 @@
                libattr1-dev,
                libsm-dev (>= 2:1.0),
                libxml2-dev (>= 2.5.0),
-               libglib2.0-dev (>= 2.16.0),
+               libglib2.0-dev (>= 2.18.0),
                libgtk2.0-dev (>= 2.13.0),
-               libgtksourceview2.0-dev (>= 2.2.0),
+               libgtksourceview2.0-dev (>= 2.4.0),
                libgconf2-dev,
                python-dev (>= 2.3),
                python-gobject-dev (>= 2.15.4),
@@ -28,13 +28,12 @@
 Build-Depends-Indep: libglib2.0-doc,
                      libgtk2.0-doc,
                      libgtksourceview2.0-doc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 XS-Python-Version: >= 2.3
 Homepage: http://www.gnome.org/projects/gedit/
 
 Package: gedit
 Architecture: any
-Section: gnome
 Depends: ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
@@ -68,7 +67,6 @@
 
 Package: gedit-common
 Architecture: all
-Section: gnome
 Depends: ${misc:Depends}
 Recommends: gedit
 Description: official text editor of the GNOME desktop environment (support files)

Modified: desktop/unstable/gedit/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/copyright?rev=19678&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/copyright (original)
+++ desktop/unstable/gedit/debian/copyright Wed Apr 22 21:46:45 2009
@@ -26,5 +26,4 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
+Public License can be found in `/usr/share/common-licenses/GPL-2'.

Modified: desktop/unstable/gedit/debian/gedit.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/gedit.install?rev=19678&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/gedit.install (original)
+++ desktop/unstable/gedit/debian/gedit.install Wed Apr 22 21:46:45 2009
@@ -4,6 +4,6 @@
 debian/tmp/usr/lib/gedit-2/plugins/*.gedit-plugin
 debian/tmp/usr/lib/gedit-2/plugins/*.so
 debian/tmp/usr/lib/gedit-2/plugins/*/*.py
-debian/tmp/usr/lib/gedit-2/plugins/*/*.ui
+debian/tmp/usr/lib/gedit-2/plugin-loaders/*.so
 debian/tmp/usr/share/applications/gedit.desktop
 debian/script /usr/share/bug/gedit/

Modified: desktop/unstable/gedit/debian/patches/03_python_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/03_python_path.patch?rev=19678&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/03_python_path.patch (original)
+++ desktop/unstable/gedit/debian/patches/03_python_path.patch Wed Apr 22 21:46:45 2009
@@ -1,13 +1,23 @@
-Index: gedit-2.22.3/gedit/gedit-python-module.c
-===================================================================
---- gedit-2.22.3.orig/gedit/gedit-python-module.c	2009-02-04 16:30:30.029901958 +0100
-+++ gedit-2.22.3/gedit/gedit-python-module.c	2009-02-04 16:32:15.011326133 +0100
-@@ -398,7 +398,7 @@ gedit_python_init (void)
+diff -up gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c
+--- gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path	2009-01-12 11:23:48.000000000 -0500
++++ gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c	2009-01-26 15:35:30.672713673 -0500
+@@ -488,7 +488,7 @@ gedit_python_init (GeditPluginLoaderPyth
  	PyObject *gettext, *install, *gettext_args;
  	struct sigaction old_sigint;
  	gint res;
 -	char *argv[] = { "gedit", NULL };
-+	char *argv[] = { GEDIT_PLUGINDIR, NULL };
- 	
- 	static gboolean init_failed = FALSE;
++	char *argv[] = { GEDIT_PLUGINS_LIBS_DIR, NULL };
  
+ 	if (loader->priv->init_failed)
+ 	{
+diff -up gedit-2.25.5/plugin-loaders/python/Makefile.am.fix-python-path gedit-2.25.5/plugin-loaders/python/Makefile.am
+--- gedit-2.25.5/plugin-loaders/python/Makefile.in.fix-python-path	2009-01-26 15:51:12.102965135 -0500
++++ gedit-2.25.5/plugin-loaders/python/Makefile.in	2009-01-26 15:35:49.978712718 -0500
+@@ -311,6 +311,7 @@ INCLUDES = \
+ 	$(DISABLE_DEPRECATED_CFLAGS)					\
+ 	$(PYGTK_CFLAGS)							\
+ 	$(PYTHON_CFLAGS)						\
++	-DGEDIT_PLUGINS_LIBS_DIR=\"$(GEDIT_PLUGINS_LIBS_DIR)\"		\
+ 	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+ 
+ loader_LTLIBRARIES = libpythonloader.la




More information about the pkg-gnome-commits mailing list