[Python-modules-commits] r3344 - in /packages/html5lib/trunk/debian: changelog control patches/00list patches/example-parse.py-fix.dpatch rules

Mon Oct 1 07:35:29 UTC 2007

Author: bzed-guest
Date: Mon Oct  1 07:35:29 2007
New Revision: 3344

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3344
Log:
* New upstream version
  - Updating Build-Depends/Depends/Suggests to reflect the requirements of
    the new version
* debian/rules:
  - Switching from cdbs to a "normal" rules file, also added test runs

Removed:
    packages/html5lib/trunk/debian/patches/example-parse.py-fix.dpatch
Modified:
    packages/html5lib/trunk/debian/changelog
    packages/html5lib/trunk/debian/control
    packages/html5lib/trunk/debian/patches/00list
    packages/html5lib/trunk/debian/rules

Modified: packages/html5lib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/html5lib/trunk/debian/changelog?rev=3344&op=diff
==============================================================================

--- packages/html5lib/trunk/debian/changelog (original)
+++ packages/html5lib/trunk/debian/changelog Mon Oct  1 07:35:29 2007
@@ -1,8 +1,13 @@
-html5lib (0.9-3) UNRELEASED; urgency=low
+html5lib (0.10-1) UNRELEASED; urgency=low
 
+  * New upstream version
   * debian/control:
     - Adding Homepage field, removing pseudo-field from description
     - Updating description to reflect the updated name of the specification
+    - Updating Build-Depends/Depends/Suggests to reflect the requirements of
+      the new version
+  * debian/rules:
+    - Switching from cdbs to a "normal" rules file, also added test runs
 
  -- Bernd Zeimetz <bernd at bzed.de>  Fri, 21 Sep 2007 17:58:29 +0200
 

Modified: packages/html5lib/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/html5lib/trunk/debian/control?rev=3344&op=diff
==============================================================================
--- packages/html5lib/trunk/debian/control (original)
+++ packages/html5lib/trunk/debian/control Mon Oct  1 07:35:29 2007
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Bernd Zeimetz <bernd at bzed.de>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), python, python-support (>= 0.4), dpatch
-Build-Depends-Indep: python-xml, python-elementtree
+Build-Depends: debhelper (>= 5), python, python-support (>= 0.4), dpatch
+Build-Depends-Indep: python-xml, python-lxml, python-celementtree, python-elementtree, python-simplejson
 XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/html5lib/trunk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/html5lib/trunk/
 Homepage: http://code.google.com/p/html5lib/
@@ -12,8 +12,8 @@
 
 Package: python-html5lib
 Architecture: all
-Depends: ${python:Depends}, python-xml, python-elementtree
-Suggests: python-chardet
+Depends: ${python:Depends}, python-xml
+Suggests: python-beautifulsoap, python-chardet, python-celementtree | python-elementtree, python-lxml
 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

Modified: packages/html5lib/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/html5lib/trunk/debian/patches/00list?rev=3344&op=diff
==============================================================================
--- packages/html5lib/trunk/debian/patches/00list (original)
+++ packages/html5lib/trunk/debian/patches/00list Mon Oct  1 07:35:29 2007
@@ -1,1 +1,1 @@
-example-parse.py-fix
+no-setuptools-please

Modified: packages/html5lib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/html5lib/trunk/debian/rules?rev=3344&op=diff
==============================================================================
--- packages/html5lib/trunk/debian/rules (original)
+++ packages/html5lib/trunk/debian/rules Mon Oct  1 07:35:29 2007
@@ -1,9 +1,77 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pysupport
-DEB_COMPRESS_EXCLUDE := .py
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+PKGNAME:=python-html5lib
+PYVERS:=$(shell pyversions -r)
 
+
+include /usr/share/dpatch/dpatch.make
+
+build: patch build-stamp
+build-stamp:
+	dh_testdir
+
+	set -e; \
+	for py in $(PYVERS); do  \
+	    $$py setup.py build; \
+	done
+
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	    for py in $(PYVERS); do  \
+	        for test in $(wildcard test/test*); do \
+		    echo running test: $$test; \
+		    PYTHONPATH=build/lib $$py $$test; \
+	        done; \
+	    done
+endif
+
+	touch $@
+
+clean: clean-patched unpatch
+clean-patched: patch-stamp
+	dh_testdir
+	dh_testroot
+	rm -f install-stamp build-stamp
+	-for py in $(PYVERS); do  \
+	    $$py setup.py clean; \
+	done
+	find . -name \*.pyc | xargs rm -f
+	rm -rf build
+	dh_clean 
+
+install: install-stamp
+install-stamp:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	set -e; \
+	for py in $(PYVERS); do  \
+	    $$py setup.py install --root=debian/$(PKGNAME); \
+	done
+
+	dh_installdocs -A
+	dh_installexamples
+	touch install-stamp
+
+binary-arch: build install
+# We have nothing to do by default.
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_compress -X.py
+	dh_fixperms
+	dh_pysupport
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install \
+        clean-patched patch unpatch
+


