[Python-modules-commits] r18975 - in packages/python-mysqldb/trunk/debian (15 files)
mejo at users.alioth.debian.org
mejo at users.alioth.debian.org
Tue Oct 18 10:06:11 UTC 2011
Date: Tuesday, October 18, 2011 @ 10:06:10
Author: mejo
Revision: 18975
new upstream, migrate to new source format and to dh_python2
Added:
packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.patch
(from rev 18974, packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch)
packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.patch
(from rev 18974, packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch)
packages/python-mysqldb/trunk/debian/patches/series
(from rev 18974, packages/python-mysqldb/trunk/debian/patches/00list)
Modified:
packages/python-mysqldb/trunk/debian/changelog
packages/python-mysqldb/trunk/debian/control
packages/python-mysqldb/trunk/debian/rules
packages/python-mysqldb/trunk/debian/source/format
Deleted:
packages/python-mysqldb/trunk/debian/patches/00dpatch.conf
packages/python-mysqldb/trunk/debian/patches/00list
packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch
packages/python-mysqldb/trunk/debian/patches/02_python_2.6.dpatch
packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch
packages/python-mysqldb/trunk/debian/patches/04_disable_ez_setup.dpatch
packages/python-mysqldb/trunk/debian/patches/05_null-connection-guard.dpatch
packages/python-mysqldb/trunk/debian/patches/06_mysql_connect_port.dpatch
Modified: packages/python-mysqldb/trunk/debian/changelog
===================================================================
--- packages/python-mysqldb/trunk/debian/changelog 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/changelog 2011-10-18 10:06:10 UTC (rev 18975)
@@ -1,3 +1,41 @@
+python-mysqldb (1.2.3-1) unstable; urgency=low
+
+ * 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.
+
+ -- Jonas Meurer <mejo at debian.org> Tue, 18 Oct 2011 12:02:43 +0200
+
+python-mysqldb (1.2.3-0ubuntu1) oneiric; urgency=low
+
+ * New upstream version. (Closes: #609906)
+ * Drop 02_python_2.6, applied upstream.
+ * Drop 04_disable_ez_setup.dpatch, applied upstream.
+ * Drop 05_null-connection-guard.dpatch per upstream recommendation.
+ * Drop 06_mysql_connect_port.dpatch, applied upstream.
+ * debian/rules: Don't install upstream changelog (not in package anymore).
+
+ -- Mario Limonciello <Mario_Limonciello at Dell.com> Thu, 14 Jul 2011 01:41:37 -0500
+
+python-mysqldb (1.2.2-10build2) natty; urgency=low
+
+ * Rebuild to add support for python 2.7.
+
+ -- Matthias Klose <doko at ubuntu.com> Fri, 03 Dec 2010 00:11:26 +0000
+
+python-mysqldb (1.2.2-10build1) lucid; urgency=low
+
+ * Rebuild dropping the extension for python2.5.
+
+ -- Matthias Klose <doko at ubuntu.com> Mon, 01 Feb 2010 22:05:30 +0000
+
python-mysqldb (1.2.2-10) unstable; urgency=low
[ Jonas Meurer ]
Modified: packages/python-mysqldb/trunk/debian/control
===================================================================
--- packages/python-mysqldb/trunk/debian/control 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/control 2011-10-18 10:06:10 UTC (rev 18975)
@@ -3,11 +3,12 @@
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), dpatch, python-all-dev (>= 2.4.4-3), python-all-dbg, libmysqlclient-dev, zlib1g-dev, python-support (>= 0.6), python-setuptools
-XS-Python-Version: all
+Build-Depends: debhelper (>= 6.0.0), python-all-dev (>= 2.6.6-3~),
+ python-all-dbg, libmysqlclient-dev, zlib1g-dev,
+ python-setuptools
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-mysqldb/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-mysqldb/trunk/
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
Homepage: http://mysql-python.sourceforge.net/
Package: python-mysqldb
Deleted: packages/python-mysqldb/trunk/debian/patches/00dpatch.conf
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/00dpatch.conf 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/patches/00dpatch.conf 2011-10-18 10:06:10 UTC (rev 18975)
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../tarballs
Deleted: packages/python-mysqldb/trunk/debian/patches/00list
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/00list 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/patches/00list 2011-10-18 10:06:10 UTC (rev 18975)
@@ -1,6 +0,0 @@
-01_converters_boolean
-02_python_2.6.dpatch
-03_converters_set2str
-04_disable_ez_setup
-05_null-connection-guard
-06_mysql_connect_port
Deleted: packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch 2011-10-18 10:06:10 UTC (rev 18975)
@@ -1,23 +0,0 @@
-#! /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/MySQLdb/converters.py
-+++ python-mysqldb-1.2.2/MySQLdb/converters.py
-@@ -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
-
Copied: packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.patch (from rev 18974, packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.dpatch)
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.patch (rev 0)
+++ packages/python-mysqldb/trunk/debian/patches/01_converters_boolean.patch 2011-10-18 10:06:10 UTC (rev 18975)
@@ -0,0 +1,18 @@
+Description: take boolean into account at converters.py
+Author: Jonas Meurer <jonas at freesources.org>
+Last-Update: 2007-04-23
+
+--- a/MySQLdb/converters.py
++++ b/MySQLdb/converters.py
+@@ -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
+
Deleted: packages/python-mysqldb/trunk/debian/patches/02_python_2.6.dpatch
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/02_python_2.6.dpatch 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/patches/02_python_2.6.dpatch 2011-10-18 10:06:10 UTC (rev 18975)
@@ -1,107 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_python_2.6.dpatch by <superm1 at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Cherry pick upstream 554 & 603 to fix python 2.6 support
-
- at DPATCH@
---- a/MySQLdb/__init__.py
-+++ b/MySQLdb/__init__.py
-@@ -19,8 +19,8 @@
- import _mysql
-
- if version_info != _mysql.version_info:
-- raise ImportError, "this is MySQLdb version %s, but _mysql is version %r" %\
-- (version_info, _mysql.version_info)
-+ raise ImportError("this is MySQLdb version %s, but _mysql is version %r" %
-+ (version_info, _mysql.version_info))
-
- threadsafety = 1
- apilevel = "2.0"
-@@ -31,25 +31,20 @@
- from MySQLdb.times import Date, Time, Timestamp, \
- DateFromTicks, TimeFromTicks, TimestampFromTicks
-
--from sets import ImmutableSet
--class DBAPISet(ImmutableSet):
-+try:
-+ frozenset
-+except NameError:
-+ from sets import ImmutableSet as frozenset
-+
-+class DBAPISet(frozenset):
-
- """A special type of set for which A == x is true if A is a
- DBAPISet and x is a member of that set."""
-
-- def __ne__(self, other):
-- from sets import BaseSet
-- if isinstance(other, BaseSet):
-- return super(DBAPISet.self).__ne__(self, other)
-- else:
-- return other not in self
--
- def __eq__(self, other):
-- from sets import BaseSet
-- if isinstance(other, BaseSet):
-- return super(DBAPISet, self).__eq__(self, other)
-- else:
-- return other in self
-+ if isinstance(other, DBAPISet):
-+ return not self.difference(other)
-+ return other in self
-
-
- STRING = DBAPISet([FIELD_TYPE.ENUM, FIELD_TYPE.STRING,
-@@ -65,6 +60,18 @@
- DATETIME = TIMESTAMP
- ROWID = DBAPISet()
-
-+def test_DBAPISet_set_equality():
-+ assert STRING == STRING
-+
-+def test_DBAPISet_set_inequality():
-+ assert STRING != NUMBER
-+
-+def test_DBAPISet_set_equality_membership():
-+ assert FIELD_TYPE.VAR_STRING == STRING
-+
-+def test_DBAPISet_set_inequality_membership():
-+ assert FIELD_TYPE.DATE != STRING
-+
- def Binary(x):
- return str(x)
-
---- a/MySQLdb/converters.py
-+++ b/MySQLdb/converters.py
-@@ -34,15 +34,19 @@
-
- from _mysql import string_literal, escape_sequence, escape_dict, escape, NULL
- from constants import FIELD_TYPE, FLAG
--from sets import BaseSet, Set
- from times import *
- import types
- import array
-
-+try:
-+ set
-+except NameError:
-+ from sets import Set as set
-+
- def Bool2Str(s, d): return str(int(s))
-
- def Str2Set(s):
-- return Set([ i for i in s.split(',') if i ])
-+ return set([ i for i in s.split(',') if i ])
-
- def Set2Str(s, d):
- return string_literal(','.join(s), d)
-@@ -131,7 +130,7 @@
- types.BooleanType: Bool2Str,
- DateTimeType: DateTime2literal,
- DateTimeDeltaType: DateTimeDelta2literal,
-- Set: Set2Str,
-+ set: Set2Str,
- FIELD_TYPE.TINY: int,
- FIELD_TYPE.SHORT: int,
- FIELD_TYPE.LONG: long,
Deleted: packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch 2011-10-18 10:06:10 UTC (rev 18975)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 03_converters_set2str.dpatch by Simeon Anastasov <simeon.anastasov at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix set2str
-
- at DPATCH@
-
---- python-mysqldb-1.2.2/MySQLdb/converters.py
-+++ python-mysqldb-1.2.2/MySQLdb/converters.py
-@@ -46,7 +46,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 map(str, tuple(values))
-
- def Set2Str(s, d):
- return string_literal(','.join(s), d)
Copied: packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.patch (from rev 18974, packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch)
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.patch (rev 0)
+++ packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.patch 2011-10-18 10:06:10 UTC (rev 18975)
@@ -0,0 +1,16 @@
+Description: fix set2str
+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 @@
+ 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 map(str, tuple(values))
+
+ def Set2Str(s, d):
+ return string_literal(','.join(s), d)
Deleted: packages/python-mysqldb/trunk/debian/patches/04_disable_ez_setup.dpatch
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/04_disable_ez_setup.dpatch 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/patches/04_disable_ez_setup.dpatch 2011-10-18 10:06:10 UTC (rev 18975)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_disable_ez_setup.dpatch by Piotr Ożarowski <piotr at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Required setuptools version will always be installed (see Build-Depends)
-## DP: so there's no need to double check it
-
- at DPATCH@
-diff -urNad python-mysqldb-1.2.2~/setup.py python-mysqldb-1.2.2/setup.py
---- python-mysqldb-1.2.2~/setup.py 2007-02-25 04:37:12.000000000 +0100
-+++ python-mysqldb-1.2.2/setup.py 2007-07-03 15:14:49.000000000 +0200
-@@ -2,7 +2,6 @@
-
- import os
- import sys
--import ez_setup; ez_setup.use_setuptools()
- from setuptools import setup, Extension
-
- if sys.version_info < (2, 3):
Deleted: packages/python-mysqldb/trunk/debian/patches/05_null-connection-guard.dpatch
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/05_null-connection-guard.dpatch 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/patches/05_null-connection-guard.dpatch 2011-10-18 10:06:10 UTC (rev 18975)
@@ -1,62 +0,0 @@
-#! /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) {
Deleted: packages/python-mysqldb/trunk/debian/patches/06_mysql_connect_port.dpatch
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/06_mysql_connect_port.dpatch 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/patches/06_mysql_connect_port.dpatch 2011-10-18 10:06:10 UTC (rev 18975)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_mysql_connect_port.dpatch by Monty Taylor <monty at inaugust.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allows port settings in my.cnf files to work properly.
-## DP: Patch from https://sourceforge.net/tracker/?func=detail&aid=1761612&group_id=22307&atid=374932
-
- at DPATCH@
-diff -urNad python-mysqldb-1.2.2~/_mysql.c python-mysqldb-1.2.2/_mysql.c
---- python-mysqldb-1.2.2~/_mysql.c 2008-02-27 12:57:51.351846703 -0800
-+++ python-mysqldb-1.2.2/_mysql.c 2008-02-27 12:58:10.404183220 -0800
-@@ -481,7 +481,7 @@
- #endif
- char *host = NULL, *user = NULL, *passwd = NULL,
- *db = NULL, *unix_socket = NULL;
-- uint port = MYSQL_PORT;
-+ uint port = 0;
- uint client_flag = 0;
- static char *kwlist[] = { "host", "user", "passwd", "db", "port",
- "unix_socket", "conv",
Copied: packages/python-mysqldb/trunk/debian/patches/series (from rev 18974, packages/python-mysqldb/trunk/debian/patches/00list)
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/series (rev 0)
+++ packages/python-mysqldb/trunk/debian/patches/series 2011-10-18 10:06:10 UTC (rev 18975)
@@ -0,0 +1,2 @@
+01_converters_boolean.patch
+03_converters_set2str.patch
Modified: packages/python-mysqldb/trunk/debian/rules
===================================================================
--- packages/python-mysqldb/trunk/debian/rules 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/rules 2011-10-18 10:06:10 UTC (rev 18975)
@@ -13,9 +13,6 @@
py_libdir_sh = $(py_libdir)
endif
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-
# export some vars
export mysqlversion=5.1
export mysqlclient=mysqlclient_r
@@ -24,7 +21,7 @@
PYVERS=$(shell pyversions -r)
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
set -e; \
@@ -37,7 +34,7 @@
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
@echo "--- Cleaning"
@@ -73,13 +70,12 @@
# Build architecture-dependent files here.
binary-arch: build install
dh_installdocs
- dh_installchangelogs ChangeLog
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_strip -ppython-mysqldb --dbg-package=python-mysqldb-dbg
dh_compress
dh_fixperms
- dh_pysupport
+ dh_python2
dh_installdeb
dh_shlibdeps
dh_gencontrol
@@ -88,4 +84,4 @@
binary: binary-indep binary-arch
-.PHONY: build clean install binary-indep binary-arch binary patch unpatch
+.PHONY: build clean install binary-indep binary-arch binary
Modified: packages/python-mysqldb/trunk/debian/source/format
===================================================================
--- packages/python-mysqldb/trunk/debian/source/format 2011-10-17 22:10:55 UTC (rev 18974)
+++ packages/python-mysqldb/trunk/debian/source/format 2011-10-18 10:06:10 UTC (rev 18975)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-modules-commits
mailing list