[Python-modules-commits] r20542 - in packages/python-wadllib/trunk/debian (14 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Wed Feb 22 22:49:28 UTC 2012
Date: Wednesday, February 22, 2012 @ 22:49:26
Author: stefanor
Revision: 20542
* New upstream release. (Closes: #658051)
- With Python 3 support. Thanks Barry Warsaw.
* New maintainer.
* Wrap long dependency lists.
* Run test suite.
- B-D on python-all and python3-all for test suite.
* Dropped usage of ${python:Breaks}, no longer used by dh_python2.
* Drop pydist-overrides, no longer necessary.
* Updated watch file.
* Clean src/egg-info.
* Removed changelog duplicate, NEWS.txt.
* debian/copyright: Converted to DEP5 machine-readable format.
* Install version.txt via package_data.
Added:
packages/python-wadllib/trunk/debian/patches/install-data
packages/python-wadllib/trunk/debian/python-wadllib.docs
(from rev 16654, packages/python-wadllib/trunk/debian/docs)
packages/python-wadllib/trunk/debian/python-wadllib.install
packages/python-wadllib/trunk/debian/python3-wadllib.docs
(from rev 16654, packages/python-wadllib/trunk/debian/docs)
packages/python-wadllib/trunk/debian/python3-wadllib.install
Modified:
packages/python-wadllib/trunk/debian/changelog
packages/python-wadllib/trunk/debian/control
packages/python-wadllib/trunk/debian/copyright
packages/python-wadllib/trunk/debian/patches/series
packages/python-wadllib/trunk/debian/rules
packages/python-wadllib/trunk/debian/watch
Deleted:
packages/python-wadllib/trunk/debian/docs
packages/python-wadllib/trunk/debian/patches/no_package_data.patch
packages/python-wadllib/trunk/debian/pydist-overrides
Modified: packages/python-wadllib/trunk/debian/changelog
===================================================================
--- packages/python-wadllib/trunk/debian/changelog 2012-02-22 22:26:17 UTC (rev 20541)
+++ packages/python-wadllib/trunk/debian/changelog 2012-02-22 22:49:26 UTC (rev 20542)
@@ -1,3 +1,21 @@
+python-wadllib (1.3.0-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #658051)
+ - With Python 3 support. Thanks Barry Warsaw.
+ * New maintainer.
+ * Wrap long dependency lists.
+ * Run test suite.
+ - B-D on python-all and python3-all for test suite.
+ * Dropped usage of ${python:Breaks}, no longer used by dh_python2.
+ * Drop pydist-overrides, no longer necessary.
+ * Updated watch file.
+ * Clean src/egg-info.
+ * Removed changelog duplicate, NEWS.txt.
+ * debian/copyright: Converted to DEP5 machine-readable format.
+ * Install version.txt via package_data.
+
+ -- Stefano Rivera <stefanor at debian.org> Thu, 23 Feb 2012 00:39:57 +0200
+
python-wadllib (1.2.0+ds-2) unstable; urgency=low
* Python transition:
Modified: packages/python-wadllib/trunk/debian/control
===================================================================
--- packages/python-wadllib/trunk/debian/control 2012-02-22 22:26:17 UTC (rev 20541)
+++ packages/python-wadllib/trunk/debian/control 2012-02-22 22:49:26 UTC (rev 20542)
@@ -1,20 +1,40 @@
Source: python-wadllib
Section: python
Priority: optional
-Maintainer: Luca Falavigna <dktrkranz at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, James Westby <james.westby at ubuntu.com>
-Build-Depends: debhelper (>= 7.3.0), python (>= 2.6.6-3~), python-setuptools
+Maintainer: Stefano Rivera <stefanor at debian.org>
+Uploaders:
+ Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends:
+ debhelper (>= 7.3.0),
+ python-all (>= 2.6.6-3~),
+ python-lazr.uri,
+ python-setuptools,
+ python3-all (>= 3.1.2-6~),
+ python3-lazr.uri,
+ python3-setuptools
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
-Breaks: ${python:Breaks}
+Depends: ${misc:Depends}, ${python:Depends}
Description: Python library for navigating WADL files
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.
+ .
+ This package provides wadllib for Python 2.x.
+
+Package: python3-wadllib
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: Python 3 library for navigating WADL files
+ 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.
+ .
+ This package provides wadllib for Python 3.x.
Modified: packages/python-wadllib/trunk/debian/copyright
===================================================================
--- packages/python-wadllib/trunk/debian/copyright 2012-02-22 22:26:17 UTC (rev 20541)
+++ packages/python-wadllib/trunk/debian/copyright 2012-02-22 22:49:26 UTC (rev 20542)
@@ -1,32 +1,27 @@
-This package was debianized by James Westby <james.westby at canonical.com> on
-Mon, 04 Aug 2008 12:37:47 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: wadllib
+Source: https://launchpad.net/wadllib
-It was downloaded from https://launchpad.net/wadllib
+Files: *
+Copyright: 2008-2009 Canonical Ltd.
+License: LGPL-3.0
-Upstream Authors:
-
- Launchpad developers <launchpadlib at lists.launchpad.net>
-
+Files: debian/*
Copyright:
+ 2009, James Westby <james.westby at ubuntu.com>
+ 2009-2011, Luca Falavigna <dktrkranz at debian.org>
+ 2012, Stefano Rivera <stefanor at debian.org>
+License: LGPL-3.0
- Copyright 2008-2009 Canonical Ltd.
-
-License:
-
- wadllib is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, version 3 of the License.
-
- wadllib is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with wadllib. If not, see <http://www.gnu.org/licenses/>.
-
-On Debian-based systems the full text of the LGPL, version 3, can be found at
-/usr/share/common-licenses/LGPL-3.
-
-The Debian packaging is copyright 2008-2009, James Westby <james.westby at ubuntu.com>
-and is licensed under the LGPL as above.
+License: LGPL-3.0
+ lazr.restfulclient is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation, version 3 of the License.
+ .
+ lazr.restfulclient is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details.
+ .
+ On Debian systems the complete text of the LGPL, version 3, can be found at
+ /usr/share/common-licenses/LGPL-3.
Deleted: packages/python-wadllib/trunk/debian/docs
===================================================================
--- packages/python-wadllib/trunk/debian/docs 2012-02-22 22:26:17 UTC (rev 20541)
+++ packages/python-wadllib/trunk/debian/docs 2012-02-22 22:49:26 UTC (rev 20542)
@@ -1,2 +0,0 @@
-src/wadllib/NEWS.txt
-src/wadllib/README.txt
Added: packages/python-wadllib/trunk/debian/patches/install-data
===================================================================
--- packages/python-wadllib/trunk/debian/patches/install-data (rev 0)
+++ packages/python-wadllib/trunk/debian/patches/install-data 2012-02-22 22:49:26 UTC (rev 20542)
@@ -0,0 +1,20 @@
+Description: Install version.txt with package_data
+Author: Stefano Rivera <stefanor at debian.org>
+Last-Update: 2012-02-23
+
+--- a/setup.py
++++ b/setup.py
+@@ -58,6 +58,7 @@
+ version=__version__,
+ packages=find_packages('src'),
+ package_dir={'':'src'},
++ package_data={'wadllib': ['version.txt']},
+ include_package_data=True,
+ zip_safe=False,
+ maintainer='LAZR Developers',
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -1,3 +1,2 @@
+-recursive-include src *.json *.xml *.txt
+ include ez_setup.py
+ include COPYING.txt HACKING.txt
Deleted: packages/python-wadllib/trunk/debian/patches/no_package_data.patch
===================================================================
--- packages/python-wadllib/trunk/debian/patches/no_package_data.patch 2012-02-22 22:26:17 UTC (rev 20541)
+++ packages/python-wadllib/trunk/debian/patches/no_package_data.patch 2012-02-22 22:49:26 UTC (rev 20542)
@@ -1,17 +0,0 @@
-Description: Do not install documentation files in Python module directory
-Author: Luca Falavigna <dktrkranz at debian.org>
-Forwarded: not-needed
-
-Index: wadllib-1.1.4/setup.py
-===================================================================
---- wadllib-1.1.4.orig/setup.py 2010-06-20 04:18:06.846575781 +0200
-+++ wadllib-1.1.4/setup.py 2010-06-20 04:18:14.086567715 +0200
-@@ -43,7 +43,7 @@
- version=__version__,
- packages=find_packages('src'),
- package_dir={'':'src'},
-- include_package_data=True,
-+ include_package_data=False,
- zip_safe=False,
- maintainer='LAZR Developers',
- maintainer_email='lazr-developers at lists.launchpad.net',
Modified: packages/python-wadllib/trunk/debian/patches/series
===================================================================
--- packages/python-wadllib/trunk/debian/patches/series 2012-02-22 22:26:17 UTC (rev 20541)
+++ packages/python-wadllib/trunk/debian/patches/series 2012-02-22 22:49:26 UTC (rev 20542)
@@ -1 +1 @@
-no_package_data.patch
+install-data
Deleted: packages/python-wadllib/trunk/debian/pydist-overrides
===================================================================
--- packages/python-wadllib/trunk/debian/pydist-overrides 2012-02-22 22:26:17 UTC (rev 20541)
+++ packages/python-wadllib/trunk/debian/pydist-overrides 2012-02-22 22:49:26 UTC (rev 20542)
@@ -1 +0,0 @@
-elementtree
Copied: packages/python-wadllib/trunk/debian/python-wadllib.docs (from rev 16654, packages/python-wadllib/trunk/debian/docs)
===================================================================
--- packages/python-wadllib/trunk/debian/python-wadllib.docs (rev 0)
+++ packages/python-wadllib/trunk/debian/python-wadllib.docs 2012-02-22 22:49:26 UTC (rev 20542)
@@ -0,0 +1 @@
+src/wadllib/README.txt
Added: packages/python-wadllib/trunk/debian/python-wadllib.install
===================================================================
--- packages/python-wadllib/trunk/debian/python-wadllib.install (rev 0)
+++ packages/python-wadllib/trunk/debian/python-wadllib.install 2012-02-22 22:49:26 UTC (rev 20542)
@@ -0,0 +1 @@
+usr/lib/python2*
Copied: packages/python-wadllib/trunk/debian/python3-wadllib.docs (from rev 16654, packages/python-wadllib/trunk/debian/docs)
===================================================================
--- packages/python-wadllib/trunk/debian/python3-wadllib.docs (rev 0)
+++ packages/python-wadllib/trunk/debian/python3-wadllib.docs 2012-02-22 22:49:26 UTC (rev 20542)
@@ -0,0 +1 @@
+src/wadllib/README.txt
Added: packages/python-wadllib/trunk/debian/python3-wadllib.install
===================================================================
--- packages/python-wadllib/trunk/debian/python3-wadllib.install (rev 0)
+++ packages/python-wadllib/trunk/debian/python3-wadllib.install 2012-02-22 22:49:26 UTC (rev 20542)
@@ -0,0 +1 @@
+usr/lib/python3
Modified: packages/python-wadllib/trunk/debian/rules
===================================================================
--- packages/python-wadllib/trunk/debian/rules 2012-02-22 22:26:17 UTC (rev 20541)
+++ packages/python-wadllib/trunk/debian/rules 2012-02-22 22:49:26 UTC (rev 20542)
@@ -1,12 +1,34 @@
#!/usr/bin/make -f
+PYTHON2=$(shell pyversions -vr)
+PYTHON3=$(shell py3versions -vr)
+
%:
- dh $@ --with python2 --buildsystem=python_distutils
+ dh $@ --with python2,python3
-override_dh_auto_install:
+build-python%:
+ python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+ dh_auto_build
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+test-python%:
+ python$* setup.py test -vv
+
+override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+endif
+
+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" \
- -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 src/*.egg-info
Modified: packages/python-wadllib/trunk/debian/watch
===================================================================
--- packages/python-wadllib/trunk/debian/watch 2012-02-22 22:26:17 UTC (rev 20541)
+++ packages/python-wadllib/trunk/debian/watch 2012-02-22 22:49:26 UTC (rev 20542)
@@ -1,3 +1,2 @@
version=3
-opts=dversionmangle=s/\+ds// \
-https://launchpad.net/wadllib/+download http://launchpad.net/wadllib/.*/wadllib-(.+).tar.gz
+https://launchpad.net/wadllib/+download .*/wadllib-(.+).tar.gz
More information about the Python-modules-commits
mailing list