[Python-modules-commits] r33526 - in packages/python-mysqldb/trunk/debian (9 files)
zigo at users.alioth.debian.org
zigo at users.alioth.debian.org
Wed Jul 29 16:13:54 UTC 2015
Date: Wednesday, July 29, 2015 @ 16:13:53
Author: zigo
Revision: 33526
Commits changes in the experimental version of the package.
Modified:
packages/python-mysqldb/trunk/debian/changelog
packages/python-mysqldb/trunk/debian/control
packages/python-mysqldb/trunk/debian/copyright
packages/python-mysqldb/trunk/debian/docs
packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.patch
packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.patch
packages/python-mysqldb/trunk/debian/patches/05_ssl.patch
packages/python-mysqldb/trunk/debian/patches/series
packages/python-mysqldb/trunk/debian/rules
Modified: packages/python-mysqldb/trunk/debian/changelog
===================================================================
--- packages/python-mysqldb/trunk/debian/changelog 2015-07-29 07:04:54 UTC (rev 33525)
+++ packages/python-mysqldb/trunk/debian/changelog 2015-07-29 16:13:53 UTC (rev 33526)
@@ -1,4 +1,4 @@
-python-mysqldb (1.2.3-3) UNRELEASED; urgency=low
+python-mysqldb (1.3.4-1) experimental; urgency=low
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
@@ -8,8 +8,13 @@
[ Thomas Goirand ]
* The changelog is now again fully encoded in UTF-8 (Closes: 718699).
- -- Arthur de Jong <adejong at debian.org> Sat, 17 Aug 2013 23:08:45 +0200
+ [ Brian May ]
+ * Use mysqlclient fork (Closes: #768096).
+ * Drop old patches.
+ * Add support for Python 3.3 and greater.
+ -- Brian May <bam at debian.org> Thu, 20 Nov 2014 15:10:36 +1100
+
python-mysqldb (1.2.3-2) unstable; urgency=low
[ Mika Pflüger ]
Modified: packages/python-mysqldb/trunk/debian/control
===================================================================
--- packages/python-mysqldb/trunk/debian/control 2015-07-29 07:04:54 UTC (rev 33525)
+++ packages/python-mysqldb/trunk/debian/control 2015-07-29 16:13:53 UTC (rev 33526)
@@ -2,31 +2,30 @@
Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Jonas Meurer <mejo at debian.org>, Monty Taylor <monty at inaugust.com>
-Build-Depends: debhelper (>= 6.0.0), python-all-dev (>= 2.6.6-3~),
- python-all-dbg, libmysqlclient-dev, zlib1g-dev,
- python-setuptools
+Uploaders: Jonas Meurer <mejo at debian.org>, Monty Taylor <monty at inaugust.com>,
+ Brian May <bam at debian.org>
+Build-Depends: debhelper (>= 6.0.0),
+ libmysqlclient-dev, zlib1g-dev, dh-python,
+ python-all-dev (>= 2.6.6-3~), python-all-dbg, python-setuptools,
+ python3-all-dev, python3-all-dbg, python3-setuptools,
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-mysqldb/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-mysqldb/trunk/
-Standards-Version: 3.9.2
-Homepage: http://mysql-python.sourceforge.net/
+Standards-Version: 3.9.6
+Homepage: https://pypi.python.org/pypi/mysqlclient
+X-Python3-Version: >= 3.3
Package: python-mysqldb
Architecture: any
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Suggests: python-egenix-mxdatetime, mysql-server-5.1 | mysql-server, python-mysqldb-dbg
Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
Description: Python interface to MySQL
- MySQLdb is an interface to the popular MySQL database server for
- Python. The design goals are:
+ Mysqlclient is an interface to the popular MySQL database server for Python.
.
- + Compliance with Python database API version 2.0
- + Thread-safety
- + Thread-friendliness (threads will not block each other)
- + Compatibility with MySQL-3.23 and later
- .
- This package contains modules for all Python versions supported in Debian.
+ This is a fork of MySQLdb. It add Python 3.3 support and merges some pull
+ requests.
+ .
+ This package contains modules for all Python 2.x versions supported in Debian.
Package: python-mysqldb-dbg
Section: debug
@@ -35,9 +34,38 @@
Depends: python-mysqldb (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
Suggests: python-egenix-mxdatetime-dbg
Description: Python interface to MySQL (debug extension)
- MySQLdb is an interface to the popular MySQL database server for
- Python.
+ Mysqlclient is an interface to the popular MySQL database server for Python.
.
- This package contains modules for all Python versions supported in
+ This is a fork of MySQLdb. It add Python 3.3 support and merges some pull
+ requests.
+ .
+ This package contains modules for all Python 2.x versions supported in
Debian built for Python debug interpreter.
+Package: python3-mysqldb
+Architecture: any
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: python-egenix-mxdatetime, mysql-server-5.1 | mysql-server, python3-mysqldb-dbg
+Provides: ${python3:Provides}
+Description: Python interface to MySQL
+ Mysqlclient is an interface to the popular MySQL database server for Python.
+ .
+ This is a fork of MySQLdb. It add Python 3.3 support and merges some pull
+ requests.
+ .
+ This package contains modules for all Python 3.x versions supported in Debian.
+
+Package: python3-mysqldb-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: python3-mysqldb (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, ${misc:Depends}
+Suggests: python-egenix-mxdatetime-dbg
+Description: Python interface to MySQL (debug extension)
+ Mysqlclient is an interface to the popular MySQL database server for Python.
+ .
+ This is a fork of MySQLdb. It add Python 3.3 support and merges some pull
+ requests.
+ .
+ This package contains modules for all Python 3.x versions supported in
+ Debian built for Python debug interpreter.
Modified: packages/python-mysqldb/trunk/debian/copyright
===================================================================
--- packages/python-mysqldb/trunk/debian/copyright 2015-07-29 07:04:54 UTC (rev 33525)
+++ packages/python-mysqldb/trunk/debian/copyright 2015-07-29 16:13:53 UTC (rev 33526)
@@ -1,11 +1,11 @@
This package was debianized by Gregor Hoffleit <flight at debian.org> on
Wed, 15 Sep 1999 14:07:55 +0200.
-It was downloaded from http://sourceforge.net/projects/mysql-python
+It was downloaded from https://pypi.python.org/pypi/mysqlclient/1.3.4
-Upstream Author: Andy Dustman <andy at dustman.net>
+Upstream Author: INADA Naoki
-Copyright © 2002-2007 Andy Dustman <andy at dustman.net>
+Copyright © 2002-2012 Andy Dustman <andy at dustman.net>
License:
Modified: packages/python-mysqldb/trunk/debian/docs
===================================================================
--- packages/python-mysqldb/trunk/debian/docs 2015-07-29 07:04:54 UTC (rev 33525)
+++ packages/python-mysqldb/trunk/debian/docs 2015-07-29 16:13:53 UTC (rev 33526)
@@ -1,4 +1,4 @@
HISTORY
-README
-doc/FAQ.txt
-doc/MySQLdb.txt
+README.md
+doc/FAQ.rst
+doc/MySQLdb.rst
Modified: packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.patch
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.patch 2015-07-29 07:04:54 UTC (rev 33525)
+++ packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.patch 2015-07-29 16:13:53 UTC (rev 33526)
@@ -2,17 +2,18 @@
Author: Jonas Meurer <jonas at freesources.org>
Last-Update: 2007-04-23
---- a/MySQLdb/converters.py
-+++ b/MySQLdb/converters.py
-@@ -163,5 +163,10 @@
+Index: python-mysqldb/MySQLdb/converters.py
+===================================================================
+--- python-mysqldb.orig/MySQLdb/converters.py 2014-11-18 14:57:31.000000000 +1100
++++ python-mysqldb/MySQLdb/converters.py 2014-11-18 14:59:31.449268839 +1100
+@@ -147,3 +147,10 @@
+ conversions[FIELD_TYPE.NEWDECIMAL] = Decimal
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.patch
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.patch 2015-07-29 07:04:54 UTC (rev 33525)
+++ packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.patch 2015-07-29 16:13:53 UTC (rev 33526)
@@ -2,9 +2,11 @@
Author: Simeon Anastasov <simeon.anastasov at gmail.com>
Last-Update: 2007-05-24
---- a/MySQLdb/converters.py
-+++ b/MySQLdb/converters.py
-@@ -46,7 +46,8 @@
+Index: python-mysqldb/MySQLdb/converters.py
+===================================================================
+--- python-mysqldb.orig/MySQLdb/converters.py 2014-11-18 14:59:31.449268839 +1100
++++ python-mysqldb/MySQLdb/converters.py 2014-11-18 14:59:43.988981633 +1100
+@@ -54,7 +54,8 @@
def Bool2Str(s, d): return str(int(s))
def Str2Set(s):
Modified: packages/python-mysqldb/trunk/debian/patches/05_ssl.patch
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/05_ssl.patch 2015-07-29 07:04:54 UTC (rev 33525)
+++ packages/python-mysqldb/trunk/debian/patches/05_ssl.patch 2015-07-29 16:13:53 UTC (rev 33526)
@@ -4,12 +4,12 @@
Reviewed-by: Eldon Koyle <ekoyle at gmail.com>
Last-Update: 2013-03-11
-Index: python-mysqldb-argh/_mysql.c
+Index: python-mysqldb/_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
+--- python-mysqldb.orig/_mysql.c 2014-11-18 14:56:48.676997055 +1100
++++ python-mysqldb/_mysql.c 2014-11-18 14:59:47.360904402 +1100
+@@ -110,6 +110,10 @@
+ #define HAVE_MYSQL_OPT_TIMEOUTS 1
#endif
+#if MYSQL_VERSION_ID >= 50500
Modified: packages/python-mysqldb/trunk/debian/patches/series
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/series 2015-07-29 07:04:54 UTC (rev 33525)
+++ packages/python-mysqldb/trunk/debian/patches/series 2015-07-29 16:13:53 UTC (rev 33526)
@@ -1,3 +0,0 @@
-01_converters_boolean.patch
-03_converters_set2str.patch
-05_ssl.patch
Modified: packages/python-mysqldb/trunk/debian/rules
===================================================================
--- packages/python-mysqldb/trunk/debian/rules 2015-07-29 07:04:54 UTC (rev 33525)
+++ packages/python-mysqldb/trunk/debian/rules 2015-07-29 16:13:53 UTC (rev 33526)
@@ -9,54 +9,7 @@
export mysqlclient=mysqlclient_r
export mysqloptlibs=ssl crypto
-PYVERS=$(shell pyversions -vs)
+export PYBUILD_NAME=mysqldb
-clean: $(PYVERS:%=clean-python%)
-clean-python%:
- dh_testdir
- python$* setup.py clean
- find . -name "*.py[co]" -exec rm -f {} \;
- dh_testroot
- rm -fr build build-python$* MySQL_python.egg-info/PKG-INFO
- dh_clean
-
-build: $(PYVERS:%=build-python%)
- touch $@
-build-python%:
- python$* setup.py build
- python$*-dbg setup.py build
- touch $@
-
-install: build $(PYVERS:%=install-python%)
-install-python%:
- dh_testdir
- dh_testroot
- dh_installdirs
- python$* setup.py install --install-layout=deb --root $(CURDIR)/debian/python-mysqldb
- python$*-dbg setup.py install --install-layout=deb --root $(CURDIR)/debian/python-mysqldb-dbg
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs HISTORY
- rm -rf debian/python-mysqldb-dbg/usr/share/doc/python-mysqldb-dbg
- ln -s python-mysqldb debian/python-mysqldb-dbg/usr/share/doc/python-mysqldb-dbg
- dh_link
- dh_strip -ppython-mysqldb --dbg-package=python-mysqldb-dbg
- dh_compress
- dh_fixperms
- dh_python2
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+ dh $@ --with python2,python3 --buildsystem=pybuild
More information about the Python-modules-commits
mailing list