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

Mon May 12 23:48:40 UTC 2014

Date: Monday, May 12, 2014 @ 23:48:39
  Author: barry
Revision: 28880

* d/control:
  - Add python3-wheel to Build-Depends.
  - Bump Standards-Version to 3.9.5 with no other changes necessary.
  - Add the python-html5-wheels binary package.
  - wrap-and-sort
  - Fix python3-htmllib Suggests.
* d/rules:
  - Build the universal wheels.
  - Override dh_installchangelogs to use the CHANGES.rst file.
* d/python-html5-wheels.install: Added.
* d/patches/setuptools.patch: Added.

Added:
  packages/html5lib/trunk/debian/patches/
  packages/html5lib/trunk/debian/patches/series
  packages/html5lib/trunk/debian/patches/setuptools.patch
  packages/html5lib/trunk/debian/python-html5lib-wheels.install
Modified:
  packages/html5lib/trunk/debian/changelog
  packages/html5lib/trunk/debian/control
  packages/html5lib/trunk/debian/rules

Modified: packages/html5lib/trunk/debian/changelog
===================================================================

--- packages/html5lib/trunk/debian/changelog	2014-05-12 18:21:13 UTC (rev 28879)
+++ packages/html5lib/trunk/debian/changelog	2014-05-12 23:48:39 UTC (rev 28880)
@@ -1,3 +1,19 @@
+html5lib (0.999-3) UNRELEASED; urgency=medium
+
+  * d/control:
+    - Add python3-wheel to Build-Depends.
+    - Bump Standards-Version to 3.9.5 with no other changes necessary.
+    - Add the python-html5-wheels binary package.
+    - wrap-and-sort
+    - Fix python3-htmllib Suggests.
+  * d/rules:
+    - Build the universal wheels.
+    - Override dh_installchangelogs to use the CHANGES.rst file.
+  * d/python-html5-wheels.install: Added.
+  * d/patches/setuptools.patch: Added.
+
+ -- Barry Warsaw <barry at debian.org>  Mon, 12 May 2014 17:17:26 -0400
+
 html5lib (0.999-2) unstable; urgency=low
 
   * Add missing Build-Depends on python{3}-six, thanks to James Page

Modified: packages/html5lib/trunk/debian/control
===================================================================
--- packages/html5lib/trunk/debian/control	2014-05-12 18:21:13 UTC (rev 28879)
+++ packages/html5lib/trunk/debian/control	2014-05-12 23:48:39 UTC (rev 28880)
@@ -3,20 +3,30 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Olivier Berger <obergix at debian.org>
-Build-Depends: debhelper (>= 8), dh-python, python-all (>= 2.6.6-3~), python-setuptools, python-six, python3-all, python3-setuptools, python-nose, python3-nose, python3-six
+Build-Depends: debhelper (>= 8),
+               dh-python,
+               python-all (>= 2.6.6-3~),
+               python-nose,
+               python-setuptools,
+               python-six,
+               python3-all,
+               python3-nose,
+               python3-setuptools,
+               python3-six,
+               python3-wheel
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/html5lib/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/html5lib/trunk/
 Homepage: https://github.com/html5lib/html5lib-python
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 
 Package: python-html5lib
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-six
+Depends: python-six, ${misc:Depends}, ${python:Depends}
 # Not yet available in Debian :
 #Suggests: python-datrie
-Suggests: python-lxml, python-genshi, python-chardet
+Suggests: python-chardet, python-genshi, python-lxml
 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
@@ -26,13 +36,23 @@
 
 Package: python3-html5lib
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}, python3-six
+Depends: python3-six, ${misc:Depends}, ${python3:Depends}
 # Not yet available in Debian :
-#Suggests: python-datrie
-Suggests: python-lxml, python-genshi
+#Suggests: python3-datrie
+Suggests: python3-genshi, python3-lxml
 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.
+
+Package: python-html5lib-wheels
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: HTML parser/tokenizer based on the WHATWG HTML5 specification
+ 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 universal wheels.

Added: packages/html5lib/trunk/debian/patches/series
===================================================================
--- packages/html5lib/trunk/debian/patches/series	                        (rev 0)
+++ packages/html5lib/trunk/debian/patches/series	2014-05-12 23:48:39 UTC (rev 28880)
@@ -0,0 +1 @@
+setuptools.patch

Added: packages/html5lib/trunk/debian/patches/setuptools.patch
===================================================================
--- packages/html5lib/trunk/debian/patches/setuptools.patch	                        (rev 0)
+++ packages/html5lib/trunk/debian/patches/setuptools.patch	2014-05-12 23:48:39 UTC (rev 28880)
@@ -0,0 +1,13 @@
+Description: Use setuptools.setup() so that the bdist_wheel command is 
+ available.
+Author: Barry Warsaw <barry at debian.org>
+Forwarded: not-needed
+
+--- a/setup.py
++++ b/setup.py
+@@ -1,4 +1,4 @@
+-from distutils.core import setup
++from setuptools import setup
+ import os
+ import codecs
+ 

Added: packages/html5lib/trunk/debian/python-html5lib-wheels.install
===================================================================
--- packages/html5lib/trunk/debian/python-html5lib-wheels.install	                        (rev 0)
+++ packages/html5lib/trunk/debian/python-html5lib-wheels.install	2014-05-12 23:48:39 UTC (rev 28880)
@@ -0,0 +1 @@
+usr/share/python-wheels

Modified: packages/html5lib/trunk/debian/rules
===================================================================
--- packages/html5lib/trunk/debian/rules	2014-05-12 18:21:13 UTC (rev 28879)
+++ packages/html5lib/trunk/debian/rules	2014-05-12 23:48:39 UTC (rev 28880)
@@ -10,7 +10,8 @@
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
-# This might have been used, but we'll conform instead to upstream docs, mentioning running nosetests
+# This might have been used, but we'll conform instead to upstream docs,
+# mentioning running nosetests.
 #export PYBUILD_TEST_NOSE=1
 override_dh_auto_test:
 	# First, Python 2's nosetests
@@ -21,3 +22,12 @@
 	PYBUILD_DISABLE_python2=test \
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="nosetests3" dh_auto_test --buildsystem=pybuild
+
+override_dh_auto_install:
+	dh_auto_install
+	python3 setup.py bdist_wheel \
+		--universal \
+		-d $(CURDIR)/debian/tmp/usr/share/python-wheels
+
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGES.rst


