[Python-modules-commits] r26754 - in packages/html5lib/trunk/debian (16 files)

obergix at users.alioth.debian.org obergix at users.alioth.debian.org
Fri Dec 13 11:34:38 UTC 2013 

    Date: Friday, December 13, 2013 @ 11:34:37
  Author: obergix
Revision: 26754

updates for pybuild, and taking into account novelties in 0.99

Added:
  packages/html5lib/trunk/debian/python3-html5lib.substvars
  packages/html5lib/trunk/debian/python3-html5lib/
  packages/html5lib/trunk/debian/python3-html5lib/usr/
  packages/html5lib/trunk/debian/python3-html5lib/usr/lib/
  packages/html5lib/trunk/debian/python3-html5lib/usr/lib/python3/
  packages/html5lib/trunk/debian/python3-html5lib/usr/lib/python3/dist-packages/
  packages/html5lib/trunk/debian/python3-html5lib/usr/lib/python3/dist-packages/html5lib/
  packages/html5lib/trunk/debian/python3-html5lib/usr/lib/python3/dist-packages/html5lib/trie/
  packages/html5lib/trunk/debian/python3-html5lib/usr/lib/python3/dist-packages/html5lib/trie/__init__.py
Modified:
  packages/html5lib/trunk/debian/control
  packages/html5lib/trunk/debian/copyright
  packages/html5lib/trunk/debian/rules
  packages/html5lib/trunk/debian/source/format
  packages/html5lib/trunk/debian/watch
Deleted:
  packages/html5lib/trunk/debian/python-html5lib.install
  packages/html5lib/trunk/debian/python3-html5lib.install

Modified: packages/html5lib/trunk/debian/control
===================================================================
--- packages/html5lib/trunk/debian/control	2013-12-13 10:18:28 UTC (rev 26753)
+++ packages/html5lib/trunk/debian/control	2013-12-13 11:34:37 UTC (rev 26754)
@@ -2,20 +2,24 @@
 Section: python
 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, python3-setuptools 
-Build-Depends-Indep: python-lxml, python-simplejson, python-chardet
+Uploaders: Olivier Berger <obergix at debian.org>
+Build-Depends: debhelper (>= 8), dh-python, python-all (>= 2.6.6-3~), python-setuptools, python3-all, python3-setuptools 
+# flake8, nose
+#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
+Homepage: https://github.com/html5lib/html5lib-python
+Standards-Version: 3.9.4
+X-Python-Version: >= 2.6
 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
+Depends: ${python:Depends}, ${misc:Depends}, python-six
+# Not yet available in Debian :
+#Suggests: python-datrie
+Suggests: python-lxml, python-genshi, python-chardet
+#Suggests: python-beautifulsoup, python-chardet, python-lxml | python-4suite-xml, python-genshi
 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
@@ -25,8 +29,11 @@
 
 Package: python3-html5lib
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
-Suggests: python-beautifulsoup, python-chardet, python-lxml | python-4suite-xml, python-genshi
+Depends: ${python3:Depends}, ${misc:Depends}, python3-six
+# Not yet available in Debian :
+#Suggests: python-datrie
+Suggests: python-lxml, python-genshi
+#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

Modified: packages/html5lib/trunk/debian/copyright
===================================================================
--- packages/html5lib/trunk/debian/copyright	2013-12-13 10:18:28 UTC (rev 26753)
+++ packages/html5lib/trunk/debian/copyright	2013-12-13 11:34:37 UTC (rev 26754)
@@ -1,11 +1,16 @@
 This package was debianized by Bernd Zeimetz <bernd at bzed.de> on
 Sun, 11 Mar 2007 21:29:42 +0100
 
-It was downloaded from http://code.google.com/p/html5lib/
+Latest version of upstream sources was downloaded from
+https://pypi.python.org/pypi/html5lib (attention, releases on GitHub
+made out of upstream git tags differ: not all files shipped in
+release).
 
-Copyright (c) 2006 The Authors
+-------------
+
+html5lib is Copyright (c) 2006 The Authors
 Authors:
-  James Graham - jg307 at cam.ac.uk
+  James Graham - james at hoppipolla.co.uk
   Anne van Kesteren - annevankesteren at gmail.com
   Lachlan Hunt - lachlan.hunt at lachy.id.au
   Matt McDonald - kanashii at kanashii.ca
@@ -33,35 +38,9 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-The Debian packaging is Copyright (C) 2007-2009,
-Bernd Zeimetz <bzed at debian.org> and is licensed under the same license
-as html5lib, see above.
+-------------
 
