[Python-modules-commits] r26729 - in packages/html5lib/trunk/debian (7 files)

obergix at users.alioth.debian.org obergix at users.alioth.debian.org
Wed Dec 11 19:06:02 UTC 2013 

    Date: Wednesday, December 11, 2013 @ 19:05:57
  Author: obergix
Revision: 26729

New upstream version and add support for Python3

Squashed commit of the following:

commit 7e46ac0f88ace1c2c6e9f818843b3dd5ed5a11dc
Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
Date:   Wed Dec 11 20:03:33 2013 +0100

    Minor updates for Python 3

commit 96bccf8ec28b8e763599f0e7779fb982d89f0119
Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
Date:   Wed Dec 11 19:10:54 2013 +0100

    Ready for uploading

commit 3e80895a61727aacb2926976f062d1220b00e4aa
Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
Date:   Tue Dec 3 18:29:00 2013 +0100

    Oops: UNREALEASED for now

commit 2a1bd77dcb7c14b0d6796ef8e15ec7ebc009e53d
Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
Date:   Tue Dec 3 18:26:02 2013 +0100

    Update the watch file

commit cfb4f880d82fc598ab5bdc017ce65e99c4466952
Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
Date:   Tue Dec 3 18:25:47 2013 +0100

    Add upstream README

commit 44a9dd337064006e88741db3b45ed2200419cff5
Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
Date:   Tue Dec 3 18:25:14 2013 +0100

    Preparing for Python3

commit 41da090deba8ddcba3afa770e1708cb129ba747c
Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
Date:   Tue Dec 3 17:38:26 2013 +0100

    Fix missing operand when first build

commit 401499a8ba330aa2c94a91873138a2f84e3f889f
Author: Olivier Berger <olivier.berger at telecom-sudparis.eu>
Date:   Tue Dec 3 17:36:49 2013 +0100

    Prepare for latest version (0.99)

Added:
  packages/html5lib/trunk/debian/docs
  packages/html5lib/trunk/debian/python-html5lib.install
  packages/html5lib/trunk/debian/python3-html5lib.install
Modified:
  packages/html5lib/trunk/debian/changelog
  packages/html5lib/trunk/debian/control
  packages/html5lib/trunk/debian/rules
  packages/html5lib/trunk/debian/watch

Modified: packages/html5lib/trunk/debian/changelog
===================================================================
--- packages/html5lib/trunk/debian/changelog	2013-12-11 19:05:50 UTC (rev 26728)
+++ packages/html5lib/trunk/debian/changelog	2013-12-11 19:05:57 UTC (rev 26729)
@@ -1,3 +1,10 @@
+html5lib (0.99-1) unstable; urgency=low
+
+  * New upstream version.
+  * Add support for Python 3
+
+ -- Olivier Berger <obergix at debian.org>  Wed, 11 Dec 2013 19:10:12 +0100
+
 html5lib (0.95-2) UNRELEASED; urgency=low
 
   * Use canonical URIs for Vcs-* fields.

Modified: packages/html5lib/trunk/debian/control
===================================================================
--- packages/html5lib/trunk/debian/control	2013-12-11 19:05:50 UTC (rev 26728)
+++ packages/html5lib/trunk/debian/control	2013-12-11 19:05:57 UTC (rev 26729)
@@ -3,19 +3,33 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 7.0.50), python-all (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 7.0.50), python-all (>= 2.6.6-3~), python-setuptools, python3-setuptools 
 Build-Depends-Indep: python-lxml, python-simplejson, python-chardet
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/html5lib/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/html5lib/trunk/
 Homepage: http://code.google.com/p/html5lib/
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.2
 
 Package: python-html5lib
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
 Suggests: python-beautifulsoup, python-chardet, python-lxml | python-4suite-xml, python-genshi
-Description: HTML parser/tokenizer based on the WHATWG HTML5 specification
+Description: HTML parser/tokenizer based on the WHATWG HTML5 specification (Python 2)
  html5lib is a pure-python library for parsing HTML. It is designed to
  conform to the HTML 5 specification, which has formalized the error handling
  algorithms of popular web browsers.
