[Python-modules-commits] r26711 - in packages/pastedeploy/trunk/debian (7 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Mon Dec 9 22:18:10 UTC 2013
Date: Monday, December 9, 2013 @ 22:18:09
Author: piotr
Revision: 26711
* switch to dh --buildsystem=pybuild
* rename pastedeploy-paster-templates to python-pastedeploy-tpl
Added:
packages/pastedeploy/trunk/debian/python-pastedeploy-tpl.install
packages/pastedeploy/trunk/debian/python-pastedeploy.dirs
(from rev 26698, packages/pastedeploy/trunk/debian/dirs)
packages/pastedeploy/trunk/debian/python-pastedeploy.links
Modified:
packages/pastedeploy/trunk/debian/changelog
packages/pastedeploy/trunk/debian/control
packages/pastedeploy/trunk/debian/rules
Deleted:
packages/pastedeploy/trunk/debian/dirs
Modified: packages/pastedeploy/trunk/debian/changelog
===================================================================
--- packages/pastedeploy/trunk/debian/changelog 2013-12-09 19:27:46 UTC (rev 26710)
+++ packages/pastedeploy/trunk/debian/changelog 2013-12-09 22:18:09 UTC (rev 26711)
@@ -1,18 +1,19 @@
-pastedeploy (1.5.0-4) UNRELEASED; urgency=low
+pastedeploy (1.5.0-4) unstable; urgency=low
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
[ Thomas Goirand ]
- * Added python3 support, and adds a new python-pastedeploy-templates that
- contains the paster_template folder for both python 2 and 3 modules.
- * Switched to dh short style.
- * Ran wrap-and-sort.
+ * Added python3 support, and add a new python-pastedeploy-tpl that
+ contains the paster_template folder for both Python 2 and 3 modules.
* debian/copyright using parseable format 1.0.
* Now using debhelper and compat 9.
- -- Thomas Goirand <zigo at debian.org> Sat, 07 Dec 2013 09:50:22 +0000
+ [ Piotr Ożarowski ]
+ * Switched to dh sequencer and pybuild buildsystem
+ -- Piotr Ożarowski <piotr at debian.org> Mon, 09 Dec 2013 22:47:39 +0100
+
pastedeploy (1.5.0-3) unstable; urgency=low
[ Jakub Wilk ]
Modified: packages/pastedeploy/trunk/debian/control
===================================================================
--- packages/pastedeploy/trunk/debian/control 2013-12-09 19:27:46 UTC (rev 26710)
+++ packages/pastedeploy/trunk/debian/control 2013-12-09 22:18:09 UTC (rev 26711)
@@ -4,12 +4,14 @@
Maintainer: Piotr Ożarowski <piotr at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends: debhelper (>= 9),
- python-all (>= 2.6.6-3),
- python-setuptools (>= 0.6b3-1~),
- python3-all (>= 3.2),
- python3-setuptools
-Build-Depends-Indep: python-docutils
-Standards-Version: 3.9.4
+ python-all (>= 2.6.6-3),
+ python-setuptools (>= 0.6b3-1~),
+ python-nose,
+ python3-all (>= 3.2),
+ python3-setuptools,
+ python3-nose,
+ python-docutils
+Standards-Version: 3.9.5
Homepage: http://pythonpaste.org/deploy/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pastedeploy/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pastedeploy/trunk/
@@ -17,14 +19,13 @@
Package: python-pastedeploy
Architecture: all
-Depends: pastedeploy-paster-templates (= ${binary:Version}),
- python-paste,
- python-pkg-resources,
- ${misc:Depends},
- ${python:Depends}
+Depends: ${python:Depends}, ${misc:Depends},
+ python-pastedeploy-tpl (= ${binary:Version}),
+ python-paste,
+ python-pkg-resources
Recommends: python-pastescript (>= 1.7.3-6~)
Enhances: python-paste
-Description: load, configure, and compose WSGI applications and servers - Python 2.x
+Description: load, configure, and compose WSGI applications and servers
Paste Deployment is a system for finding and configuring WSGI applications and
servers. For WSGI application consumers it provides a single, simple function
(loadapp) for loading a WSGI application from a configuration file or a Python
@@ -36,13 +37,12 @@
Package: python3-pastedeploy
Architecture: all
-Depends: pastedeploy-paster-templates (= ${binary:Version}),
- python3-paste,
- python3-pkg-resources,
- ${misc:Depends},
- ${python3:Depends}
+Depends: ${python3:Depends}, ${misc:Depends},
+ python-pastedeploy-tpl (= ${binary:Version}),
+ python3-paste,
+ python3-pkg-resources
Enhances: python3-paste
-Description: load, configure, and compose WSGI applications and servers - Python 3.x
+Description: load, configure, and compose WSGI applications and servers
Paste Deployment is a system for finding and configuring WSGI applications and
servers. For WSGI application consumers it provides a single, simple function
(loadapp) for loading a WSGI application from a configuration file or a Python
@@ -52,7 +52,7 @@
.
This package contains the Python 3.x module.
-Package: pastedeploy-paster-templates
+Package: python-pastedeploy-tpl
Architecture: all
Depends: ${misc:Depends}
Description: load, configure, and compose WSGI applications and servers - templates
@@ -63,4 +63,4 @@
point to your application, so that application users don't need to be exposed
to the implementation details of your application.
.
- This package contains the paster_template.
+ This package contains the Paste Deploy's paster template.
Deleted: packages/pastedeploy/trunk/debian/dirs
===================================================================
--- packages/pastedeploy/trunk/debian/dirs 2013-12-09 19:27:46 UTC (rev 26710)
+++ packages/pastedeploy/trunk/debian/dirs 2013-12-09 22:18:09 UTC (rev 26711)
@@ -1 +0,0 @@
-/usr/share/doc/python-pastedeploy/docs
Added: packages/pastedeploy/trunk/debian/python-pastedeploy-tpl.install
===================================================================
--- packages/pastedeploy/trunk/debian/python-pastedeploy-tpl.install (rev 0)
+++ packages/pastedeploy/trunk/debian/python-pastedeploy-tpl.install 2013-12-09 22:18:09 UTC (rev 26711)
@@ -0,0 +1 @@
+paste/deploy/paster_templates/ /usr/share/
Copied: packages/pastedeploy/trunk/debian/python-pastedeploy.dirs (from rev 26698, packages/pastedeploy/trunk/debian/dirs)
===================================================================
--- packages/pastedeploy/trunk/debian/python-pastedeploy.dirs (rev 0)
+++ packages/pastedeploy/trunk/debian/python-pastedeploy.dirs 2013-12-09 22:18:09 UTC (rev 26711)
@@ -0,0 +1 @@
+/usr/share/doc/python-pastedeploy/docs
Added: packages/pastedeploy/trunk/debian/python-pastedeploy.links
===================================================================
--- packages/pastedeploy/trunk/debian/python-pastedeploy.links (rev 0)
+++ packages/pastedeploy/trunk/debian/python-pastedeploy.links 2013-12-09 22:18:09 UTC (rev 26711)
@@ -0,0 +1 @@
+/usr/share/doc/python-pastedeploy/docs /usr/share/doc/python-paste/docs/deploy
Modified: packages/pastedeploy/trunk/debian/rules
===================================================================
--- packages/pastedeploy/trunk/debian/rules 2013-12-09 19:27:46 UTC (rev 26710)
+++ packages/pastedeploy/trunk/debian/rules 2013-12-09 22:18:09 UTC (rev 26711)
@@ -1,53 +1,20 @@
#!/usr/bin/make -f
+export PYBUILD_NAME=pastedeploy
+#export PYBUILD_TEST_NOSE=1
+export PYBUILD_AFTER_INSTALL=rm -rf {destdir}{install_dir}/paste/deploy/paster_templates;\
+ rm {destdir}{install_dir}/*.pth;\
+ rm {destdir}{install_dir}/*/namespace_packages.txt
-PYTHONS:=$(shell pyversions -vr)
-PYTHON3S:=$(shell py3versions -vr)
+DOCS=$(shell cd docs &&\
+ find ./ -maxdepth 1 -name "*.txt" -not -name "license.txt" -printf "%p " |\
+ sed "s/.txt//g")
-PYVERS=$(shell pyversions -vr)
-DOCS=$(shell cd docs && find ./ -maxdepth 1 -name "*.txt" -not -name "license.txt" -printf "%p " | sed "s/.txt//g")
-PKGDIR=$(CURDIR)/debian/python-pastedeploy
-PKG3DIR=$(CURDIR)/debian/python3-pastedeploy
-include /usr/share/python/python.mk
-
%:
- dh $@ --buildsystem=python_distutils --with=python2,python3
+ dh $@ --buildsystem=pybuild --with=python2,python3
-override_dh_auto_clean:
- dh_auto_clean -O--buildsystem=python_distutils
- rm -rf dist build
- find . -name '*\.py[co]' -delete
- dh_clean build-docs $(PYVERS:%=install-python%)
-
-override_dh_auto_install:
- dh_installdirs -O--buildsystem=python_distutils
+override_dh_installdocs:
set -e; for NAME in $(DOCS); do \
rst2html --cloak-email-addresses --no-toc-backlinks "docs/$$NAME.txt" \
- > "$(PKGDIR)/usr/share/doc/python-pastedeploy/docs/$$NAME.html"; \
+ > "$(CURDIR)/debian/python-pastedeploy/usr/share/doc/python-pastedeploy/docs/$$NAME.html"; \
done
- set -e && for pyvers in $(PYTHONS); do \
- python$$pyvers setup.py install --install-layout=deb --root $(PKGDIR); \
- done
- set -e && for pyvers in $(PYTHON3S); do \
- python$$pyvers setup.py install --install-layout=deb --root $(PKG3DIR); \
- done
- # pth file is not needed
- find $(PKGDIR) \( -name '*.pth' -or -name 'namespace_packages.txt' \) -delete
- find $(PKG3DIR) \( -name '*.pth' -or -name 'namespace_packages.txt' \) -delete
-
- # move templates outside site-packages
- mkdir -p $(CURDIR)/debian/pastedeploy-paster-templates/usr/share/pastedeploy-paster-templates
- mv $(PKGDIR)/usr/lib/python2.7/dist-packages/paste/deploy/paster_templates \
- $(CURDIR)/debian/pastedeploy-paster-templates/usr/share/pastedeploy-paster-templates
-
- set -e && for pyvers in $(PYTHONS); do \
- rm -rf $(PKGDIR)/usr/lib/python$$pyvers/dist-packages/paste/deploy/paster_templates ; \
- ln -s ../../../../../share/pastedeploy-paster-templates/paster_templates \
- $(PKGDIR)/usr/lib/python$$pyvers/dist-packages/paste/deploy/paster_templates ; \
- done
- rm -rf $(PKG3DIR)/usr/lib/python3/dist-packages/paste/deploy/paster_templates
- ln -s ../../../../../share/pastedeploy-paster-templates/paster_templates \
- $(PKG3DIR)/usr/lib/python3/dist-packages/paste/deploy/paster_templates
-
-override_dh_link:
- dh_link -O--buildsystem=python_distutils
- dh_link usr/share/doc/python-pastedeploy/docs /usr/share/doc/python-paste/docs/deploy
+ dh_installdocs
More information about the Python-modules-commits
mailing list