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

[piotr at users.alioth.debian.org]

    Date: Monday, February 4, 2008 @ 19:33:56
  Author: piotr
Revision: 4462

* Add 03_skip_empty_templates patch (fixes TurboGears' quickstart)
* Add versioned dependency on python-paste and python-pastedeploy (paste-common is not enough, closes: 463958)

Added:
  packages/pastescript/trunk/debian/patches/03_skip_empty_templates.dpatch
Modified:
  packages/pastescript/trunk/debian/changelog
  packages/pastescript/trunk/debian/control
  packages/pastescript/trunk/debian/patches/00list

Modified: packages/pastescript/trunk/debian/changelog
===================================================================
--- packages/pastescript/trunk/debian/changelog	2008-02-04 17:13:53 UTC (rev 4461)
+++ packages/pastescript/trunk/debian/changelog	2008-02-04 19:33:56 UTC (rev 4462)
@@ -1,8 +1,11 @@
-pastescript (1.6.1.1-1) UNRELEASED; urgency=low
+pastescript (1.6.1.1-1) unstable; urgency=low
 
-  * New upstream release (Windows releted changes only, not uploading for now)
+  * New upstream release
+  * Add 03_skip_empty_templates patch (fixes TurboGears' quickstart)
+  * Add versioned dependency on python-paste and python-pastedeploy
+    (paste-common is not enough, closes: 463958)
 
- -- Piotr Ożarowski <piotr at debian.org>  Sat, 12 Jan 2008 17:54:59 +0100
+ -- Piotr Ożarowski <piotr at debian.org>  Mon, 04 Feb 2008 20:21:37 +0100
 
 pastescript (1.6.1-1) unstable; urgency=low
 

Modified: packages/pastescript/trunk/debian/control
===================================================================
--- packages/pastescript/trunk/debian/control	2008-02-04 17:13:53 UTC (rev 4461)
+++ packages/pastescript/trunk/debian/control	2008-02-04 19:33:56 UTC (rev 4462)
@@ -14,8 +14,8 @@
 
 Package: python-pastescript
 Architecture: all
-Depends: ${python:Depends}, paste-common (>= 1.6-1), python-paste, python-pastedeploy,
- python-setuptools (>= 0.6b3-1)
+Depends: ${python:Depends}, paste-common (>= 1.6-1), python-paste (>= 1.6-1),
+ python-pastedeploy (>= 1.3.1-2), python-setuptools (>= 0.6b3-1)
 Recommends: python-flup (>= 0.5-1), python-cheetah (>= 1.0-1.1)
 Suggests: python-cherrypy3 | python-cherrypy
 Description: serving web applications, creating file layouts for python packages

Modified: packages/pastescript/trunk/debian/patches/00list
===================================================================
--- packages/pastescript/trunk/debian/patches/00list	2008-02-04 17:13:53 UTC (rev 4461)
+++ packages/pastescript/trunk/debian/patches/00list	2008-02-04 19:33:56 UTC (rev 4462)
@@ -1,2 +1,3 @@
 01_disable_ez_setup
 02_rename_templates_dir
+03_skip_empty_templates

Added: packages/pastescript/trunk/debian/patches/03_skip_empty_templates.dpatch
===================================================================
--- packages/pastescript/trunk/debian/patches/03_skip_empty_templates.dpatch	                        (rev 0)
+++ packages/pastescript/trunk/debian/patches/03_skip_empty_templates.dpatch	2008-02-04 19:33:56 UTC (rev 4462)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_skip_empty_templates.dpatch by  <Piotr Ożarowski <piotr at debian.org>>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad pastescript-1.6.1.1~/paste/script/copydir.py pastescript-1.6.1.1/paste/script/copydir.py
+--- pastescript-1.6.1.1~/paste/script/copydir.py	2008-01-07 03:52:47.000000000 +0100
++++ pastescript-1.6.1.1/paste/script/copydir.py	2008-02-04 20:16:31.000000000 +0100
+@@ -103,6 +103,8 @@
+                                              template_renderer=template_renderer)
+             except SkipTemplate:
+                 continue
++        if content is None:
++            continue
+         already_exists = os.path.exists(dest_full)
+         if already_exists:
+             f = open(dest_full, 'rb')


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