[Python-modules-commits] r26694 - in packages/pastedeploy/trunk/debian (5 files)

zigo at users.alioth.debian.org zigo at users.alioth.debian.org
Sat Dec 7 15:08:37 UTC 2013 

    Date: Saturday, December 7, 2013 @ 15:08:36
  Author: zigo
Revision: 26694

  * 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.
  * debian/copyright using parseable format 1.0.
  * Now using debhelper and compat 9.

Modified:
  packages/pastedeploy/trunk/debian/changelog
  packages/pastedeploy/trunk/debian/compat
  packages/pastedeploy/trunk/debian/control
  packages/pastedeploy/trunk/debian/copyright
  packages/pastedeploy/trunk/debian/rules

Modified: packages/pastedeploy/trunk/debian/changelog
===================================================================
--- packages/pastedeploy/trunk/debian/changelog	2013-12-07 01:21:35 UTC (rev 26693)
+++ packages/pastedeploy/trunk/debian/changelog	2013-12-07 15:08:36 UTC (rev 26694)
@@ -1,9 +1,18 @@
 pastedeploy (1.5.0-4) UNRELEASED; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:01:27 +0200
+  [ 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.
+  * 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
+
 pastedeploy (1.5.0-3) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/pastedeploy/trunk/debian/compat
===================================================================
--- packages/pastedeploy/trunk/debian/compat	2013-12-07 01:21:35 UTC (rev 26693)
+++ packages/pastedeploy/trunk/debian/compat	2013-12-07 15:08:36 UTC (rev 26694)
@@ -1 +1 @@
-5
+9

Modified: packages/pastedeploy/trunk/debian/control
===================================================================
--- packages/pastedeploy/trunk/debian/control	2013-12-07 01:21:35 UTC (rev 26693)
+++ packages/pastedeploy/trunk/debian/control	2013-12-07 15:08:36 UTC (rev 26694)
@@ -3,9 +3,13 @@
 Priority: optional
 Maintainer: Piotr Ożarowski <piotr at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: python-all (>= 2.6.6-3), python-setuptools (>= 0.6b3-1~), python-docutils
-Standards-Version: 3.9.3
+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
 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/
@@ -13,13 +17,50 @@
 
 Package: python-pastedeploy
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-pkg-resources, python-paste
+Depends: pastedeploy-paster-templates (= ${binary:Version}),
+         python-paste,
+         python-pkg-resources,
+         ${misc:Depends},
+         ${python:Depends}
 Recommends: python-pastescript (>= 1.7.3-6~)
 Enhances: python-paste
-Description: load, configure, and compose WSGI applications and servers
+Description: load, configure, and compose WSGI applications and servers - Python 2.x
  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
  Egg. For WSGI application providers it only asks for a single, simple entry
  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 Python 2.x module.
+
+Package: python3-pastedeploy
+Architecture: all
+Depends: pastedeploy-paster-templates (= ${binary:Version}),
+         python3-paste,
+         python3-pkg-resources,
+         ${misc:Depends},
+         ${python3:Depends}
+Enhances: python3-paste
+Description: load, configure, and compose WSGI applications and servers - Python 3.x
+ 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
+ Egg. For WSGI application providers it only asks for a single, simple entry
+ 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 Python 3.x module.
+
+Package: pastedeploy-paster-templates
+Architecture: all
+Depends: ${misc:Depends}
+Description: load, configure, and compose WSGI applications and servers - templates
+ 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
+ Egg. For WSGI application providers it only asks for a single, simple entry
+ 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.

Modified: packages/pastedeploy/trunk/debian/copyright
===================================================================
--- packages/pastedeploy/trunk/debian/copyright	2013-12-07 01:21:35 UTC (rev 26693)
+++ packages/pastedeploy/trunk/debian/copyright	2013-12-07 15:08:36 UTC (rev 26694)
@@ -1,22 +1,27 @@
-This package was debianized by Piotr Ożarowski <piotr at debian.org> on
-Thu,  4 May 2006 14:00:37 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: PasteDeploy
+Source: https://pypi.python.org/pypi/PasteDeploy
 
-It was downloaded from http://pypi.python.org/pypi/PasteDeploy
+Files: debian/*
+Copyright: (c) 2006-2012, Piotr Ożarowski <piotr at debian.org>
+           (c) 2013, Thomas Goirand <zigo at debian.org>
+License: Expat
 
-Copyright (c) 2005-2009 Ian Bicking <ianb at colorstudy.com> and Contributors
+Files: *
+Copyright: (c) 2005-2009 Ian Bicking <ianb at colorstudy.com> and Contributors
+License: Expat
 
-License: MIT License
-
- Permission is hereby granted, free of charge, to any person obtaining a copy of
- this software and associated documentation files (the "Software"), to deal in
- the Software without restriction, including without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
-
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
  The above copyright notice and this permission notice shall be included in all
  copies or substantial portions of the Software.
-
+ .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,6 +29,3 @@
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
-
-The Debian packaging is © 2006-2009, Piotr Ożarowski <piotr at debian.org> and
-is licensed under the MIT as well.

Modified: packages/pastedeploy/trunk/debian/rules
===================================================================
--- packages/pastedeploy/trunk/debian/rules	2013-12-07 01:21:35 UTC (rev 26693)
+++ packages/pastedeploy/trunk/debian/rules	2013-12-07 15:08:36 UTC (rev 26694)
@@ -1,61 +1,53 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
+PYTHONS:=$(shell pyversions -vr)
+PYTHON3S:=$(shell py3versions -vr)
 
 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
 
-clean:
-	dh_testdir
-	dh_testroot
+%:
+	dh $@ --buildsystem=python_distutils --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%)
 
-build: build-indep
-build-indep: build-docs
-build-arch:
-
-build-docs:
-	dh_installdirs
+override_dh_auto_install:
+	dh_installdirs -O--buildsystem=python_distutils
 	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"; \
 	done
-	touch $@
-
-install: build $(PYVERS:%=install-python%)
-install-python%:
-	python$* setup.py install --root $(PKGDIR) \
-		--single-version-externally-managed $(py_setup_install_args)
+	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
-	if [ -d $(PKGDIR)/usr/share/paster_templates ]; \
-		then rm -r $(PKGDIR)$(call py_libdir,$*)/paste/deploy/paster_templates;\
-	else \
-		mv $(PKGDIR)$(call py_libdir,$*)/paste/deploy/paster_templates \
-		   $(PKGDIR)/usr/share/;\
-	fi
+	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
 
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i docs/news.txt
-	dh_installdocs -i
-	dh_link usr/share/doc/python-pastedeploy/docs /usr/share/doc/python-paste/docs/deploy
-	dh_python2 -i
-	dh_compress -i -X.py
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i -- -Z bzip2
+	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
 
-binary-arch:
-
-binary: binary-indep binary-arch
-
-.PHONY: clean build build-arch build-indep binary binary-arch binary-indep install
+override_dh_link:
+	dh_link -O--buildsystem=python_distutils
+	dh_link usr/share/doc/python-pastedeploy/docs /usr/share/doc/python-paste/docs/deploy

More information about the Python-modules-commits mailing list