[tryton-debian-vcs] python-sql branch debian updated. debian/0.2-2-5-g1fee394

[Mathias Behrle]

The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/python-sql.git;a=commitdiff;h=debian/0.2-2-5-g1fee394

commit 1fee3949a509b0eab991ed4304a5763c058d6ef2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Jan 28 20:11:06 2014 +0100

    Adding gpg verification for uscan.

diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..a610508
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/upstream/signing-key.pgp
diff --git a/debian/upstream/signing-key.pgp b/debian/upstream/signing-key.pgp
new file mode 100644
index 0000000..e335787
Binary files /dev/null and b/debian/upstream/signing-key.pgp differ
diff --git a/debian/watch b/debian/watch
index 4e32ade..ad1c50a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-https://pypi.python.org/packages/source/p/python-sql/python-sql-(\d+.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) 
+opts=pgpsigurlmangle=s/$/.asc/ https://pypi.python.org/packages/source/p/python-sql/python-sql-(\d+.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 8bba64746a1267710a95b5d7aa2e5f4d23540035
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Jan 28 20:08:00 2014 +0100

    Simplifying rules file by using PYBUILD_NAME.

diff --git a/debian/rules b/debian/rules
index 3a67b8d..52fe3fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-PACKAGE_NAME := python_sql
-export PYBUILD_DESTDIR_python2=debian/python-sql/
-export PYBUILD_DESTDIR_python3=debian/python3-sql/
+export PYBUILD_NAME := sql
 
 %:
 	dh ${@} --with python2,python3 --buildsystem=pybuild
commit fcf5e505baf63a3fab846307333a29b7ab90fd2b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Jan 28 19:47:54 2014 +0100

    Backporting correct fix for #725788.

diff --git a/debian/patches/series b/debian/patches/series
index 951b4e2..41e7474 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_slots_shadows_class_variable.patch
+setup_python3_encoding.patch
diff --git a/debian/patches/setup_python3_encoding.patch b/debian/patches/setup_python3_encoding.patch
new file mode 100644
index 0000000..3effaf8
--- /dev/null
+++ b/debian/patches/setup_python3_encoding.patch
@@ -0,0 +1,23 @@
+Description: Backport of encoding fix
+This patch solves the encoding problem, when reading files with python3
+in a basic POSIX environment (#725788).
+
+Origin: upstream, https://code.google.com/p/python-sql/source/detail?r=fa73dd3e45dda96e88a1b266018ecfe3819c758c
+Bug-Debian: http://bugs.debian.org/725788
+
+--- python-sql.orig/setup.py	2014-01-28 18:50:34.092730374 +0100
++++ python-sql/setup.py	2014-01-28 18:57:36.000000000 +0100
+@@ -30,10 +30,12 @@
+ from setuptools import setup, find_packages
+ import os
+ import re
++import codecs
+ 
+ 
+ def read(fname):
+-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
++    return codecs.open(
++        os.path.join(os.path.dirname(__file__), fname), 'r', 'utf-8').read()
+ 
+ 
+ def get_version():
diff --git a/debian/rules b/debian/rules
index 81f18dc..3a67b8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-# needed for pbuilder
-export LC_ALL=C.UTF-8
-
 PACKAGE_NAME := python_sql
 export PYBUILD_DESTDIR_python2=debian/python-sql/
 export PYBUILD_DESTDIR_python3=debian/python3-sql/
commit 1ec6c681900df5215660d3bca11bf476eaab5d8f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jan 27 20:05:46 2014 +0100

    Removing debian/source/options, we are building with dpkg defaults.

diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index 22a4de9..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1,2 +0,0 @@
-compression = xz
-compression-level = 9
-- 
python-sql