[Python-modules-commits] r25443 - in packages/python-werkzeug/trunk/debian (10 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Thu Aug 8 20:09:35 UTC 2013


    Date: Thursday, August 8, 2013 @ 20:09:32
  Author: piotr
Revision: 25443

* Add python3-werkzeug binary package
* Move docs and examples to new python-werkzeug-doc binary package
* Switch to pybuild buildsystem
* Add redis and memcached related packages to Build-Depends (used in tests)
* Set debhelper compatibility level to 9

Added:
  packages/python-werkzeug/trunk/debian/python-werkzeug-doc.doc-base
  packages/python-werkzeug/trunk/debian/python-werkzeug-doc.docs
    (from rev 25413, packages/python-werkzeug/trunk/debian/docs)
  packages/python-werkzeug/trunk/debian/python-werkzeug-doc.examples
    (from rev 25413, packages/python-werkzeug/trunk/debian/examples)
  packages/python-werkzeug/trunk/debian/python-werkzeug-doc.links
Modified:
  packages/python-werkzeug/trunk/debian/changelog
  packages/python-werkzeug/trunk/debian/compat
  packages/python-werkzeug/trunk/debian/control
  packages/python-werkzeug/trunk/debian/rules
Deleted:
  packages/python-werkzeug/trunk/debian/docs
  packages/python-werkzeug/trunk/debian/examples

Modified: packages/python-werkzeug/trunk/debian/changelog
===================================================================
--- packages/python-werkzeug/trunk/debian/changelog	2013-08-08 18:43:15 UTC (rev 25442)
+++ packages/python-werkzeug/trunk/debian/changelog	2013-08-08 20:09:32 UTC (rev 25443)
@@ -1,3 +1,13 @@
+python-werkzeug (0.9.3+dfsg-2) unstable; urgency=low
+
+  * Add python3-werkzeug binary package
+  * Move docs and examples to new python-werkzeug-doc binary package
+  * Switch to pybuild buildsystem
+  * Add redis and memcached related packages to Build-Depends (used in tests)
+  * Set debhelper compatibility level to 9
+
+ -- Piotr Ożarowski <piotr at debian.org>  Thu, 08 Aug 2013 17:13:05 +0200
+
 python-werkzeug (0.9.3+dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-werkzeug/trunk/debian/compat
===================================================================
--- packages/python-werkzeug/trunk/debian/compat	2013-08-08 18:43:15 UTC (rev 25442)
+++ packages/python-werkzeug/trunk/debian/compat	2013-08-08 20:09:32 UTC (rev 25443)
@@ -1 +1 @@
-7
+9

Modified: packages/python-werkzeug/trunk/debian/control
===================================================================
--- packages/python-werkzeug/trunk/debian/control	2013-08-08 18:43:15 UTC (rev 25442)
+++ packages/python-werkzeug/trunk/debian/control	2013-08-08 20:09:32 UTC (rev 25443)
@@ -5,10 +5,15 @@
 Uploaders: Piotr Ożarowski <piotr at debian.org>,
  Python Modules Packaging Team <python-modules-team at lists.alioth.debian.org>
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 8.1.0), python (>= 2.6.6-3), python-sphinx (>= 1.0.7+dfsg-1~)
-# , python3-all
-Build-Depends-Indep: python-setuptools (>= 0.6b3),
- python-simplejson, python-nose, python-lxml
+Build-Depends: debhelper (>= 9), dh-python, python-sphinx (>= 1.0.7+dfsg-1~),
+ python-all, python3-all,
+ python-setuptools (>= 0.6b3), python3-setuptools (>= 0.6b3),
+# for tests:
+ python-simplejson, python3-simplejson,
+ python-nose, python3-nose,
+ python-lxml, python3-lxml,
+ redis-server, python-redis,
+ memcached, python-pylibmc
 Homepage: http://werkzeug.pocoo.org/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-werkzeug/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-werkzeug/trunk/
@@ -21,7 +26,7 @@
 Recommends: python-simplejson | python (>= 2.6), python-openssl, python-pyinotify
 Suggests: ipython, python-genshi, python-pkg-resources, python-lxml,
  python-greenlet, python-redis, python-pylibmc | python-memcache,
- ${sphinxdoc:Depends}
+ python-werkzeug-doc
 Description: collection of utilities for WSGI applications
  The Web Server Gateway Interface (WSGI) is a standard interface between web
  server software and web applications written in Python.
@@ -31,16 +36,30 @@
  URI dispatcher. Combine with your choice of third party libraries and
  middleware to easily create a custom application framework.
 
-#Package: python3-werkzeug
-#Architecture: all
-#Depends: ${python3:Depends}, ${misc:Depends}
-#Recommends: python3-simplejson | python3, python3-openssl, python3-pyinotify
-#Suggests: ipython3, python3-pkg-resources, python3-lxml,
-#Description: collection of utilities for WSGI applications
-# The Web Server Gateway Interface (WSGI) is a standard interface between web
-# server software and web applications written in Python.
-# .
-# Werkzeug is a lightweight library for interfacing with WSGI. It features
-# request and response objects, an interactive debugging system and a powerful
-# URI dispatcher. Combine with your choice of third party libraries and
-# middleware to easily create a custom application framework.
+Package: python3-werkzeug
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Recommends: python3-simplejson | python3, python3-openssl, python3-pyinotify
+Suggests: ipython3, python3-pkg-resources, python3-lxml,
+ python-werkzeug-doc
+Description: collection of utilities for WSGI applications
+ The Web Server Gateway Interface (WSGI) is a standard interface between web
+ server software and web applications written in Python.
+ .
+ Werkzeug is a lightweight library for interfacing with WSGI. It features
+ request and response objects, an interactive debugging system and a powerful
+ URI dispatcher. Combine with your choice of third party libraries and
+ middleware to easily create a custom application framework.
+
+Package: python-werkzeug-doc
+Section: doc
+Architecture: all
+Priority: extra
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Conflicts: python-werkzeug (<< 0.9.3+dfsg-2)
+Replaces: python-werkzeug (<< 0.9.3+dfsg-2)
+Description: documentation for the werkzeug Python library
+ Werkzeug is a lightweight library for interfacing with WSGI. It features
+ request and response objects, an interactive debugging system and a powerful
+ URI dispatcher. Combine with your choice of third party libraries and
+ middleware to easily create a custom application framework.

Deleted: packages/python-werkzeug/trunk/debian/docs
===================================================================
--- packages/python-werkzeug/trunk/debian/docs	2013-08-08 18:43:15 UTC (rev 25442)
+++ packages/python-werkzeug/trunk/debian/docs	2013-08-08 20:09:32 UTC (rev 25443)
@@ -1 +0,0 @@
-docs/_build/html

Deleted: packages/python-werkzeug/trunk/debian/examples
===================================================================
--- packages/python-werkzeug/trunk/debian/examples	2013-08-08 18:43:15 UTC (rev 25442)
+++ packages/python-werkzeug/trunk/debian/examples	2013-08-08 20:09:32 UTC (rev 25443)
@@ -1 +0,0 @@
-examples/*

Added: packages/python-werkzeug/trunk/debian/python-werkzeug-doc.doc-base
===================================================================
--- packages/python-werkzeug/trunk/debian/python-werkzeug-doc.doc-base	                        (rev 0)
+++ packages/python-werkzeug/trunk/debian/python-werkzeug-doc.doc-base	2013-08-08 20:09:32 UTC (rev 25443)
@@ -0,0 +1,10 @@
+Document: werkzeug
+Title: Werkzeug Documentation
+Author: Armin Ronacher
+Abstract: This document describes Werkzeug - collection of utilities for WSGI
+ applications written in Python.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-werkzeug-doc/html/index.html
+Files: /usr/share/doc/python-werkzeug-doc/html/*.html

Copied: packages/python-werkzeug/trunk/debian/python-werkzeug-doc.docs (from rev 25413, packages/python-werkzeug/trunk/debian/docs)
===================================================================
--- packages/python-werkzeug/trunk/debian/python-werkzeug-doc.docs	                        (rev 0)
+++ packages/python-werkzeug/trunk/debian/python-werkzeug-doc.docs	2013-08-08 20:09:32 UTC (rev 25443)
@@ -0,0 +1 @@
+docs/_build/html

Copied: packages/python-werkzeug/trunk/debian/python-werkzeug-doc.examples (from rev 25413, packages/python-werkzeug/trunk/debian/examples)
===================================================================
--- packages/python-werkzeug/trunk/debian/python-werkzeug-doc.examples	                        (rev 0)
+++ packages/python-werkzeug/trunk/debian/python-werkzeug-doc.examples	2013-08-08 20:09:32 UTC (rev 25443)
@@ -0,0 +1 @@
+examples/*

Added: packages/python-werkzeug/trunk/debian/python-werkzeug-doc.links
===================================================================
--- packages/python-werkzeug/trunk/debian/python-werkzeug-doc.links	                        (rev 0)
+++ packages/python-werkzeug/trunk/debian/python-werkzeug-doc.links	2013-08-08 20:09:32 UTC (rev 25443)
@@ -0,0 +1,6 @@
+/usr/share/doc/python-werkzeug-doc/html /usr/share/doc/python-werkzeug/html
+/usr/share/doc/python-werkzeug-doc/html/_sources /usr/share/doc/python-werkzeug/rst
+/usr/share/doc/python-werkzeug-doc/examples /usr/share/doc/python-werkzeug/examples
+/usr/share/doc/python-werkzeug-doc/html /usr/share/doc/python3-werkzeug/html
+/usr/share/doc/python-werkzeug-doc/html/_sources /usr/share/doc/python3-werkzeug/rst
+/usr/share/doc/python-werkzeug-doc/examples /usr/share/doc/python3-werkzeug/examples

Modified: packages/python-werkzeug/trunk/debian/rules
===================================================================
--- packages/python-werkzeug/trunk/debian/rules	2013-08-08 18:43:15 UTC (rev 25442)
+++ packages/python-werkzeug/trunk/debian/rules	2013-08-08 20:09:32 UTC (rev 25443)
@@ -6,42 +6,39 @@
 # permitted in any medium without royalty provided the copyright notice and this
 # notice are preserved.
 
-export PYTHONPATH=$(abspath $(CURDIR))
-PKGDIR=$(CURDIR)/debian/python-werkzeug/
+export PYBUILD_DESTDIR_python2=debian/python-werkzeug/
+export PYBUILD_DESTDIR_python3=debian/python3-werkzeug/
 
-include /usr/share/python/python.mk
-
 %:
-	dh $@ --with python2,sphinxdoc
+	dh $@ --with python2,python3,sphinxdoc --buildsystem pybuild
 
+override_dh_auto_clean:
+	make -C docs clean
+	rm -rf build Werkzeug.egg-info/
+	#find $(CURDIR) \( -name '\._*' -o -name '\.DS_Store' \) -delete
+	dh_auto_clean
+
+override_dh_auto_test:
+	http_proxy='' dh_auto_test
+
 override_dh_auto_install:
-	python setup.py install \
-		--single-version-externally-managed \
-		--install-layout=deb \
-		--root $(PKGDIR)
-	dh_link usr/share/javascript/jquery/jquery.js \
-	  $(call py_libdir,$(shell pyversions -vd))/werkzeug/debug/shared/jquery.js
-	dh_link /usr/share/doc/python-werkzeug/html/_sources \
-		/usr/share/doc/python-werkzeug/rst
+	dh_auto_install
+	make documentation
 
+override_dh_python2:
+	dh_python2
+	dh_link -p python-werkzeug /usr/share/javascript/jquery/jquery.js \
+	  /usr/share/pyshared/werkzeug/debug/shared/jquery.js
+
+override_dh_python3:
+	dh_python3
+	dh_link -p python3-werkzeug /usr/share/javascript/jquery/jquery.js \
+	  /usr/lib/python3/dist-packages/werkzeug/debug/shared/jquery.js
+
 override_dh_fixperms:
-	find $(PKGDIR) -name '*\.png' -exec chmod -x '{}' \;
+	find debian/ -name '*\.png' -exec chmod -x '{}' \;
 	dh_fixperms
 
-override_dh_auto_test:
-	# run-tests.py is not included in the tarball
-	# TODO: run tests for all supported Python versions
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	LC_ALL=C.UTF-8 python -c 'from werkzeug.testsuite import main; main()'
-endif
-
-clean:
-	rm -rf build Werkzeug.egg-info/
-	dh_clean
-	make -C docs clean
-	find $(CURDIR) -name '*\.py[co]' -delete
-	find $(CURDIR) \( -name '\._*' -o -name '\.DS_Store' \) -delete
-
 get-orig-source:
 	trap 'rm -rf $(CURDIR)/.werkzeug-tarball' EXIT;\
 	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-+]+).*,\1,p') &&\




More information about the Python-modules-commits mailing list