[Python-modules-commits] r1469 - in
/packages/python-mysqldb/trunk/debian: changelog
patches/01_converters_boolean.dpatch patches/02_reconnect.dpatch
patches/03_converters_set2str.dpatch rules
mejo at users.alioth.debian.org
mejo at users.alioth.debian.org
Sat Nov 4 22:31:30 CET 2006
Author: mejo
Date: Sat Nov 4 22:31:29 2006
New Revision: 1469
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1469
Log:
update to 1.2.2~b2-1
Modified:
packages/python-mysqldb/trunk/debian/changelog
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
packages/python-mysqldb/trunk/debian/rules
Modified: packages/python-mysqldb/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/changelog?rev=1469&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/changelog (original)
+++ packages/python-mysqldb/trunk/debian/changelog Sat Nov 4 22:31:29 2006
@@ -1,8 +1,17 @@
-python-mysqldb (1.2.1-p2-4.test) unstable; urgency=low
-
- * build without the str2set patch
-
- -- Jonas Meurer <mejo at debian.org> Wed, 1 Nov 2006 04:24:27 +0100
+python-mysqldb (1.2.2~b2-1) unstable; urgency=low
+
+ * yet another beta, updated debian patches
+ * don't apply patch 03_converters_set2str. breaks too much and only one
+ person reported problems without the patch. (closes: 394999)
+
+ -- Jonas Meurer <mejo at debian.org> Sat, 4 Nov 2006 22:29:13 +0100
+
+python-mysqldb (1.2.2~b1-1) unstable; urgency=low
+
+ * new upstream beta release
+ * adjust patches 01 and 02 for new beta
+
+ -- Jonas Meurer <mejo at debian.org> Wed, 6 Sep 2006 05:30:45 +0200
python-mysqldb (1.2.1-p2-4) unstable; urgency=HIGH
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=1469&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch (original)
+++ packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch Sat Nov 4 22:31:29 2006
@@ -6,12 +6,12 @@
@DPATCH@
---- python-mysqldb-1.2.1-p2.orig/MySQLdb/converters.py
-+++ python-mysqldb-1.2.1-p2/MySQLdb/converters.py
-@@ -163,5 +163,10 @@
+--- python-mysqldb-1.2.2~b2/MySQLdb/converters.py
++++ python-mysqldb-1.2.2~b2/MySQLdb/converters.py
+@@ -164,5 +164,10 @@
except ImportError:
pass
-
+
-
+try:
+ from types import BooleanType
@@ -19,4 +19,4 @@
+ conversions[BooleanType] = Bool2Str
+except ImportError:
+ pass
-
+
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=1469&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/02_reconnect.dpatch (original)
+++ packages/python-mysqldb/trunk/debian/patches/02_reconnect.dpatch Sat Nov 4 22:31:29 2006
@@ -4,28 +4,15 @@
## 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
- 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/_mysql.c
-+++ python-mysqldb-1.2.1-p2/_mysql.c
-@@ -567,6 +567,8 @@
+--- python-mysqldb-1.2.2~b2/_mysql.c
++++ python-mysqldb-1.2.2~b2/_mysql.c
+@@ -579,6 +579,8 @@
if (!conn) {
_mysql_Exception(self);
return -1;
-+ } else {
++ else {
+ conn->reconnect = 1;
}
/*
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=1469&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch (original)
+++ packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch Sat Nov 4 22:31:29 2006
@@ -6,8 +6,8 @@
@DPATCH@
---- python-mysqldb-1.2.1-p2/MySQLdb/converters.py
-+++ python-mysqldb-1.2.1-p2/MySQLdb/converters.py
+--- python-mysqldb-1.2.2~b2/MySQLdb/converters.py
++++ python-mysqldb-1.2.2~b2/MySQLdb/converters.py
@@ -42,7 +42,8 @@
def Bool2Str(s, d): return str(int(s))
Modified: packages/python-mysqldb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/rules?rev=1469&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/rules (original)
+++ packages/python-mysqldb/trunk/debian/rules Sat Nov 4 22:31:29 2006
@@ -8,7 +8,7 @@
include /usr/share/dpatch/dpatch.make
# export some vars
-export mysqlversion=5.0.24
+export mysqlversion=5.0.26
export mysqlclient=mysqlclient_r
export mysqloptlibs=ssl crypto
@@ -57,7 +57,7 @@
# Build architecture-dependent files here.
binary-arch: install
- dh_installdocs -A README doc/MySQLdb.txt doc/FAQ.txt
+ dh_installdocs
dh_installchangelogs ChangeLog
dh_strip
dh_compress
More information about the Python-modules-commits
mailing list