[Python-modules-commits] r3429 - in /packages/python-mysqldb/trunk/debian: changelog control patches/00dpatch.conf patches/00list patches/05_null-connection-guard.dpatch

bzed-guest at users.alioth.debian.org bzed-guest at users.alioth.debian.org
Sun Oct 14 10:17:26 UTC 2007 

Author: bzed-guest
Date: Sun Oct 14 10:17:26 2007
New Revision: 3429

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3429
Log:
* debian/patches:
  - Adding 05_null-connection-guard.dpatch, providing an interface to set
    MYSQL_OPT_RECONNECT
* debian/control
  - Adding myself as uploader
  - Adding Homepage field
  - Replacing the depricated ${Source-Version} by ${binary:Version} in the
    dependency list of python-mysqldb-dbg 

Added:
    packages/python-mysqldb/trunk/debian/patches/00dpatch.conf
    packages/python-mysqldb/trunk/debian/patches/05_null-connection-guard.dpatch   (with props)
Modified:
    packages/python-mysqldb/trunk/debian/changelog
    packages/python-mysqldb/trunk/debian/control
    packages/python-mysqldb/trunk/debian/patches/00list

Modified: packages/python-mysqldb/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/changelog?rev=3429&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/changelog (original)
+++ packages/python-mysqldb/trunk/debian/changelog Sun Oct 14 10:17:26 2007
@@ -1,8 +1,19 @@
-python-mysqldb (1.2.2-5) UNRELEASED; urgency=low
-
+python-mysqldb (1.2.2-5) unstable; urgency=low
+
+  [ Piotr Ożarowski ]
   * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now)
 
- -- Piotr Ożarowski <piotr at debian.org>  Sat,  6 Oct 2007 23:47:11 +0200
+  [ Bernd Zeimetz ]
+  * debian/patches:
+    - Adding 05_null-connection-guard.dpatch, providing an interface to set
+      MYSQL_OPT_RECONNECT
+  * debian/control
+    - Adding myself as uploader
+    - Adding Homepage field
+    - Replacing the depricated ${Source-Version} by ${binary:Version} in the
+      dependency list of python-mysqldb-dbg 
+
+ -- Bernd Zeimetz <bernd at bzed.de>  Sun, 14 Oct 2007 12:15:09 +0200
 
 python-mysqldb (1.2.2-4) unstable; urgency=low
 

Modified: packages/python-mysqldb/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/control?rev=3429&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/control (original)
+++ packages/python-mysqldb/trunk/debian/control Sun Oct 14 10:17:26 2007
@@ -2,11 +2,12 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Jonas Meurer <mejo at debian.org>, Raphael Hertzog <hertzog at debian.org>
+Uploaders: Jonas Meurer <mejo at debian.org>, Raphael Hertzog <hertzog at debian.org>, Bernd Zeimetz <bernd at bzed.de>
 Build-Depends: debhelper (>= 5.0.37.2), dpatch, python-all-dev (>= 2.4.4-3), python-all-dbg, libmysqlclient15-dev (>= 5.0.26-1), zlib1g-dev, python-support (>= 0.6), python-setuptools
 XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-mysqldb/trunk/
 Standards-Version: 3.7.2
+Homepage: http://mysql-python.sourceforge.net/
 
 Package: python-mysqldb
 Architecture: any
@@ -28,7 +29,7 @@
 Package: python-mysqldb-dbg
 Priority: extra
 Architecture: any
-Depends: python-mysqldb (= ${Source-Version}), python-dbg, ${shlibs:Depends}
+Depends: python-mysqldb (= ${binary:Version}), python-dbg, ${shlibs:Depends}
 Suggests: python-egenix-mxdatetime-dbg
 Description: A Python interface to MySQL (debug extension)
  MySQLdb is an interface to the popular MySQL database server for Python.

Added: packages/python-mysqldb/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/patches/00dpatch.conf?rev=3429&op=file
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/00dpatch.conf (added)
+++ packages/python-mysqldb/trunk/debian/patches/00dpatch.conf Sun Oct 14 10:17:26 2007
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs

Modified: packages/python-mysqldb/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/patches/00list?rev=3429&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/00list (original)
+++ packages/python-mysqldb/trunk/debian/patches/00list Sun Oct 14 10:17:26 2007
@@ -2,3 +2,4 @@
 02_reconnect
 03_converters_set2str
 04_disable_ez_setup
+05_null-connection-guard

Added: packages/python-mysqldb/trunk/debian/patches/05_null-connection-guard.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/patches/05_null-connection-guard.dpatch?rev=3429&op=file
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/05_null-connection-guard.dpatch (added)
+++ packages/python-mysqldb/trunk/debian/patches/05_null-connection-guard.dpatch Sun Oct 14 10:17:26 2007
@@ -1,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_null-connection-guard.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: guard against a null connection.
+## DP: patch from http://dev.zenoss.com/trac/browser/trunk/inst/externallibs/MySQL-python-1.2.0.patch02
+
+ at DPATCH@
+diff -urNad python-mysqldb~/_mysql.c python-mysqldb/_mysql.c
+--- python-mysqldb~/_mysql.c	2007-10-07 00:00:11.000000000 +0200
++++ python-mysqldb/_mysql.c	2007-10-07 00:00:11.000000000 +0200
+@@ -489,10 +489,10 @@
+ 				  "named_pipe", "init_command",
+ 				  "read_default_file", "read_default_group",
+ 				  "client_flag", "ssl",
+-				  "local_infile",
++				  "local_infile", "reconnect", 
+ 				  NULL } ;
+ 	int connect_timeout = 0;
+-	int compress = -1, named_pipe = -1, local_infile = -1;
++	int compress = -1, named_pipe = -1, local_infile = -1, reconnect = -1;
+ 	char *init_command=NULL,
+ 	     *read_default_file=NULL,
+ 	     *read_default_group=NULL;
+@@ -500,7 +500,7 @@
+ 	self->converter = NULL;
+ 	self->open = 0;
+ 	check_server_init(-1);
+-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ssssisOiiisssiOi:connect",
++	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ssssisOiiisssiOii:connect",
+ 					 kwlist,
+ 					 &host, &user, &passwd, &db,
+ 					 &port, &unix_socket, &conv,
+@@ -509,7 +509,7 @@
+ 					 &init_command, &read_default_file,
+ 					 &read_default_group,
+ 					 &client_flag, &ssl,
+-					 &local_infile
++					 &local_infile, &reconnect
+ 					 ))
+ 		return -1;
+ 
+@@ -553,6 +553,7 @@
+ 		mysql_options(&(self->connection), MYSQL_OPT_COMPRESS, 0);
+ 		client_flag |= CLIENT_COMPRESS;
+ 	}
++
+ 	if (named_pipe != -1)
+ 		mysql_options(&(self->connection), MYSQL_OPT_NAMED_PIPE, 0);
+ 	if (init_command != NULL)
+@@ -574,6 +575,12 @@
+ 	conn = mysql_real_connect(&(self->connection), host, user, passwd, db,
+ 				  port, unix_socket, client_flag);
+ 
++	/* Needs to come after real_connect per mysql API manual */
++	if (conn && reconnect > 0) {
++		my_bool bool = reconnect;
++		mysql_options(conn, MYSQL_OPT_RECONNECT, &bool);
++	}
++
+ 	Py_END_ALLOW_THREADS ;
+ 
+ 	if (!conn) {

Propchange: packages/python-mysqldb/trunk/debian/patches/05_null-connection-guard.dpatch
------------------------------------------------------------------------------
    svn:executable = *

More information about the Python-modules-commits mailing list