[Python-modules-commits] r1045 - in /packages/python-mysqldb/trunk/debian: changelog patches/00list patches/03_converters_set2str.dpatch rules

[mejo at users.alioth.debian.org]

Author: mejo
Date: Sat Jun 24 15:00:22 2006
New Revision: 1045

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1045
Log:
add 03_converters_set2str.dpatch and other minor fixes

Added:
    packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch   (with props)
Modified:
    packages/python-mysqldb/trunk/debian/changelog
    packages/python-mysqldb/trunk/debian/patches/00list
    packages/python-mysqldb/trunk/debian/rules

Modified: packages/python-mysqldb/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/changelog?rev=1045&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/changelog (original)
+++ packages/python-mysqldb/trunk/debian/changelog Sat Jun 24 15:00:22 2006
@@ -1,3 +1,16 @@
+python-mysqldb (1.2.1-p2-3) unstable; urgency=low
+
+  [ Jonas Meurer ]
+  * bump mysqlversion to 5.0.22
+  * move DH_COMPAT to debian/compat
+  * add FAQ.txt to dh_installdoc
+  * add 03_converters_set2str.dpatch, fixes handling of MySQL SETs,
+    thanks to Simeon Anastasov <simeon at know-it.net> for the patch.
+  * remove -a from all dh_* calls in debian/rules. there is only one package
+    left anyway, so there is no need for the arch-dependent option.
+
+ -- Jonas Meurer <mejo at debian.org>  Sat, 24 Jun 2006 16:58:32 +0200
+
 python-mysqldb (1.2.1-p2-2) unstable; urgency=low
 
   * Updated for the new python policy. Closes: #373329

Modified: packages/python-mysqldb/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/patches/00list?rev=1045&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/00list (original)
+++ packages/python-mysqldb/trunk/debian/patches/00list Sat Jun 24 15:00:22 2006
@@ -1,2 +1,3 @@
 01_converters_boolean
 02_reconnect
+03_converters_set2str

Added: packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch?rev=1045&op=file
==============================================================================
--- packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch (added)
+++ packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch Sat Jun 24 15:00:22 2006
@@ -1,0 +1,33 @@
+#! /bin/sh -e
+# 03_converters_set2str.dpatch by Simeon Anastasov
+#
+# All lines beginning with `## DP:' are a description of the patch.
+## DP: fix set2str
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- MySQLdb.orig/converters.py	2006-06-16 14:19:08.000000000 +0200
++++ MySQLdb/converters.py	2006-06-16 14:39:55.000000000 +0200
+@@ -42,7 +42,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 apply(str, tuple(values))
+ 
+ def Set2Str(s, d):
+     return string_literal(','.join(s), d)

Propchange: packages/python-mysqldb/trunk/debian/patches/03_converters_set2str.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/python-mysqldb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-mysqldb/trunk/debian/rules?rev=1045&op=diff
==============================================================================
--- packages/python-mysqldb/trunk/debian/rules (original)
+++ packages/python-mysqldb/trunk/debian/rules Sat Jun 24 15:00:22 2006
@@ -1,19 +1,14 @@
 #!/usr/bin/make -f
 #-*- makefile -*-
 
-export PACKAGE=python-mysqldb
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=5
 
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
 # export some vars
-export mysqlversion=5.0.19
+export mysqlversion=5.0.22
 export mysqlclient=mysqlclient_r
 export mysqloptlibs=ssl crypto
 
@@ -62,18 +57,18 @@
 
 # Build architecture-dependent files here.
 binary-arch: install
-	dh_installdocs -a -A README doc/MySQLdb.txt
-	dh_installchangelogs -a ChangeLog
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_pycentral -a
-	dh_python -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh_installdocs -A README doc/MySQLdb.txt doc/FAQ.txt
+	dh_installchangelogs ChangeLog
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_pycentral
+	dh_python
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 	
 binary: binary-indep binary-arch