r22287 - in /desktop/unstable/gedit/debian: changelog control control.in patches/02_system_elementtree.patch rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Wed Nov 11 21:59:57 UTC 2009
Author: pochu
Date: Wed Nov 11 21:59:57 2009
New Revision: 22287
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22287
Log:
* New upstream release.
* debian/patches/02_system_elementtree.patch,
debian/rules:
- Don't install code copies of ElementTree.py, use the system one
instead. Closes: #555344.
* debian/control.in:
- Bump python-dev build dependency and XS-Python-Version to >= 2.5
for the availability of ElementTree.py.
Added:
desktop/unstable/gedit/debian/patches/02_system_elementtree.patch
Modified:
desktop/unstable/gedit/debian/changelog
desktop/unstable/gedit/debian/control
desktop/unstable/gedit/debian/control.in
desktop/unstable/gedit/debian/rules
Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=22287&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog [utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog [utf-8] Wed Nov 11 21:59:57 2009
@@ -1,3 +1,16 @@
+gedit (2.28.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/02_system_elementtree.patch,
+ debian/rules:
+ - Don't install code copies of ElementTree.py, use the system one
+ instead. Closes: #555344.
+ * debian/control.in:
+ - Bump python-dev build dependency and XS-Python-Version to >= 2.5
+ for the availability of ElementTree.py.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Wed, 11 Nov 2009 22:54:27 +0100
+
gedit (2.28.1-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control?rev=22287&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control [utf-8] (original)
+++ desktop/unstable/gedit/debian/control [utf-8] Wed Nov 11 21:59:57 2009
@@ -20,7 +20,7 @@
libgtk2.0-dev (>= 2.17.1),
libgtksourceview2.0-dev (>= 2.4.0),
libgconf2-dev,
- python-dev (>= 2.3),
+ python-dev (>= 2.5),
python-gobject-dev (>= 2.15.4),
python-gtk2-dev (>= 2.12.0),
python-gtksourceview2 (>= 2.2.0),
@@ -29,7 +29,7 @@
libgtk2.0-doc,
libgtksourceview2.0-doc
Standards-Version: 3.8.3
-XS-Python-Version: >= 2.3
+XS-Python-Version: >= 2.5
Homepage: http://www.gnome.org/projects/gedit/
Package: gedit
Modified: desktop/unstable/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control.in?rev=22287&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control.in [utf-8] (original)
+++ desktop/unstable/gedit/debian/control.in [utf-8] Wed Nov 11 21:59:57 2009
@@ -20,7 +20,7 @@
libgtk2.0-dev (>= 2.17.1),
libgtksourceview2.0-dev (>= 2.4.0),
libgconf2-dev,
- python-dev (>= 2.3),
+ python-dev (>= 2.5),
python-gobject-dev (>= 2.15.4),
python-gtk2-dev (>= 2.12.0),
python-gtksourceview2 (>= 2.2.0),
@@ -29,7 +29,7 @@
libgtk2.0-doc,
libgtksourceview2.0-doc
Standards-Version: 3.8.3
-XS-Python-Version: >= 2.3
+XS-Python-Version: >= 2.5
Homepage: http://www.gnome.org/projects/gedit/
Package: gedit
Added: desktop/unstable/gedit/debian/patches/02_system_elementtree.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/02_system_elementtree.patch?rev=22287&op=file
==============================================================================
--- desktop/unstable/gedit/debian/patches/02_system_elementtree.patch (added)
+++ desktop/unstable/gedit/debian/patches/02_system_elementtree.patch [utf-8] Wed Nov 11 21:59:57 2009
@@ -1,0 +1,73 @@
+From 9bce0243ecb952fd6df8c5457d918109645ef61c Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Wed, 11 Nov 2009 21:53:58 +0100
+Subject: [PATCH] Bug 601194: Use the system ElementTree module
+
+Don't ship our own copy of ElementTree.py, use the one from
+Python instead. Require Python >= 2.5 for this.
+---
+ configure.ac | 2 +-
+ plugins/externaltools/tools/ElementTree.py | 1254 ----------------------------
+ plugins/externaltools/tools/Makefile.am | 1 -
+ plugins/externaltools/tools/library.py | 2 +-
+ plugins/snippets/snippets/ElementTree.py | 1254 ----------------------------
+ plugins/snippets/snippets/Exporter.py | 2 +-
+ plugins/snippets/snippets/Helper.py | 2 +-
+ plugins/snippets/snippets/Library.py | 2 +-
+ plugins/snippets/snippets/Makefile.am | 1 -
+ 9 files changed, 5 insertions(+), 2515 deletions(-)
+ delete mode 100644 plugins/externaltools/tools/ElementTree.py
+ delete mode 100644 plugins/snippets/snippets/ElementTree.py
+
+diff --git a/plugins/externaltools/tools/library.py b/plugins/externaltools/tools/library.py
+index 16a2018..58984ef 100644
+--- a/plugins/externaltools/tools/library.py
++++ b/plugins/externaltools/tools/library.py
+@@ -71,7 +71,7 @@ class ToolLibrary(Singleton):
+ # created. It imports eventual tools that have been saved in the old XML
+ # storage file.
+ def import_old_xml_store(self):
+- import ElementTree as et
++ from xml.etree import ElementTree as et
+ filename = os.path.expanduser('~/.gnome2/gedit/gedit-tools.xml')
+ if not os.path.isfile(filename):
+ return
+diff --git a/plugins/snippets/snippets/Exporter.py b/plugins/snippets/snippets/Exporter.py
+index d2c4e23..28692e2 100644
+--- a/plugins/snippets/snippets/Exporter.py
++++ b/plugins/snippets/snippets/Exporter.py
+@@ -4,7 +4,7 @@ import sys
+ import shutil
+
+ from snippets.Library import *
+-import ElementTree as et
++from xml.etree import ElementTree as et
+ from Helper import *
+
+ class Exporter:
+diff --git a/plugins/snippets/snippets/Helper.py b/plugins/snippets/snippets/Helper.py
+index 7e35e4b..de36336 100644
+--- a/plugins/snippets/snippets/Helper.py
++++ b/plugins/snippets/snippets/Helper.py
+@@ -17,7 +17,7 @@
+
+ import string
+ from xml.sax import saxutils
+-from ElementTree import *
++from xml.etree.ElementTree import *
+ import re
+
+ import gtk
+diff --git a/plugins/snippets/snippets/Library.py b/plugins/snippets/snippets/Library.py
+index 6f1abac..5a645a2 100644
+--- a/plugins/snippets/snippets/Library.py
++++ b/plugins/snippets/snippets/Library.py
+@@ -23,7 +23,7 @@ import re
+
+ import gtk
+
+-import ElementTree as et
++from xml.etree import ElementTree as et
+ from Helper import *
+
+ class NamespacedId:
Modified: desktop/unstable/gedit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/rules?rev=22287&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/rules [utf-8] (original)
+++ desktop/unstable/gedit/debian/rules [utf-8] Wed Nov 11 21:59:57 2009
@@ -9,6 +9,10 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
binary-install/gedit::
+ # Remove code copies of ElementTree.py
+ rm debian/gedit/usr/lib/gedit-2/plugins/snippets/ElementTree.py
+ rm debian/gedit/usr/lib/gedit-2/plugins/externaltools/ElementTree.py
+ # Install lintian overrides
cp debian/gedit.lintian debian/gedit/usr/share/lintian/overrides/gedit
cd debian/gedit/usr/share/gedit-2 && mv gedit-bugreport.sh gedit-bugreport
chmod 755 debian/gedit/usr/share/bug/gedit/script
More information about the pkg-gnome-commits
mailing list