Hi release team,
Thomas Goirand was so nice to upload the fixed package to unstable. He
added a small change to fix building twice in a row, such that the full
changelog now reads:
[ Mika Pflüger ]
* Team upload.
* debian/patches/05_ssl.patch: Add upstream patch to force building
SSL support with newer MySQL client libraries. Thanks to Eldon Koyle
for isolating the fix in the upstream VCS. (Closes: #678169)
* Delete now obsolete debian/patches/README.source which referred to
dpatch.
[ Thomas Goirand ]
* Added a debian/rules clean: rm MySQL_python.egg-info/PKG-INFO, so
it is possible to build the package twice.
The debdiff between the version in testing and stable is attached,
it would be very nice if you could unblock it.
Cheers,
Mika
unblock python-mysqldb/1.2.3-2
--
diff -Nru python-mysqldb-1.2.3/debian/changelog python-mysqldb-1.2.3/debian/changelog
--- python-mysqldb-1.2.3/debian/changelog 2011-10-18 12:46:05.000000000 +0200
+++ python-mysqldb-1.2.3/debian/changelog 2013-03-15 07:02:21.000000000 +0100
@@ -1,3 +1,19 @@
+python-mysqldb (1.2.3-2) unstable; urgency=low
+
+ [ Mika Pflüger ]
+ * Team upload.
+ * debian/patches/05_ssl.patch: Add upstream patch to force building
+ SSL support with newer MySQL client libraries. Thanks to Eldon Koyle
+ for isolating the fix in the upstream VCS. (Closes: #678169)
+ * Delete now obsolete debian/patches/README.source which referred to
+ dpatch.
+
+ [ Thomas Goirand ]
+ * Added a debian/rules clean: rm MySQL_python.egg-info/PKG-INFO, so it is
+ possible to build the package twice.
+
+ -- Mika Pflüger <debian@mikapflueger.de> Mon, 11 Mar 2013 18:03:06 +0100
+
python-mysqldb (1.2.3-1) unstable; urgency=low
* Merge with package from Ubuntu, thanks to Mario Limonciello.
diff -Nru python-mysqldb-1.2.3/debian/patches/05_ssl.patch python-mysqldb-1.2.3/debian/patches/05_ssl.patch
--- python-mysqldb-1.2.3/debian/patches/05_ssl.patch 1970-01-01 01:00:00.000000000 +0100
+++ python-mysqldb-1.2.3/debian/patches/05_ssl.patch 2013-03-15 06:51:49.000000000 +0100
@@ -0,0 +1,21 @@
+Description: Force HAVE_OPENSSL if the client library is 5.5 or newer.
+Origin: http://sourceforge.net/p/mysql-python/svn/656/tree//branches/MySQLdb-1.2/MySQLdb/_mysql.c?diff=5059d1f5bfc09e26e1a66617:655
+Bug: http://sourceforge.net/p/mysql-python/bugs/323/
+Reviewed-by: Eldon Koyle <ekoyle@gmail.com>
+Last-Update: 2013-03-11
+
+Index: python-mysqldb-argh/_mysql.c
+===================================================================
+--- python-mysqldb-argh.orig/_mysql.c 2010-06-17 09:21:56.000000000 +0200
++++ python-mysqldb-argh/_mysql.c 2013-03-11 18:30:38.839269635 +0100
+@@ -102,6 +102,10 @@
+ #define check_server_init(x) if (!_mysql_server_init_done) _mysql_server_init_done = 1
+ #endif
+
++#if MYSQL_VERSION_ID >= 50500
++#define HAVE_OPENSSL 1
++#endif
++
+ PyObject *
+ _mysql_Exception(_mysql_ConnectionObject *c)
+ {
diff -Nru python-mysqldb-1.2.3/debian/patches/series python-mysqldb-1.2.3/debian/patches/series
--- python-mysqldb-1.2.3/debian/patches/series 2011-10-18 11:38:40.000000000 +0200
+++ python-mysqldb-1.2.3/debian/patches/series 2013-03-15 06:51:49.000000000 +0100
@@ -1,2 +1,3 @@
01_converters_boolean.patch
03_converters_set2str.patch
+05_ssl.patch
diff -Nru python-mysqldb-1.2.3/debian/rules python-mysqldb-1.2.3/debian/rules
--- python-mysqldb-1.2.3/debian/rules 2011-10-18 12:53:10.000000000 +0200
+++ python-mysqldb-1.2.3/debian/rules 2013-03-15 07:02:45.000000000 +0100
@@ -17,7 +17,7 @@
python$* setup.py clean
find . -name "*.py[co]" -exec rm -f {} \;
dh_testroot
- rm -fr build build-python$*
+ rm -fr build build-python$* MySQL_python.egg-info/PKG-INFO
dh_clean
build: $(PYVERS:%=build-python%)
Attachment:
signature.asc
Description: PGP signature