Package: python-wadllib
Version: 1.2.0+ds-2
Followup-For: Bug #658051

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear Maintainer,

Here is an updated patch that addresses Jakub's review.  It still
doesn't completely fix the repeatability of the build, but doesn't
make things worse than it was before.


- -- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.1.0-1-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages python-wadllib depends on:
ii  python                2.7.2-10
ii  python-lazr.uri       1.0.3-1
ii  python-pkg-resources  0.6.24-1
ii  python-simplejson     2.3.2-1
ii  python2.6             2.6.7-4
ii  python2.7             2.7.2-8

python-wadllib recommends no packages.

python-wadllib suggests no packages.

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJPMZHUAAoJEBJutWOnSwa/WnAQALDMGDzZ0o3aIfFUQjQoRAsh
XHLzDOMhqIsc5X3sn1DO0JH9yDg0JmFN3dbE5v/yz1mA4z3szRibzxGSFn8/ZQ1E
tn7pCyxxNAbOk4LiUSVu7yZC6G/TtpRLwM8h4LdzgIB+Dfp+YlQtw0l3O2M3Mtxg
P0VLtZacAJNzn8f16s27BgArXCqio6qyy14RxYqJFnwVn8zd0gWi2gr3MtDFJVM9
CyUXXbApAVkiBDm16OvMki8wRzqVYZqYCUa0q5GsH/djvPHHJvfK4di/KywHnT8S
IzhklGzxwh/rVcuSGEF3pLs1+UxknXZIE9NdTq1ScO5BLZCazIg8lksJr0zOmgRW
hsyB7DHfZLW5VFdLpvIACpx8tjdmpfvf0n+lnMvs6Gn1Zt5aIA9Ls7SEG9nJ/nDF
ZrMVn+3pe+XdabANYywaFuiROzTxXu0P+Kq810K7fHszNkmUilmYm0iFkt4Zksv/
7PRc0J+FK+pnNSToUWln1UIIoxASHL+7HvHqQ+tAS5jUKYmkcGwYRUn1hLvHP0wQ
FXjg8b4tDUVnkrM0unq04YKfkqvuA8kBMX0V6s2Plp84SK5nOhTRD6d71GQSaipZ
1ArUY1D3m7hCtCZv9wS2MOYMm0v0SX/zSAlunjlnWdLSJsuaju3aleHW+AztfdLu
WaEEwmxzgJuAMl5LXCTn
=oSlB
-----END PGP SIGNATURE-----
Index: debian/control
===================================================================
--- debian/control	(revision 20368)
+++ debian/control	(working copy)
@@ -3,18 +3,28 @@
 Priority: optional
 Maintainer: Luca Falavigna <[email protected]>
 Uploaders: Debian Python Modules Team <[email protected]>, James Westby <[email protected]>
-Build-Depends: debhelper (>= 7.3.0), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 7.3.0), python (>= 2.6.6-3~), python-setuptools, python3, python3-setuptools, python-lazr.uri, python3-lazr.uri
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/wadllib
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-wadllib/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-wadllib/trunk/
 X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.2
 
 Package: python-wadllib
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-simplejson, python-lazr.uri
+Depends: ${python:Depends}, ${misc:Depends}
 Breaks: ${python:Breaks}
-Description: Python library for navigating WADL files
+Description: Python library for navigating WADL files (Python 2)
  The Web Application Description Language (WADL) is an XML vocabulary for
  describing the capabilities of HTTP resources. wadllib can be used in
  conjunction with an HTTP library to navigate and manipulate those resources.
+
+Package: python3-wadllib
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Breaks: ${python:Breaks}
+Description: Python library for navigating WADL files (Python 3)
+ The Web Application Description Language (WADL) is an XML vocabulary for
+ describing the capabilities of HTTP resources. wadllib can be used in
+ conjunction with an HTTP library to navigate and manipulate those resources.
Index: debian/python-wadllib.install
===================================================================
--- debian/python-wadllib.install	(revision 0)
+++ debian/python-wadllib.install	(revision 0)
@@ -0,0 +1 @@
+usr/lib/python2*
Index: debian/python3-wadllib.install
===================================================================
--- debian/python3-wadllib.install	(revision 0)
+++ debian/python3-wadllib.install	(revision 0)
@@ -0,0 +1 @@
+usr/lib/python3
Index: debian/changelog
===================================================================
--- debian/changelog	(revision 20368)
+++ debian/changelog	(working copy)
@@ -1,3 +1,11 @@
+python-wadllib (1.3.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/rules: drop --buildsystem=python_distutils since it's not needed.
+  * Add support for Python 3.
+
+ -- Barry Warsaw <[email protected]>  Mon, 06 Feb 2012 20:17:50 -0500
+
 python-wadllib (1.2.0+ds-2) unstable; urgency=low
 
   * Python transition:
Index: debian/rules
===================================================================
--- debian/rules	(revision 20368)
+++ debian/rules	(working copy)
@@ -1,12 +1,38 @@
 #!/usr/bin/make -f
 
+#DH_VERBOSE=1
+
+PYTHON2=$(shell pyversions -vr)
+PYTHON3=$(shell py3versions -vr)
+
 %:
-	dh $@ --with python2 --buildsystem=python_distutils
+	dh $@ --with python2,python3
 
-override_dh_auto_install:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+test-python%:
+	python$* setup.py test -vv
+
+override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+endif
+
+build-python%:
+	python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+	dh_auto_build
+
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
 	dh_auto_install
-	find $(CURDIR)/debian/python-wadllib -wholename "*python2.*/wadllib" \
+	find $(CURDIR)/debian/tmp -wholename "*python*/wadllib" \
 		-exec install -m 0644 $(CURDIR)/src/wadllib/version.txt {} \;
 
 override_dh_installchangelogs:
-	dh_installchangelogs src/wadllib/NEWS.txt
+	dh_installchangelogs -k src/wadllib/NEWS.txt
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build
+	rm -rf *.egg-info

Reply via email to