lp://staging/~thedac/ubuntu/wily/python-mysqldb/debian-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu/wily/python-mysqldb

Ubuntu branches: Pending requested 2015-08-18

Diff: 14723 lines (+3853/-9113)

74 files modified

.cvsignore (+0/-6)
.pc/.quilt_patches (+0/-1)
.pc/.quilt_series (+0/-1)
.pc/.version (+0/-1)
.pc/01_converters_boolean.patch/MySQLdb/converters.py (+0/-171)
.pc/03_converters_set2str.patch/MySQLdb/converters.py (+0/-176)
.pc/05_ssl.patch/_mysql.c (+0/-2890)
.pc/06_fix_error_checking.patch/_mysql.c (+0/-2894)
.pc/applied-patches (+0/-4)
GPL-2.0 (+339/-0)
HISTORY (+227/-116)
INSTALL (+253/-0)
MANIFEST.in (+13/-13)
MySQL_python.egg-info/PKG-INFO (+0/-45)
MySQL_python.egg-info/SOURCES.txt (+0/-42)
MySQL_python.egg-info/dependency_links.txt (+0/-1)
MySQL_python.egg-info/top_level.txt (+0/-3)
MySQLdb/.cvsignore (+0/-1)
MySQLdb/__init__.py (+4/-4)
MySQLdb/compat.py (+12/-0)
MySQLdb/connections.py (+95/-41)
MySQLdb/constants/.cvsignore (+0/-1)
MySQLdb/converters.py (+34/-62)
MySQLdb/cursors.py (+90/-34)
MySQLdb/release.py (+3/-3)
MySQLdb/times.py (+42/-13)
PKG-INFO (+17/-12)
README (+0/-253)
README.md (+18/-0)
_mysql.c (+418/-252)
_mysql_exceptions.py (+6/-2)
debian/README.source (+0/-2)
debian/changelog (+40/-3)
debian/compat (+1/-1)
debian/control (+79/-32)
debian/copyright (+36/-28)
debian/docs (+3/-3)
debian/patches/01_converters_boolean.patch (+7/-6)
debian/patches/03_converters_set2str.patch (+5/-3)
debian/patches/05_ssl.patch (+5/-5)
debian/patches/06_fix_error_checking.patch (+0/-18)
debian/patches/series (+0/-1)
debian/rules (+4/-51)
doc/.cvsignore (+0/-2)
doc/FAQ.rst (+143/-0)
doc/FAQ.txt (+0/-143)
doc/MySQLdb.constants.rst (+59/-0)
doc/MySQLdb.rst (+50/-0)
doc/MySQLdb.txt (+0/-718)
doc/_mysql.rst (+7/-0)
doc/_mysql_exceptions.rst (+7/-0)
doc/conf.py (+242/-0)
doc/index.rst (+24/-0)
doc/modules.rst (+7/-0)
doc/user_guide.rst (+718/-0)
ez_setup.py (+0/-284)
metadata.cfg (+18/-10)
mysqlclient.egg-info/PKG-INFO (+50/-0)
mysqlclient.egg-info/SOURCES.txt (+47/-0)
mysqlclient.egg-info/dependency_links.txt (+1/-0)
mysqlclient.egg-info/top_level.txt (+3/-0)
pymemcompat.h (+0/-87)
setup.cfg (+4/-4)
setup.py (+10/-7)
setup_common.py (+8/-3)
setup_posix.py (+11/-6)
setup_windows.py (+15/-11)
site.cfg (+3/-4)
tests/capabilities.py (+281/-289)
tests/configdb.py (+25/-0)
tests/dbapi20.py (+50/-50)
tests/test_MySQLdb_capabilities.py (+111/-93)
tests/test_MySQLdb_dbapi20.py (+204/-205)
tests/test_MySQLdb_nonstandard.py (+4/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

10. By David Ames on 2015-08-18

* Merge from Debian unstable. Remaining changes:
  - d/p/series: drop 06_fix_error_checking.patch
* Uploading to unstable.
* Added myself as uploader.
* Ran wrap-and-sort -t -a.
* Uploading to unstable.
* Now using debhelper 9.
* Removed version in python-all-dev build-depends.
* Removed useless X-Python3-Version: >= 3.3.
* Rewrote debian/coypright in parseable format 1.0.
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
* Drop obsolete Conflicts/Replaces with python2.3-mysqldb and
  python2.4-mysqldb.
[ Thomas Goirand ]
* The changelog is now again fully encoded in UTF-8 (Closes: 718699).
[ Brian May ]
* Use mysqlclient fork (Closes: #768096).
* Drop old patches.
* Add support for Python 3.3 and greater.
[ Mika Pflüger ]

9. By Chuck Short on 2013-03-11

debian/patches/06_fix_error_checking.patch: Check for error
if mysql_store_result returns NULL, taken from upstream at
https://github.com/farcepest/MySQLdb1/commit/e6d24c358d0c0ad9249044dad09e63e039c527e1

8. By Mika Pflüger <email address hidden> on 2013-03-11

[ 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.

7. By Jonas Meurer <email address hidden> on 2011-10-18

* Merge with package from Ubuntu, thanks to Mario Limonciello.
  (closes: #609906)
* Migrate to new source format "3.0 (quilt)":
  - Migrate patches from dpatch to quilt, drop Build-Depends on dpatch.
  - Add debian/source/format.
* Bump standards-version to 3.9.2, no changes required.
* Migrate from dh_pysupport to dh_python2:
  - Remove Build-Depends on python-support.
  - Bump minimal Build-Depends on python to (>= 2.6.6-3~).
  - Remove XS-Python-Version header from debian/control.
  - Remove obsolete python magic from debian/rules.

6. By Jonas Meurer <email address hidden> on 2009-08-27

[ Jonas Meurer ]
* fix 02_python_2.6.dpatch to use set insteat of Set in conversions{}.
  thanks to Chris Lamp for the bugreport. (closes: #543667)

[ Bernd Zeimetz ]
* Removing myself from uploaders.
* Use py_setup_install_args from /usr/share/python/python.mk

5. By Bernd Zeimetz on 2008-06-16

[ Sandro Tosi ]
* debian/control
  - list items lines in description starts with 2 space, to avoid reformat
    on webpages (Closes: #480341)

[ Bernd Zeimetz ]
* debian/patches/02_reconnect.dpatch:
  - Dropping patch:
    Comment in Storm which explains the problem:

      # Here is another sad story about bad transactional behavior. MySQL
      # offers a feature to automatically reconnect dropped connections.
      # What sounds like a dream, is actually a nightmare for anyone who
      # is dealing with transactions. When a reconnection happens, the
      # currently running transaction is transparently rolled back, and
      # everything that was being done is lost, without notice. Not only
      # that, but the connection may be put back in AUTOCOMMIT mode, even
      # when that's not the default MySQLdb behavior. The MySQL developers
      # quickly understood that this is a terrible idea, and removed the
      # behavior in MySQL 5.0.3. Unfortunately, Debian and Ubuntu still
      # have a patch right now which *reenables* that behavior by default
      # even past version 5.0.3.

4. By Jonas Meurer <email address hidden> on 2006-08-18

[ Jonas Meurer ]
* bump build-depends on libmysqlclient-dev to >= 5.0.24-2. the abi changes
  introduced in mysql 5.0.24-1 are reverted now. I would highly appreciate
  coordination by the mysql maintainers in such a case.
* urgency set to high due to this fact.
* bump build-depends on python-central to >= 0.5 to make lintian happy.

3. By Jonas Meurer <email address hidden> on 2005-05-01

* new upstream release
* readd python 2.2 support to make zope-mysqlda happy again
* remove README.Debian, debian/python-mysqldb.doc-base:
  this version doesn't ship any documentation except MySQLdb.txt
* urgency high to push fix for #306906 into sarge

2. By Gregor Hoffleit on 2001-12-31

* Make the dependency on python2.1-mysqldb more strict.
* Build a package for python2.2 as well.

1. By Gregor Hoffleit on 2001-12-31

Import upstream version 0.9.1