+ .
+ This package contains the Python 2 version of html5lib.
+
+Package: python3-html5lib
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Suggests: python-beautifulsoup, python-chardet, python-lxml | python-4suite-xml, python-genshi
+Description: HTML parser/tokenizer based on the WHATWG HTML5 specification (Python 3)
+ html5lib is a pure-python library for parsing HTML. It is designed to
+ conform to the HTML 5 specification, which has formalized the error handling
+ algorithms of popular web browsers.
+ .
+ This package contains the Python 3 version of html5lib.

Added: packages/html5lib/trunk/debian/docs
===================================================================
--- packages/html5lib/trunk/debian/docs	                        (rev 0)
+++ packages/html5lib/trunk/debian/docs	2013-12-11 19:05:57 UTC (rev 26729)
@@ -0,0 +1 @@
+README.rst

Added: packages/html5lib/trunk/debian/python-html5lib.install
===================================================================
--- packages/html5lib/trunk/debian/python-html5lib.install	                        (rev 0)
+++ packages/html5lib/trunk/debian/python-html5lib.install	2013-12-11 19:05:57 UTC (rev 26729)
@@ -0,0 +1 @@
+usr/lib/python2.*/

Added: packages/html5lib/trunk/debian/python3-html5lib.install
===================================================================
--- packages/html5lib/trunk/debian/python3-html5lib.install	                        (rev 0)
+++ packages/html5lib/trunk/debian/python3-html5lib.install	2013-12-11 19:05:57 UTC (rev 26729)
@@ -0,0 +1 @@
+usr/lib/python3/

Modified: packages/html5lib/trunk/debian/rules
===================================================================
--- packages/html5lib/trunk/debian/rules	2013-12-11 19:05:50 UTC (rev 26728)
+++ packages/html5lib/trunk/debian/rules	2013-12-11 19:05:57 UTC (rev 26729)
@@ -1,12 +1,24 @@
 #!/usr/bin/make -f
 
-PYVERS:=$(shell pyversions -vr)
-pythonpath = $$(ls -d $(CURDIR)/build/lib.*-$(1))
+# PYVERS:=$(shell pyversions -vr)
+# pythonpath = $$(ls -d $(CURDIR)/build/lib.*-$(1))
+PY3REQUESTED := $(shell py3versions -r)
+PY3DEFAULT := $(shell py3versions -d)
+PYTHON3 := $(filter-out $(PY3DEFAULT),$(PY3REQUESTED)) python3
 
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
 
 %:
-	dh --with python2 $@
+	dh $@ --with python2,python3
 
+override_dh_auto_build:
+	# Build for each Python 3 version
+	set -ex; for python in $(PYTHON3); do \
+		$$python setup.py build; \
+	done
+	dh_auto_build
+
 override_dh_auto_test:
 ifeq (test-suite-is-broken-again,yes)
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -18,6 +30,13 @@
 endif
 endif
 
+# override_dh_auto_install:
+# 	dh_auto_install
+# 	find debian/python-html5lib -type d -name tests -exec rm {} \;
+
 override_dh_auto_install:
+	# The same for install; note the --install-layout=deb option
+	set -ex; for python in $(PYTHON3); do \
+		$$python setup.py install --install-layout=deb --root=debian/tmp; \
+	done
 	dh_auto_install
-	find debian/python-html5lib -type d -name tests -print0 | xargs -0 rm -r

Modified: packages/html5lib/trunk/debian/watch
===================================================================
--- packages/html5lib/trunk/debian/watch	2013-12-11 19:05:50 UTC (rev 26728)
+++ packages/html5lib/trunk/debian/watch	2013-12-11 19:05:57 UTC (rev 26729)
@@ -1,2 +1,4 @@
 version=3
-http://code.google.com/p/html5lib/downloads/list //html5lib.googlecode.com/files/html5lib-([0-9.]+)\.tar\.gz
+# do not use (\d\S*) to avoid beta versions and likes
+opts=filenamemangle=s/.+\/v?(\d[\d\.]*)\.tar\.gz/html5lib-python-$1\.tar\.gz/ \
+  https://github.com/html5lib/html5lib-python/tags .*/v?(\d[\d\.]*)\.tar\.gz
\ No newline at end of file

More information about the Python-modules-commits mailing list