r13045 - in /desktop/unstable/gedit/debian: changelog control control.in patches/80_from_svn_load_tool_property_correctly.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Tue Oct  9 05:26:32 2007
New Revision: 13045

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13045
Log:
* debian/patches/80_from_svn_load_tool_property_correctly.patch:
  + Patch taken from Ubuntu/Upstream SVN to fix external tools loading
    there properties correctly. See Gnome bug #484318.

Added:
    desktop/unstable/gedit/debian/patches/80_from_svn_load_tool_property_correctly.patch
Modified:
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/control
    desktop/unstable/gedit/debian/control.in

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=13045&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog (original)
+++ desktop/unstable/gedit/debian/changelog Tue Oct  9 05:26:32 2007
@@ -1,4 +1,4 @@
-gedit (2.20.0-1) UNRELEASED; urgency=low
+gedit (2.20.1-1) unstable; urgency=low
 
   [ Loic Minier ]
   * Drop useless gzip build-dep.
@@ -7,6 +7,9 @@
   * New upstream release:
     + debian/control.in:
       - Update build dependencies and dependencies.
+  * debian/patches/80_from_svn_load_tool_property_correctly.patch:
+    + Patch taken from Ubuntu/Upstream SVN to fix external tools loading
+      there properties correctly. See Gnome bug #484318.
 
  -- Sebastian Dröge <slomo at debian.org>  Sun, 30 Sep 2007 17:07:44 +0200
 

Modified: desktop/unstable/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control?rev=13045&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control (original)
+++ desktop/unstable/gedit/debian/control Tue Oct  9 05:26:32 2007
@@ -22,7 +22,7 @@
                python-dev,
                python-gobject-dev (>= 2.11.5),
                python-gtk2-dev (>= 2.9.7),
-               python-pygtksourceview (>= 2.0.0),
+               python-gtksourceview2 (>= 2.0.0),
                python-support (>= 0.3),
                libenchant-dev,
                iso-codes
@@ -39,7 +39,7 @@
          gedit-common (>= ${gnome:Version}),
          gedit-common (<< ${gnome:NextVersion}),
          python-pygtksourceview (>= 2.0.0),
-         python-gobject-dev (>= 2.11.5),
+         python-gobject (>= 2.11.5),
          python-gtk2 (>= 2.9.7),
          python-glade2 (>= 2.9.7),
          iso-codes
@@ -88,7 +88,7 @@
          gedit (>= ${gnome:Version}),
          gedit (<< ${gnome:NextVersion}),
          libgnomeprintui2.2-dev (>= 2.12.1),
-         libgtksourceview-dev (>= 1.8.0),
+         libgtksourceview2.0-dev (>= 2.0.0),
          libgnomeui-dev (>= 2.16.0),
          libglade2-dev (>= 2.5.1)
 Replaces: gedit-common (<< 2.16.2-3)

Modified: desktop/unstable/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control.in?rev=13045&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control.in (original)
+++ desktop/unstable/gedit/debian/control.in Tue Oct  9 05:26:32 2007
@@ -22,7 +22,7 @@
                python-dev,
                python-gobject-dev (>= 2.11.5),
                python-gtk2-dev (>= 2.9.7),
-               python-pygtksourceview (>= 2.0.0),
+               python-gtksourceview2 (>= 2.0.0),
                python-support (>= 0.3),
                libenchant-dev,
                iso-codes
@@ -39,7 +39,7 @@
          gedit-common (>= ${gnome:Version}),
          gedit-common (<< ${gnome:NextVersion}),
          python-pygtksourceview (>= 2.0.0),
-         python-gobject-dev (>= 2.11.5),
+         python-gobject (>= 2.11.5),
          python-gtk2 (>= 2.9.7),
          python-glade2 (>= 2.9.7),
          iso-codes
@@ -88,7 +88,7 @@
          gedit (>= ${gnome:Version}),
          gedit (<< ${gnome:NextVersion}),
          libgnomeprintui2.2-dev (>= 2.12.1),
-         libgtksourceview-dev (>= 1.8.0),
+         libgtksourceview2.0-dev (>= 2.0.0),
          libgnomeui-dev (>= 2.16.0),
          libglade2-dev (>= 2.5.1)
 Replaces: gedit-common (<< 2.16.2-3)

Added: desktop/unstable/gedit/debian/patches/80_from_svn_load_tool_property_correctly.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/80_from_svn_load_tool_property_correctly.patch?rev=13045&op=file
==============================================================================
--- desktop/unstable/gedit/debian/patches/80_from_svn_load_tool_property_correctly.patch (added)
+++ desktop/unstable/gedit/debian/patches/80_from_svn_load_tool_property_correctly.patch Tue Oct  9 05:26:32 2007
@@ -1,0 +1,11 @@
+--- trunk/plugins/externaltools/tools/library.py	2007/10/07 10:52:32	5951
++++ trunk/plugins/externaltools/tools/library.py	2007/10/07 15:58:24	5952
+@@ -212,7 +212,7 @@
+                 (key, value) = [i.strip() for i in line[2:].split('=', 1)]
+                 m = self.RE_KEY.match(key)
+                 if m.group(3) is None:
+-                    if m.group(0) in self._properties:
++                    if m.group(0) not in self._properties:
+                         self._properties[m.group(1)] = value
+                 elif lang is not None and lang.startswith(m.group(3)):
+                     self._properties[m.group(1)] = value