[Python-modules-commits] r2499 - in /packages/pylons/trunk/debian: changelog control rules

[malex at users.alioth.debian.org]

Author: malex
Date: Tue Jun  5 19:20:09 2007
New Revision: 2499

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2499
Log:
Include a patch to fix #427672

Modified:
    packages/pylons/trunk/debian/changelog
    packages/pylons/trunk/debian/control
    packages/pylons/trunk/debian/rules

Modified: packages/pylons/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/pylons/trunk/debian/changelog?rev=2499&op=diff
==============================================================================
--- packages/pylons/trunk/debian/changelog (original)
+++ packages/pylons/trunk/debian/changelog Tue Jun  5 19:20:09 2007
@@ -1,3 +1,14 @@
+pylons (0.9.5-6) unstable; urgency=low
+
+  * debian/control: Added a dependency on dpatch.
+  * debian/rules: Added rules to handle source patching at build-time using
+    dpatch.
+  * debian/patches/01-validate_unicode.dpatch: To fix a unicode validation
+    problem added a patch provided by "Dwayne C. Litzenberger"
+    <dlitz at dlitz.net> (Closes: #427672).
+
+ -- Oleksandr Moskalenko <malex at debian.org>  Tue, 05 Jun 2007 13:07:05 -0600
+
 pylons (0.9.5-5) unstable; urgency=low
 
   * debian/control: Added python-mako to depends (Closes: #425332).

Modified: packages/pylons/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/pylons/trunk/debian/control?rev=2499&op=diff
==============================================================================
--- packages/pylons/trunk/debian/control (original)
+++ packages/pylons/trunk/debian/control Tue Jun  5 19:20:09 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Oleksandr Moskalenko <malex at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), python (>= 2.3.3), python-all-dev, python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1)
+Build-Depends: debhelper (>= 5), python (>= 2.3.3), python-all-dev, python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1), dpatch
 Standards-Version: 3.7.2
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/pylons/trunk/

Modified: packages/pylons/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pylons/trunk/debian/rules?rev=2499&op=diff
==============================================================================
--- packages/pylons/trunk/debian/rules (original)
+++ packages/pylons/trunk/debian/rules Tue Jun  5 19:20:09 2007
@@ -4,7 +4,11 @@
 #export DH_VERBOSE=1
 package=python-pylons
 
-clean:
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
+clean: unpatch
 	rm -f build-*
 	dh_testdir
 	dh_testroot
@@ -13,16 +17,16 @@
 	find . -name *\.py[co] -exec rm -f {} \;
 	dh_clean
 
-build: build-indep
-
-build-indep:
-#	cd doc; python ./genhtml.py
-	touch $@
-
 build-stamp: 
 	dh_testdir
 	python setup.py build
 	touch $@
+
+patch-stamp:
+	dpatch apply-all
+	touch patch-stamp
+
+build: patch-stamp build-stamp
 
 install: build
 	dh_testdir