[Python-modules-commits] r5470 - in packages/pastedeploy/trunk/debian (7 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sat May 24 19:58:00 UTC 2008 

    Date: Saturday, May 24, 2008 @ 19:57:57
  Author: piotr
Revision: 5470

* Move paster_templates to /usr/share/
  + 01_change_templates_path patch added, dpatch added to build depends
  + recommend python-pastescript (>= 1.6.2-3)
* Add "~" to python-setuptools minimum required build dependency to ease
  backporting

Added:
  packages/pastedeploy/trunk/debian/patches/
  packages/pastedeploy/trunk/debian/patches/00list
  packages/pastedeploy/trunk/debian/patches/01_change_templates_path.dpatch
Modified:
  packages/pastedeploy/trunk/debian/changelog
  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	2008-05-24 19:54:59 UTC (rev 5469)
+++ packages/pastedeploy/trunk/debian/changelog	2008-05-24 19:57:57 UTC (rev 5470)
@@ -1,11 +1,16 @@
-pastedeploy (1.3.1-3) UNRELEASED; urgency=low
+pastedeploy (1.3.1-3) unstable; urgency=low
 
   * Replace python-setuptools with python-pkg-resources in Depends
     (closes: #468715)
   * Remove paste-common dependency, python-support will provide all needed
     namespace
+  * Move paster_templates to /usr/share/
+    + 01_change_templates_path patch added, dpatch added to build depends
+    + recommend python-pastescript (>= 1.6.2-3)
+  * Add "~" to python-setuptools minimum required build dependency to ease
+    backporting
 
- -- Piotr Ożarowski <piotr at debian.org>  Sat, 26 Apr 2008 18:21:58 +0200
+ -- Piotr Ożarowski <piotr at debian.org>  Sat, 24 May 2008 18:56:13 +0200
 
 pastedeploy (1.3.1-2) unstable; urgency=low
 

Modified: packages/pastedeploy/trunk/debian/control
===================================================================
--- packages/pastedeploy/trunk/debian/control	2008-05-24 19:54:59 UTC (rev 5469)
+++ packages/pastedeploy/trunk/debian/control	2008-05-24 19:57:57 UTC (rev 5470)
@@ -3,8 +3,8 @@
 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 (>= 2.3.5-11), python-all-dev, python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1), python-docutils
+Build-Depends: debhelper (>= 5), dpatch
+Build-Depends-Indep: python (>= 2.3.5-11), python-all-dev, python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1~), python-docutils
 Standards-Version: 3.7.3
 Homepage: http://pythonpaste.org/deploy/
 XS-Python-Version: all
@@ -14,6 +14,7 @@
 Package: python-pastedeploy
 Architecture: all
 Depends: ${python:Depends}, python-pkg-resources
+Recommends: python-pastescript (>= 1.6.2-3)
 XB-Python-Version: ${python:Versions}
 Enhances: python-paste
 Description: Load, configure, and compose WSGI applications and servers

Modified: packages/pastedeploy/trunk/debian/copyright
===================================================================
--- packages/pastedeploy/trunk/debian/copyright	2008-05-24 19:54:59 UTC (rev 5469)
+++ packages/pastedeploy/trunk/debian/copyright	2008-05-24 19:57:57 UTC (rev 5470)
@@ -3,7 +3,7 @@
 
 It was downloaded from http://pypi.python.org/pypi/PasteDeploy
 
-Copyright Holder: Ian Bicking <ianb at colorstudy.com>
+Copyright (c) 2005-2007 Ian Bicking <ianb at colorstudy.com> and Contributors
 
 License: MIT License
 

Added: packages/pastedeploy/trunk/debian/patches/00list
===================================================================
--- packages/pastedeploy/trunk/debian/patches/00list	                        (rev 0)
+++ packages/pastedeploy/trunk/debian/patches/00list	2008-05-24 19:57:57 UTC (rev 5470)
@@ -0,0 +1 @@
+01_change_templates_path

