[Python-modules-commits] r1271 - in /packages/python-mysqldb/trunk/debian/patches: 01_converters_boolean.dpatch 02_reconnect.dpatch 03_converters_set2str.dpatch

[mejo at users.alioth.debian.org]

Author: mejo
Date: Fri Aug 18 12:08:39 2006
New Revision: 1271

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1271
Log:
update, fix patches

Modified:
    packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch
    packages/python-mysqldb/trunk/debian/patches/02_reconnect.dpatch
    packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch

Modified: packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch?rev=1271&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch (original)
+++ packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch Fri Aug 18 12:08:39 2006
@@ -1,25 +1,11 @@
-#! /bin/sh -e
-# 01_converters_boolean.dpatch by Jonas Meurer <mejo at debian.org>
-# (skeleton taken from 01_conffiles.patch from cdrtools package)
-#
-# All lines beginning with `## DP:' are a description of the patch.
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_converters_boolean.dpatch by Jonas Meurer <mejo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
 ## DP: take boolean into account at converters.py
 
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
+ at DPATCH@
 
-exit 0
-
- at DPATCH@
 --- python-mysqldb-1.2.1-p2.orig/MySQLdb/converters.py
 +++ python-mysqldb-1.2.1-p2/MySQLdb/converters.py
 @@ -163,5 +163,10 @@

Modified: packages/python-mysqldb/trunk/debian/patches/02_reconnect.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/patches/02_reconnect.dpatch?rev=1271&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/02_reconnect.dpatch (original)
+++ packages/python-mysqldb/trunk/debian/patches/02_reconnect.dpatch Fri Aug 18 12:08:39 2006
@@ -1,7 +1,7 @@
-#! /bin/sh -e
-# 02_reconnect.dpatch by Dan Pascu <dan at ag-projects.com>
-#
-# All lines beginning with `## DP:' are a description of the patch.
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_reconnect.dpatch by Dan Pascu <dan at ag-projects.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
 ## DP: reconnect after connection is lost, even with mysql >= 5.0.3
 
 if [ $# -ne 1 ]; then

Modified: packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch?rev=1271&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch (original)
+++ packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch Fri Aug 18 12:08:39 2006
@@ -6,9 +6,9 @@
 
 @DPATCH@
 
---- converters.py.orig
-+++ converters.py
-@@ -42,7 +42,9 @@
+--- python-mysqldb-1.2.1-p2/MySQLdb/converters.py
++++ python-mysqldb-1.2.1-p2/MySQLdb/converters.py
+@@ -42,7 +42,8 @@
  def Bool2Str(s, d): return str(int(s))
  
  def Str2Set(s):