r1121 - in python-mechanize/trunk/debian (7 files)

[Fabio Tranchitella]

    Date: Tuesday, December 18, 2007 @ 18:20:56
  Author: kobold
Revision: 1121

* debian/patches/mechanize_seek.dpatch: applied a patch from the twill
  maintainer to add file.seek(0)  because ``file'' position may not be at
  the beginning; thanks Arnaud Fontaine. (Closes: #456944)

Added:
  python-mechanize/trunk/debian/patches/
  python-mechanize/trunk/debian/patches/00list
  python-mechanize/trunk/debian/patches/DPATCH
  python-mechanize/trunk/debian/patches/mechanize_seek.dpatch
Modified:
  python-mechanize/trunk/debian/changelog
  python-mechanize/trunk/debian/control
  python-mechanize/trunk/debian/rules

Modified: python-mechanize/trunk/debian/changelog
===================================================================
--- python-mechanize/trunk/debian/changelog	2007-12-18 13:28:04 UTC (rev 1120)
+++ python-mechanize/trunk/debian/changelog	2007-12-18 18:20:56 UTC (rev 1121)
@@ -1,3 +1,11 @@
+python-mechanize (0.1.7b-2) unstable; urgency=low
+
+  * debian/patches/mechanize_seek.dpatch: applied a patch from the twill
+    maintainer to add file.seek(0)  because ``file'' position may not be at
+    the beginning; thanks Arnaud Fontaine. (Closes: #456944)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Tue, 18 Dec 2007 19:15:17 +0100
+
 python-mechanize (0.1.7b-1) unstable; urgency=low
 
   * New upstream release. (Closes: #446523)

Modified: python-mechanize/trunk/debian/control
===================================================================
--- python-mechanize/trunk/debian/control	2007-12-18 13:28:04 UTC (rev 1120)
+++ python-mechanize/trunk/debian/control	2007-12-18 18:20:56 UTC (rev 1121)
@@ -4,7 +4,7 @@
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Brian Sutherland <jinty at web.de>, Fabio Tranchitella <kobold at debian.org>, Jérémy Bobbio <lunar at debian.org>
 Build-Depends-Indep: python-all-dev (>= 2.3.5-9), python-central (>= 0.5)
-Build-Depends: debhelper (>= 5.0.37.2), python-setuptools (>= 0.6b3)
+Build-Depends: debhelper (>= 5.0.37.2), python-setuptools (>= 0.6b3), dpatch
 Standards-Version: 3.7.2
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/python-mechanize/trunk

Added: python-mechanize/trunk/debian/patches/00list
===================================================================
--- python-mechanize/trunk/debian/patches/00list	                        (rev 0)
+++ python-mechanize/trunk/debian/patches/00list	2007-12-18 18:20:56 UTC (rev 1121)
@@ -0,0 +1 @@
+mechanize_seek

Added: python-mechanize/trunk/debian/patches/DPATCH
===================================================================
--- python-mechanize/trunk/debian/patches/DPATCH	                        (rev 0)
+++ python-mechanize/trunk/debian/patches/DPATCH	2007-12-18 18:20:56 UTC (rev 1121)
@@ -0,0 +1,16 @@
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0

Added: python-mechanize/trunk/debian/patches/mechanize_seek.dpatch
===================================================================
--- python-mechanize/trunk/debian/patches/mechanize_seek.dpatch	                        (rev 0)
+++ python-mechanize/trunk/debian/patches/mechanize_seek.dpatch	2007-12-18 18:20:56 UTC (rev 1121)
@@ -0,0 +1,15 @@
+#! /bin/sh -e
+
+. $(dirname $0)/DPATCH
+
+ at DPATCH@
+--- mechanize-0.1.7b/mechanize/_html.py.old     2007-12-16 15:17:37.000000000 +0000
++++ mechanize-0.1.7b/mechanize/_html.py 2007-12-16 15:17:47.000000000 +0000
+@@ -599,6 +599,7 @@
+         Factory.set_response(self, response)
+         if response is not None:
+             data = response.read()
++            response.seek(0)
+             soup = self._soup_class(self.encoding, data)
+             self._forms_factory.set_response(
+                 copy.copy(response), self.encoding)


Property changes on: python-mechanize/trunk/debian/patches/mechanize_seek.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: python-mechanize/trunk/debian/rules
===================================================================
--- python-mechanize/trunk/debian/rules	2007-12-18 13:28:04 UTC (rev 1120)
+++ python-mechanize/trunk/debian/rules	2007-12-18 18:20:56 UTC (rev 1121)
@@ -9,15 +9,18 @@
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
 		             | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
 
-build: $(PYVERS:%=build-python%)
+include /usr/share/dpatch/dpatch.make
+
+.PHONY: patch-stamp
+build: patch-stamp $(PYVERS:%=build-python%)
 	touch $@
 build-python%:
 	dh_testdir
 	python$* setup.py build
 	touch $@
 
-.PHONY: clean
-clean:
+.PHONY: clean unpatch
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-python?.?