[Python-modules-commits] r802 - in /packages/python-htmltmpl/trunk: debian/changelog debian/patches/ debian/patches/01_null_variables.patch debian/rules htmltmpl.py setup.py

[sto at users.alioth.debian.org]

Author: sto
Date: Wed Jun 14 10:29:11 2006
New Revision: 802

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=802
Log:
Remove diffs outside the debian/ directory

Added:
    packages/python-htmltmpl/trunk/debian/patches/
    packages/python-htmltmpl/trunk/debian/patches/01_null_variables.patch
Removed:
    packages/python-htmltmpl/trunk/htmltmpl.py
    packages/python-htmltmpl/trunk/setup.py
Modified:
    packages/python-htmltmpl/trunk/debian/changelog
    packages/python-htmltmpl/trunk/debian/rules

Modified: packages/python-htmltmpl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-htmltmpl/trunk/debian/changelog?rev=802&op=diff
==============================================================================
--- packages/python-htmltmpl/trunk/debian/changelog (original)
+++ packages/python-htmltmpl/trunk/debian/changelog Wed Jun 14 10:29:11 2006
@@ -1,8 +1,9 @@
 python-htmltmpl (1.22-9) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Remove diffs outside the debian/ directory, use CDBS rules for
+    simple-patchsys.
 
- -- Sergio Talens-Oliag <sto at debian.org>  Wed, 14 Jun 2006 11:58:10 +0200
+ -- Sergio Talens-Oliag <sto at debian.org>  Wed, 14 Jun 2006 12:28:17 +0200
 
 python-htmltmpl (1.22-8) unstable; urgency=low
 

Added: packages/python-htmltmpl/trunk/debian/patches/01_null_variables.patch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-htmltmpl/trunk/debian/patches/01_null_variables.patch?rev=802&op=file
==============================================================================
--- packages/python-htmltmpl/trunk/debian/patches/01_null_variables.patch (added)
+++ packages/python-htmltmpl/trunk/debian/patches/01_null_variables.patch Wed Jun 14 10:29:11 2006
@@ -1,0 +1,16 @@
+--- ../htmltmpl-1.22/htmltmpl.py	2001-12-15 23:11:28.000000000 +0100
++++ htmltmpl.py	2006-06-14 11:54:51.057095134 +0200
+@@ -603,9 +603,10 @@
+                     # If output of current block is not disabled then append
+                     # the substitued and escaped variable to the output.
+                     if DISABLE_OUTPUT not in output_control:
+-                        value = str(self.find_value(var, loop_name, loop_pass,
+-                                                    loop_total, globalp))
+-                        out += self.escape(value, escape)
++                        value = self.find_value(var, loop_name, loop_pass,
++                                                loop_total, globalp)
++                        if value != "": 
++                            out += self.escape(str(value), escape)
+                         self.DEB("VAR: " + str(var))
+ 
+                 elif token == "<TMPL_LOOP":

Modified: packages/python-htmltmpl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-htmltmpl/trunk/debian/rules?rev=802&op=diff
==============================================================================
--- packages/python-htmltmpl/trunk/debian/rules (original)
+++ packages/python-htmltmpl/trunk/debian/rules Wed Jun 14 10:29:11 2006
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk