[Python-modules-commits] r3905 - in packages/elementtidy/trunk/debian (5 files)

shlomme at users.alioth.debian.org shlomme at users.alioth.debian.org
Fri Dec 7 23:06:38 UTC 2007 

    Date: Friday, December 7, 2007 @ 23:06:38
  Author: shlomme
Revision: 3905

* create new release to support python 2.5

Added:
  packages/elementtidy/trunk/debian/patches/02_python25_etree.patch
Modified:
  packages/elementtidy/trunk/debian/changelog
  packages/elementtidy/trunk/debian/control
  packages/elementtidy/trunk/debian/control.in
  packages/elementtidy/trunk/debian/rules

Modified: packages/elementtidy/trunk/debian/changelog
===================================================================
--- packages/elementtidy/trunk/debian/changelog	2007-12-07 23:02:51 UTC (rev 3904)
+++ packages/elementtidy/trunk/debian/changelog	2007-12-07 23:06:38 UTC (rev 3905)
@@ -1,4 +1,4 @@
-elementtidy (1.0-5) UNRELEASED; urgency=low
+elementtidy (1.0-5) unstable; urgency=low
 
   [ Piotr Ożarowski ]
   * Added Vcs-Svn, Vcs-Browser and Homepage fields
@@ -6,8 +6,14 @@
   [ Bernd Zeimetz ]
   * Fixing debian/watch. Thanks to Raphael Geissert (Closes: #450296).
 
- -- Bernd Zeimetz <bernd at bzed.de>  Wed, 07 Nov 2007 12:29:13 +0100
+  [ Torsten Marek ]
+  * Updated debian/control.in
+  * Added patch to make ElementTidy work with Python 2.5
+  * Converted the package to use python-support
+  * Changed standards version to 3.7.2.2, no changes
 
+ -- Torsten Marek <shlomme at debian.org>  Sat, 08 Dec 2007 00:05:53 +0100
+
 elementtidy (1.0-4) unstable; urgency=low
 
   * Updated for the new Python policy. Closes: #373419

Modified: packages/elementtidy/trunk/debian/control
===================================================================
--- packages/elementtidy/trunk/debian/control	2007-12-07 23:02:51 UTC (rev 3904)
+++ packages/elementtidy/trunk/debian/control	2007-12-07 23:06:38 UTC (rev 3905)
@@ -1,12 +1,11 @@
 Source: elementtidy
-Section: python
+Section: python 
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> 
 Uploaders: Torsten Marek <shlomme at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), patchutils (>= 0.2.25), debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.0), libtidy-dev
-Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.49), patchutils (>= 0.2.25), debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-support (>= 0.5.3), libtidy-dev
+Standards-Version: 3.7.2.2
 Homepage: http://effbot.org/zone/element-tidylib.htm
-XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/elementtidy/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/elementtidy/?op=log
 
@@ -16,7 +15,6 @@
 Conflicts: python2.3-elementtidy (<< 1.0-4), python2.4-elementtidy (<< 1.0-4)
 Replaces: python2.3-elementtidy (<< 1.0-4), python2.4-elementtidy (<< 1.0-4)
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: An HTML tree builder for ElementTree based on Tidy
  The ElementTidy parser can read (almost) arbitrary
  HTML files, and turn them into well-formed element trees.

Modified: packages/elementtidy/trunk/debian/control.in
===================================================================
--- packages/elementtidy/trunk/debian/control.in	2007-12-07 23:02:51 UTC (rev 3904)
+++ packages/elementtidy/trunk/debian/control.in	2007-12-07 23:06:38 UTC (rev 3905)
@@ -4,9 +4,8 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> 
 Uploaders: Torsten Marek <shlomme at debian.org>
 Build-Depends: @cdbs@, libtidy-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.2.2
 Homepage: http://effbot.org/zone/element-tidylib.htm
-XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/elementtidy/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/elementtidy/?op=log
 
@@ -16,7 +15,6 @@
 Conflicts: python2.3-elementtidy (<< 1.0-4), python2.4-elementtidy (<< 1.0-4)
 Replaces: python2.3-elementtidy (<< 1.0-4), python2.4-elementtidy (<< 1.0-4)
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: An HTML tree builder for ElementTree based on Tidy
  The ElementTidy parser can read (almost) arbitrary
  HTML files, and turn them into well-formed element trees.

Added: packages/elementtidy/trunk/debian/patches/02_python25_etree.patch
===================================================================
--- packages/elementtidy/trunk/debian/patches/02_python25_etree.patch	                        (rev 0)
+++ packages/elementtidy/trunk/debian/patches/02_python25_etree.patch	2007-12-07 23:06:38 UTC (rev 3905)
@@ -0,0 +1,15 @@
+diff -Naur elementtidy-1.0-20050212.orig/elementtidy/TidyHTMLTreeBuilder.py changed/elementtidy/TidyHTMLTreeBuilder.py
+--- elementtidy-1.0-20050212.orig/elementtidy/TidyHTMLTreeBuilder.py	2005-04-11 14:00:41.000000000 +0200
++++ changed/elementtidy/TidyHTMLTreeBuilder.py	2007-12-07 23:46:42.000000000 +0100
+@@ -46,7 +46,10 @@
+ # users can "patch in" another implementation if they want to (such as
+ # cElementTree)
+ 
+-from elementtree import ElementTree
++try:
++    from elementtree import ElementTree
++except ImportError:
++    from xml.etree import ElementTree
+ 
+ import _elementtidy
+ import string

Modified: packages/elementtidy/trunk/debian/rules
===================================================================
--- packages/elementtidy/trunk/debian/rules	2007-12-07 23:02:51 UTC (rev 3904)
+++ packages/elementtidy/trunk/debian/rules	2007-12-07 23:06:38 UTC (rev 3905)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
+DEB_PYTHON_SYSTEM=pysupport
 
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/debhelper.mk

More information about the Python-modules-commits mailing list