-
-Files with different copyrights/licenses:
-
-  *  src/html5lib/filters/{iso639codes,rfc2046,rfc3987}.py
-
-     adapted from feedvalidator, original copyright license is
-   
-     Copyright (c) 2002-2006, Sam Ruby, Mark Pilgrim, Joseph Walton, and Phil Ringnalda
-   
-     Permission is hereby granted, free of charge, to any person obtaining a copy
-     of this software and associated documentation files (the "Software"), to deal
-     in the Software without restriction, including without limitation the rights
-     to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-     copies of the Software, and to permit persons to whom the Software is
-     furnished to do so, subject to the following conditions:
-   
-     The above copyright notice and this permission notice shall be included in all
-     copies or substantial portions of the Software.
-   
-     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-     SOFTWARE.
-
-
+The Debian packaging is Copyright (C) 2007-2009, Bernd Zeimetz
+<bzed at debian.org>, Copyright (c) 2013 Olivier Berger
+<obergix at debian.org>, and is licensed under the same license as
+html5lib, see above.

Deleted: packages/html5lib/trunk/debian/python-html5lib.install
===================================================================
--- packages/html5lib/trunk/debian/python-html5lib.install	2013-12-13 10:18:28 UTC (rev 26753)
+++ packages/html5lib/trunk/debian/python-html5lib.install	2013-12-13 11:34:37 UTC (rev 26754)
@@ -1 +0,0 @@
-usr/lib/python2.*/

Added: packages/html5lib/trunk/debian/python3-html5lib/usr/lib/python3/dist-packages/html5lib/trie/__init__.py
===================================================================
--- packages/html5lib/trunk/debian/python3-html5lib/usr/lib/python3/dist-packages/html5lib/trie/__init__.py	                        (rev 0)
+++ packages/html5lib/trunk/debian/python3-html5lib/usr/lib/python3/dist-packages/html5lib/trie/__init__.py	2013-12-13 11:34:37 UTC (rev 26754)
@@ -0,0 +1,12 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from .py import Trie as PyTrie
+
+Trie = PyTrie
+
+try:
+    from .datrie import Trie as DATrie
+except ImportError:
+    pass
+else:
+    Trie = DATrie

Deleted: packages/html5lib/trunk/debian/python3-html5lib.install
===================================================================
--- packages/html5lib/trunk/debian/python3-html5lib.install	2013-12-13 10:18:28 UTC (rev 26753)
+++ packages/html5lib/trunk/debian/python3-html5lib.install	2013-12-13 11:34:37 UTC (rev 26754)
@@ -1 +0,0 @@
-usr/lib/python3/

Added: packages/html5lib/trunk/debian/python3-html5lib.substvars
===================================================================
--- packages/html5lib/trunk/debian/python3-html5lib.substvars	                        (rev 0)
+++ packages/html5lib/trunk/debian/python3-html5lib.substvars	2013-12-13 11:34:37 UTC (rev 26754)
@@ -0,0 +1,2 @@
+python3:Depends=python3:any (>= 3.2), python3:any (>= 3.3.2-2~)
+misc:Depends=

Modified: packages/html5lib/trunk/debian/rules
===================================================================
--- packages/html5lib/trunk/debian/rules	2013-12-13 10:18:28 UTC (rev 26753)
+++ packages/html5lib/trunk/debian/rules	2013-12-13 11:34:37 UTC (rev 26754)
@@ -1,42 +1,45 @@
 #!/usr/bin/make -f
 
-# 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
 
-#export DH_VERBOSE=1
-#export DH_OPTIONS=-v
+export PYBUILD_NAME=html5lib
 
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
-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
+# # 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
 
-override_dh_auto_test:
-ifeq (test-suite-is-broken-again,yes)
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	set -e ;\
-	   cd html5lib/tests ;\
-		for py in $(PYVERS); do  \
-			PYTHONPATH=$(call pythonpath,$$py) python$$py runtests.py; \
-	done
-endif
-endif
 
+# 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)))
+# 	set -e ;\
+# 	   cd html5lib/tests ;\
+# 		for py in $(PYVERS); do  \
+# 			PYTHONPATH=$(call pythonpath,$$py) python$$py runtests.py; \
+# 	done
+# 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 -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

Modified: packages/html5lib/trunk/debian/source/format
===================================================================
--- packages/html5lib/trunk/debian/source/format	2013-12-13 10:18:28 UTC (rev 26753)
+++ packages/html5lib/trunk/debian/source/format	2013-12-13 11:34:37 UTC (rev 26754)
@@ -1 +1 @@
-1.0
+3.0 (quilt)

Modified: packages/html5lib/trunk/debian/watch
===================================================================
--- packages/html5lib/trunk/debian/watch	2013-12-13 10:18:28 UTC (rev 26753)
+++ packages/html5lib/trunk/debian/watch	2013-12-13 11:34:37 UTC (rev 26754)
@@ -1,4 +1,6 @@
 version=3
 # 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
 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
+https://pypi.python.org/packages/source/h/html5lib/html5lib-(\d[\d\.]*)\.(?:tar\.gz|zip|tar\.bz2)
\ No newline at end of file

More information about the Python-modules-commits mailing list