[Python-modules-commits] r21668 - in packages/html5lib/trunk/debian (8 files)

Wed May 9 19:43:27 UTC 2012

Date: Wednesday, May 9, 2012 @ 19:43:25
  Author: bzed
Revision: 21668

* Fix watch file.
* Tidy debian/rules, using dh, bump debian/compat to 7.
* Migrate to dh_python2.
* Drop no-setuptools patch, add python-setuptools as dependency.
* Drop patch system and debian/README.source
* Remove debian/examples - not shipped by upstream anymore.
* Bump Standards-Version to 3.9.3.

Modified:
  packages/html5lib/trunk/debian/changelog
  packages/html5lib/trunk/debian/compat
  packages/html5lib/trunk/debian/control
  packages/html5lib/trunk/debian/rules
Deleted:
  packages/html5lib/trunk/debian/README.source
  packages/html5lib/trunk/debian/examples
  packages/html5lib/trunk/debian/patches/
  packages/html5lib/trunk/debian/pyversions

Deleted: packages/html5lib/trunk/debian/README.source
===================================================================

--- packages/html5lib/trunk/debian/README.source	2012-05-09 19:28:06 UTC (rev 21667)
+++ packages/html5lib/trunk/debian/README.source	2012-05-09 19:43:25 UTC (rev 21668)
@@ -1,4 +0,0 @@
-This package uses dpatch to handle patches against upstream source code; you
-can find additional information about dpatch at
-
-    /usr/share/doc/dpatch/

Modified: packages/html5lib/trunk/debian/changelog
===================================================================
--- packages/html5lib/trunk/debian/changelog	2012-05-09 19:28:06 UTC (rev 21667)
+++ packages/html5lib/trunk/debian/changelog	2012-05-09 19:43:25 UTC (rev 21668)
@@ -1,9 +1,15 @@
-html5lib (0.95-1) UNRELEASED; urgency=low
+html5lib (0.95-1) unstable; urgency=low
 
   * New upstream version
-  * watch file fixed.
+  * Fix watch file.
+  * Tidy debian/rules, using dh, bump debian/compat to 7.
+  * Migrate to dh_python2.
+  * Drop no-setuptools patch, add python-setuptools as dependency.
+  * Drop patch system and debian/README.source
+  * Remove debian/examples - not shipped by upstream anymore.
+  * Bump Standards-Version to 3.9.3.
 
- -- Bernd Zeimetz <bzed at debian.org>  Wed, 09 May 2012 21:27:53 +0200
+ -- Bernd Zeimetz <bzed at debian.org>  Wed, 09 May 2012 21:43:18 +0200
 
 html5lib (0.90-1) unstable; urgency=low
 

Modified: packages/html5lib/trunk/debian/compat
===================================================================
--- packages/html5lib/trunk/debian/compat	2012-05-09 19:28:06 UTC (rev 21667)
+++ packages/html5lib/trunk/debian/compat	2012-05-09 19:43:25 UTC (rev 21668)
@@ -1 +1 @@
-5
+7

Modified: packages/html5lib/trunk/debian/control
===================================================================
--- packages/html5lib/trunk/debian/control	2012-05-09 19:28:06 UTC (rev 21667)
+++ packages/html5lib/trunk/debian/control	2012-05-09 19:43:25 UTC (rev 21668)
@@ -3,12 +3,13 @@
 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 (>= 5), python-all, dpatch
-Build-Depends-Indep: python-support (>= 0.4), python-lxml, python-simplejson, python-chardet
+Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3~), python-setuptools
+Build-Depends-Indep: python-lxml, python-simplejson, python-chardet
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/html5lib/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/html5lib/trunk/
 Homepage: http://code.google.com/p/html5lib/
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
+X-Python-Version: >= 2.5
 
 Package: python-html5lib
 Architecture: all

Deleted: packages/html5lib/trunk/debian/examples
===================================================================
--- packages/html5lib/trunk/debian/examples	2012-05-09 19:28:06 UTC (rev 21667)
+++ packages/html5lib/trunk/debian/examples	2012-05-09 19:43:25 UTC (rev 21668)
@@ -1 +0,0 @@
-examples/*

Deleted: packages/html5lib/trunk/debian/pyversions
===================================================================
--- packages/html5lib/trunk/debian/pyversions	2012-05-09 19:28:06 UTC (rev 21667)
+++ packages/html5lib/trunk/debian/pyversions	2012-05-09 19:43:25 UTC (rev 21668)
@@ -1 +0,0 @@
-2.5-

Modified: packages/html5lib/trunk/debian/rules
===================================================================
--- packages/html5lib/trunk/debian/rules	2012-05-09 19:28:06 UTC (rev 21667)
+++ packages/html5lib/trunk/debian/rules	2012-05-09 19:43:25 UTC (rev 21668)
@@ -1,76 +1,6 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
-PKGNAME:=python-html5lib
-PYVERS:=$(shell pyversions -r)
+%:
+	dh --with python2 $@
 
-
-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)))
-	set -e ;\
-	if [ -d tests ]; then cd tests ;\
-	for py in $(PYVERS); do  \
-	    PYTHONPATH=$(CURDIR)/build/lib $$py runtests.py; \
-	done; fi
-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
-