Added: packages/pastedeploy/trunk/debian/patches/01_change_templates_path.dpatch
===================================================================
--- packages/pastedeploy/trunk/debian/patches/01_change_templates_path.dpatch	                        (rev 0)
+++ packages/pastedeploy/trunk/debian/patches/01_change_templates_path.dpatch	2008-05-24 19:57:57 UTC (rev 5470)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_change_templates_path.dpatch by Piotr Ożarowski <piotr at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: paster's templates are outside site-packages in Debian
+
+ at DPATCH@
+diff -urNad pastedeploy-1.3.1~/paste/deploy/paster_templates.py pastedeploy-1.3.1/paste/deploy/paster_templates.py
+--- pastedeploy-1.3.1~/paste/deploy/paster_templates.py	2007-06-26 19:16:23.000000000 +0200
++++ pastedeploy-1.3.1/paste/deploy/paster_templates.py	2008-05-24 18:54:27.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ class PasteDeploy(Template):
+ 
+-    _template_dir = 'paster_templates/paste_deploy'
++    _template_dir = '/usr/share/paster_templates/paste_deploy'
+     summary = "A web application deployed through paste.deploy"
+     
+     egg_plugins = ['PasteDeploy']


Property changes on: packages/pastedeploy/trunk/debian/patches/01_change_templates_path.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/pastedeploy/trunk/debian/rules
===================================================================
--- packages/pastedeploy/trunk/debian/rules	2008-05-24 19:54:59 UTC (rev 5469)
+++ packages/pastedeploy/trunk/debian/rules	2008-05-24 19:57:57 UTC (rev 5470)
@@ -5,33 +5,43 @@
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 PYVERS=$(shell pyversions -vr)
 DOCS=$(shell cd docs && find ./ -name "*.txt" -not -name "license.txt" -printf "%p " | sed "s/.txt//g")
+PKGDIR=$(CURDIR)/debian/python-pastedeploy
 
-clean:
+include /usr/share/dpatch/dpatch.make
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf dist build
 	find . -name '*\.py[co]' -delete
 	dh_clean build-docs $(PYVERS:%=install-python%)
 
-build: build-docs
+build: patch build-docs
 
 build-docs:
 	dh_installdirs
 	for NAME in $(DOCS); do \
 	    rst2html --cloak-email-addresses --no-toc-backlinks "docs/$$NAME.txt" \
-	      > "debian/python-pastedeploy/usr/share/doc/python-pastedeploy/docs/$$NAME.html"; \
+	      > "$(PKGDIR)/usr/share/doc/python-pastedeploy/docs/$$NAME.html"; \
 	done
 	touch $@
 
 install: build $(PYVERS:%=install-python%)
-install-python%:
+install-python%: patch
 	python$* setup.py install \
 		--single-version-externally-managed \
-		--root $(CURDIR)/debian/python-pastedeploy
+		--root $(PKGDIR)
 	# pth file is not needed
-	rm -f debian/python-pastedeploy/usr/lib/python$*/site-packages/PasteDeploy-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
-	# provided by paste-common package:
-	rm -f debian/python-pastedeploy/usr/lib/python$*/site-packages/pastedeploy/paste/__init__.py
+	rm -f $(PKGDIR)/usr/lib/python$*/site-packages/PasteDeploy-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
+	# python-support's namespace feature will handle this
+	rm -f $(PKGDIR)/usr/lib/python$*/site-packages/paste/__init__.py
+	# move templates outside site-packages
+	if [ -d $(PKGDIR)/usr/share/paster_templates ]; \
+		then rm -rf $(PKGDIR)/usr/lib/python$*/site-packages/paste/deploy/paster_templates; \
+	else \
+		mv $(PKGDIR)/usr/lib/python$*/site-packages/paste/deploy/paster_templates \
+		   $(PKGDIR)/usr/share/;\
+	fi
 
 binary-indep: build install
 	dh_testdir -i

More information about the Python-modules-commits mailing list