[Python-modules-commits] r4317 - in packages/pastescript/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Sunday, January 6, 2008 @ 20:38:21
  Author: piotr
Revision: 4317

* New upstream release
* 02_rename_templates_dir patch added, templates dir renamed to
  templates_dir in debian/rules (workaround for python-support's #459468)
  Closes: #459446

Added:
  packages/pastescript/trunk/debian/patches/02_rename_templates_dir.dpatch
Modified:
  packages/pastescript/trunk/debian/changelog
  packages/pastescript/trunk/debian/patches/00list
  packages/pastescript/trunk/debian/rules

Modified: packages/pastescript/trunk/debian/changelog
===================================================================
--- packages/pastescript/trunk/debian/changelog	2008-01-06 17:38:27 UTC (rev 4316)
+++ packages/pastescript/trunk/debian/changelog	2008-01-06 20:38:21 UTC (rev 4317)
@@ -1,3 +1,12 @@
+pastescript (1.6.1-1) unstable; urgency=low
+
+  * New upstream release
+  * 02_rename_templates_dir patch added, templates dir renamed to
+    templates_dir in debian/rules (workaround for python-support's #459468)
+    Closes: #459446
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 06 Jan 2008 20:02:19 +0100
+
 pastescript (1.6-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/pastescript/trunk/debian/patches/00list
===================================================================
--- packages/pastescript/trunk/debian/patches/00list	2008-01-06 17:38:27 UTC (rev 4316)
+++ packages/pastescript/trunk/debian/patches/00list	2008-01-06 20:38:21 UTC (rev 4317)
@@ -1 +1,2 @@
 01_disable_ez_setup
+02_rename_templates_dir

Added: packages/pastescript/trunk/debian/patches/02_rename_templates_dir.dpatch
===================================================================
--- packages/pastescript/trunk/debian/patches/02_rename_templates_dir.dpatch	                        (rev 0)
+++ packages/pastescript/trunk/debian/patches/02_rename_templates_dir.dpatch	2008-01-06 20:38:21 UTC (rev 4317)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_rename_templates_dir.dpatch by  <Piotr Ożarowski <piotr at debian.org>>
+##
+## DP: it's a workaround for http://bugs.debian.org/459468
+## DP: please note that paste/script/templates directory is renamed to templates_dir in debian/rules
+
+ at DPATCH@
+diff -urNad pastescript-1.6.1~/paste/script/templates.py pastescript-1.6.1/paste/script/templates.py
+--- pastescript-1.6.1~/paste/script/templates.py	2008-01-06 18:45:37.000000000 +0100
++++ pastescript-1.6.1/paste/script/templates.py	2008-01-06 20:07:37.000000000 +0100
+@@ -184,7 +184,7 @@
+ 
+ class BasicPackage(Template):
+ 
+-    _template_dir = 'templates/basic_package'
++    _template_dir = 'templates_dir/basic_package'
+     summary = "A basic setuptools-enabled package"
+     vars = [
+         var('version', 'Version (like 0.1)'),


Property changes on: packages/pastescript/trunk/debian/patches/02_rename_templates_dir.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/pastescript/trunk/debian/rules
===================================================================
--- packages/pastescript/trunk/debian/rules	2008-01-06 17:38:27 UTC (rev 4316)
+++ packages/pastescript/trunk/debian/rules	2008-01-06 20:38:21 UTC (rev 4317)
@@ -34,9 +34,12 @@
 	# pth file is not needed since all paste* packages are installed in the same directory
 	rm -f debian/python-pastescript/usr/lib/python$*/site-packages/PasteScript-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
 	# provided by paste-common package:
-	rm -f debian/python-pastescript/usr/lib/python$*/site-packages/pastescript/paste/__init__.py
+	rm -f debian/python-pastescript/usr/lib/python$*/site-packages/paste/__init__.py
 	# default Python version in hashbang
 	sed -i -e '1s/python.*/python/' debian/python-pastescript/usr/bin/paster
+	# temporary workaround for bug #459446 (see also patch 02_rename_templates_dir.dpatch)
+	mv debian/python-pastescript/usr/lib/python$*/site-packages/paste/script/templates \
+	   debian/python-pastescript/usr/lib/python$*/site-packages/paste/script/templates_dir \
 
 binary-indep: build install
 	dh_testdir -i