[Python-modules-commits] r1979 - in /packages/python-mysqldb:
tarballs/ trunk/debian/ trunk/debian/patches/
mejo at users.alioth.debian.org
mejo at users.alioth.debian.org
Thu Apr 5 11:42:09 UTC 2007
Author: mejo
Date: Thu Apr 5 11:42:06 2007
New Revision: 1979
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1979
Log:
add 1.2.2 stable release
Added:
packages/python-mysqldb/tarballs/python-mysqldb_1.2.2.orig.tar.gz (with props)
Modified:
packages/python-mysqldb/trunk/debian/changelog
packages/python-mysqldb/trunk/debian/patches/00list
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
Added: packages/python-mysqldb/tarballs/python-mysqldb_1.2.2.orig.tar.gz
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/tarballs/python-mysqldb_1.2.2.orig.tar.gz?rev=1979&op=file
==============================================================================
Binary file - no diff available.
Propchange: packages/python-mysqldb/tarballs/python-mysqldb_1.2.2.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: packages/python-mysqldb/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/changelog?rev=1979&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/changelog (original)
+++ packages/python-mysqldb/trunk/debian/changelog Thu Apr 5 11:42:06 2007
@@ -1,6 +1,13 @@
+python-mysqldb (1.2.2-1) unstable; urgency=low
+
+ * new upstream stable release, update patches accordingly
+ * bump mysql version in debian rules to 5.0.36
+
+ -- Jonas Meurer <mejo at debian.org> Thu, 05 Apr 2007 13:40:46 +0200
+
python-mysqldb (1.2.2~b2-1) unstable; urgency=medium
- [ Jonas Meurer ]
+ [ Jonas Meurer ]
* yet another beta, updated debian patches
* bump minimal mysql version in package description to 3.23
* bump versioned build-depends on libmysqlclient15-dev to >= 5.0.26-1
@@ -8,11 +15,11 @@
person reported problems without the patch. (closes: 394999)
* don't install a ChangeLog file, as no one exists.
- [ Piotr Ozarowski ]
+ [ Piotr Ozarowski ]
* Added XS-Vcs-Svn field
-- Jonas Meurer <mejo at debian.org> Sat, 25 Nov 2006 13:02:21 +0100
-
+
python-mysqldb (1.2.2~b1-1) unstable; urgency=low
* new upstream beta release
Modified: packages/python-mysqldb/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/patches/00list?rev=1979&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/00list (original)
+++ packages/python-mysqldb/trunk/debian/patches/00list Thu Apr 5 11:42:06 2007
@@ -1,3 +1,3 @@
01_converters_boolean
02_reconnect
-#03_converters_set2str
+03_converters_set2str
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=1979&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch (original)
+++ packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch Thu Apr 5 11:42:06 2007
@@ -1,14 +1,8 @@
-#! /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
-
- at DPATCH@
-
---- python-mysqldb-1.2.2~b2/MySQLdb/converters.py
-+++ python-mysqldb-1.2.2~b2/MySQLdb/converters.py
-@@ -164,5 +164,10 @@
+Binärdateien MySQL-python-1.2.2.orig/.ChangeLog.swp and MySQL-python-1.2.2/.ChangeLog.swp sind verschieden.
+diff -rNu MySQL-python-1.2.2.orig/MySQLdb/converters.py MySQL-python-1.2.2/MySQLdb/converters.py
+--- MySQL-python-1.2.2.orig/MySQLdb/converters.py 2007-01-29 19:02:17.000000000 +0100
++++ MySQL-python-1.2.2/MySQLdb/converters.py 2007-04-05 13:37:43.000000000 +0200
+@@ -163,5 +163,10 @@
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=1979&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/02_reconnect.dpatch (original)
+++ packages/python-mysqldb/trunk/debian/patches/02_reconnect.dpatch Thu Apr 5 11:42:06 2007
@@ -1,13 +1,7 @@
-#! /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
-
- at DPATCH@
-
---- python-mysqldb-1.2.2~b2/_mysql.c
-+++ python-mysqldb-1.2.2~b2/_mysql.c
+Binärdateien MySQL-python-1.2.2.orig/.ChangeLog.swp and MySQL-python-1.2.2/.ChangeLog.swp sind verschieden.
+diff -rNu MySQL-python-1.2.2.orig/_mysql.c MySQL-python-1.2.2/_mysql.c
+--- MySQL-python-1.2.2.orig/_mysql.c 2007-02-28 03:35:56.000000000 +0100
++++ MySQL-python-1.2.2/_mysql.c 2007-04-05 13:39:16.000000000 +0200
@@ -579,6 +579,8 @@
if (!conn) {
_mysql_Exception(self);
@@ -17,3 +11,18 @@
}
/*
PyType_GenericAlloc() automatically sets up GC allocation and
+diff -rNu MySQL-python-1.2.2.orig/MySQLdb/converters.py MySQL-python-1.2.2/MySQLdb/converters.py
+--- MySQL-python-1.2.2.orig/MySQLdb/converters.py 2007-01-29 19:02:17.000000000 +0100
++++ MySQL-python-1.2.2/MySQLdb/converters.py 2007-04-05 13:37:43.000000000 +0200
+@@ -163,5 +163,10 @@
+ except ImportError:
+ pass
+
+-
++try:
++ from types import BooleanType
++ def Bool2Str(s, d): return str(int(s))
++ conversions[BooleanType] = Bool2Str
++except ImportError:
++ pass
+
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=1979&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch (original)
+++ packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch Thu Apr 5 11:42:06 2007
@@ -1,20 +1,38 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_converters_set2str.dpatch by Simeon Anastasov
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix set2str
-
- at DPATCH@
-
---- python-mysqldb-1.2.2~b2/MySQLdb/converters.py
-+++ python-mysqldb-1.2.2~b2/MySQLdb/converters.py
+Binärdateien MySQL-python-1.2.2.orig/.ChangeLog.swp and MySQL-python-1.2.2/.ChangeLog.swp sind verschieden.
+diff -rNu MySQL-python-1.2.2.orig/_mysql.c MySQL-python-1.2.2/_mysql.c
+--- MySQL-python-1.2.2.orig/_mysql.c 2007-02-28 03:35:56.000000000 +0100
++++ MySQL-python-1.2.2/_mysql.c 2007-04-05 13:39:16.000000000 +0200
+@@ -579,6 +579,8 @@
+ if (!conn) {
+ _mysql_Exception(self);
+ return -1;
++ } else {
++ conn->reconnect = 1;
+ }
+ /*
+ PyType_GenericAlloc() automatically sets up GC allocation and
+diff -rNu MySQL-python-1.2.2.orig/MySQLdb/converters.py MySQL-python-1.2.2/MySQLdb/converters.py
+--- MySQL-python-1.2.2.orig/MySQLdb/converters.py 2007-01-29 19:02:17.000000000 +0100
++++ MySQL-python-1.2.2/MySQLdb/converters.py 2007-04-05 13:39:49.000000000 +0200
@@ -42,7 +42,8 @@
def Bool2Str(s, d): return str(int(s))
def Str2Set(s):
- return Set([ i for i in s.split(',') if i ])
+ values = s.split(',')
-+ return apply(str, tuple(values))
++ return map(str, tuple(values))
def Set2Str(s, d):
return string_literal(','.join(s), d)
+@@ -163,5 +164,10 @@
+ except ImportError:
+ pass
+
+-
++try:
++ from types import BooleanType
++ def Bool2Str(s, d): return str(int(s))
++ conversions[BooleanType] = Bool2Str
++except ImportError:
++ pass
+
Modified: packages/python-mysqldb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/rules?rev=1979&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/rules (original)
+++ packages/python-mysqldb/trunk/debian/rules Thu Apr 5 11:42:06 2007
@@ -8,7 +8,7 @@
include /usr/share/dpatch/dpatch.make
# export some vars
-export mysqlversion=5.0.27
+export mysqlversion=5.0.36
export mysqlclient=mysqlclient_r
export mysqloptlibs=ssl crypto
@@ -58,7 +58,7 @@
# Build architecture-dependent files here.
binary-arch: install
dh_installdocs
- #dh_installchangelogs ChangeLog
+ dh_installchangelogs ChangeLog
dh_installchangelogs
dh_strip
dh_compress
More information about the Python-modules-commits
mailing list