[Python-apps-commits] r859 - in packages/pypar2/trunk/debian (6 files)

[piotr at users.alioth.debian.org]

    Date: Monday, March 24, 2008 @ 22:55:34
  Author: piotr
Revision: 859

* Add no_pyxml.patch - PrettyPrint() is available in PyXml only,
  LP: #203899
  + quilt added to Depends

Added:
  packages/pypar2/trunk/debian/patches/
  packages/pypar2/trunk/debian/patches/no_pyxml.patch
  packages/pypar2/trunk/debian/patches/series
Modified:
  packages/pypar2/trunk/debian/changelog
  packages/pypar2/trunk/debian/control
  packages/pypar2/trunk/debian/rules

Modified: packages/pypar2/trunk/debian/changelog
===================================================================
--- packages/pypar2/trunk/debian/changelog	2008-03-24 16:39:54 UTC (rev 858)
+++ packages/pypar2/trunk/debian/changelog	2008-03-24 22:55:34 UTC (rev 859)
@@ -1,3 +1,11 @@
+pypar2 (1.4-4) unstable; urgency=low
+
+  * Add no_pyxml.patch - PrettyPrint() is available in PyXml only,
+    LP: #203899
+    + quilt added to Depends
+
+ -- Piotr Ożarowski <piotr at debian.org>  Mon, 24 Mar 2008 23:31:44 +0100
+
 pypar2 (1.4-3) unstable; urgency=low
 
   * Drop python-xml dependency as it is going to be removed from Debian

Modified: packages/pypar2/trunk/debian/control
===================================================================
--- packages/pypar2/trunk/debian/control	2008-03-24 16:39:54 UTC (rev 858)
+++ packages/pypar2/trunk/debian/control	2008-03-24 22:55:34 UTC (rev 859)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Piotr Ożarowski <piotr at debian.org>
 Uploaders: Python Applications Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
 Build-Depends-Indep: python-central (>= 0.5.6), python-dev (>= 2.3.5-11)
 Standards-Version: 3.7.3
 Homepage: http://pypar2.silent-blade.org/

Added: packages/pypar2/trunk/debian/patches/no_pyxml.patch
===================================================================
--- packages/pypar2/trunk/debian/patches/no_pyxml.patch	                        (rev 0)
+++ packages/pypar2/trunk/debian/patches/no_pyxml.patch	2008-03-24 22:55:34 UTC (rev 859)
@@ -0,0 +1,22 @@
+Index: pypar2-1.4/src/prefsManager.py
+===================================================================
+--- pypar2-1.4.orig/src/prefsManager.py
++++ pypar2-1.4/src/prefsManager.py
+@@ -16,7 +16,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ 
+-import consts, os, typeToolBox, xml.dom.ext, xml.dom.minidom
++import consts, os, typeToolBox, xml.dom.minidom
+ 
+ from gettext import gettext as _
+ 
+@@ -69,7 +69,7 @@ def save() :
+         root.appendChild(node)
+     # Write the document to the disk
+     file_object = open(consts.filePrefs, 'w')
+-    xml.dom.ext.PrettyPrint(doc, file_object)
++    file_object.write(doc.toprettyxml())
+     file_object.close()
+ 
+ 

Added: packages/pypar2/trunk/debian/patches/series
===================================================================
--- packages/pypar2/trunk/debian/patches/series	                        (rev 0)
+++ packages/pypar2/trunk/debian/patches/series	2008-03-24 22:55:34 UTC (rev 859)
@@ -0,0 +1 @@
+no_pyxml.patch

Modified: packages/pypar2/trunk/debian/rules
===================================================================
--- packages/pypar2/trunk/debian/rules	2008-03-24 16:39:54 UTC (rev 858)
+++ packages/pypar2/trunk/debian/rules	2008-03-24 22:55:34 UTC (rev 859)
@@ -3,13 +3,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 build-stamp:
 	dh_testdir
-	touch build-stamp
+	touch $@
 
-build: build-stamp
+build: patch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -19,7 +21,6 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
 	dh_installdirs
 	$(MAKE) DESTDIR=$(CURDIR)/debian/pypar2 prefix=/usr install