[Python-modules-commits] r30818 - in packages/pyacoustid/trunk/debian (8 files)

[laarmen-guest at users.alioth.debian.org]

    Date: Monday, September 29, 2014 @ 08:57:16
  Author: laarmen-guest
Revision: 30818

* Add a Python 3 package:
  + Transition to pybuild
  + Add a patch to setup.py to handle non-UTF-8 locales

Added:
  packages/pyacoustid/trunk/debian/clean
  packages/pyacoustid/trunk/debian/patches/
  packages/pyacoustid/trunk/debian/patches/series
  packages/pyacoustid/trunk/debian/patches/setup_use_utf8
Modified:
  packages/pyacoustid/trunk/debian/changelog
  packages/pyacoustid/trunk/debian/control
  packages/pyacoustid/trunk/debian/copyright
  packages/pyacoustid/trunk/debian/rules

Modified: packages/pyacoustid/trunk/debian/changelog
===================================================================
--- packages/pyacoustid/trunk/debian/changelog	2014-09-29 07:33:43 UTC (rev 30817)
+++ packages/pyacoustid/trunk/debian/changelog	2014-09-29 08:57:16 UTC (rev 30818)
@@ -3,6 +3,9 @@
   * New upstream release
   * Bump Standards version to 3.9.6 (no changes needed)
   * Update copyright years
+  * Add a Python 3 package:
+    + Transition to pybuild
+    + Add a patch to setup.py to handle non-UTF-8 locales
 
  -- Simon Chopin <chopin.simon at gmail.com>  Sun, 28 Sep 2014 21:21:04 +0200
 

Added: packages/pyacoustid/trunk/debian/clean
===================================================================
--- packages/pyacoustid/trunk/debian/clean	                        (rev 0)
+++ packages/pyacoustid/trunk/debian/clean	2014-09-29 08:57:16 UTC (rev 30818)
@@ -0,0 +1 @@
+pyacoustid.egg-info/*

Modified: packages/pyacoustid/trunk/debian/control
===================================================================
--- packages/pyacoustid/trunk/debian/control	2014-09-29 07:33:43 UTC (rev 30817)
+++ packages/pyacoustid/trunk/debian/control	2014-09-29 08:57:16 UTC (rev 30818)
@@ -5,7 +5,10 @@
 Uploaders: Simon Chopin <chopin.simon at gmail.com>
 Build-Depends:
  debhelper (>= 8.1),
+ dh-python,
  python-all (>= 2.6.6-3~),
+ python3-all,
+ python3-setuptools,
  python-setuptools
 Standards-Version: 3.9.6
 Homepage: https://github.com/sampsyo/pyacoustid
@@ -25,3 +28,17 @@
  Acoustid is a web service offering high quality acoustic fingerprinting
  system using the Chromaprint C library. This package provides Python
  bindings for the library as well as an interface to the web service.
+
+Package: python3-acoustid
+Architecture: all
+Depends:
+ libchromaprint0,
+ python3-audioread,
+ ${misc:Depends},
+ ${python3:Depends}
+Description: Acoustid interface implementation and Chromaprint bindings (Python 3)
+ Acoustid is a web service offering high quality acoustic fingerprinting
+ system using the Chromaprint C library. This package provides Python
+ bindings for the library as well as an interface to the web service.
+ .
+ This package provides the Python 3 module.

Modified: packages/pyacoustid/trunk/debian/copyright
===================================================================
--- packages/pyacoustid/trunk/debian/copyright	2014-09-29 07:33:43 UTC (rev 30817)
+++ packages/pyacoustid/trunk/debian/copyright	2014-09-29 08:57:16 UTC (rev 30818)
@@ -10,6 +10,9 @@
 Copyright: 2011 Lukáš Lalinský <lalinsky at gmail.com>
            2011 Adrian Sampson <adrian at radbox.org>
 License: Expat
+Files: fpcalc.py
+Copyright: 2012 Lukáš Lalinský <lalinsky at gmail.com>
+License: Expat
 
 Files: debian/*
 Copyright: 2011-2014 Simon Chopin <chopin.simon at gmail.com>

Added: packages/pyacoustid/trunk/debian/patches/series
===================================================================
--- packages/pyacoustid/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyacoustid/trunk/debian/patches/series	2014-09-29 08:57:16 UTC (rev 30818)
@@ -0,0 +1 @@
+setup_use_utf8

Added: packages/pyacoustid/trunk/debian/patches/setup_use_utf8
===================================================================
--- packages/pyacoustid/trunk/debian/patches/setup_use_utf8	                        (rev 0)
+++ packages/pyacoustid/trunk/debian/patches/setup_use_utf8	2014-09-29 08:57:16 UTC (rev 30818)
@@ -0,0 +1,20 @@
+Description: Explicitly use UTF-8 when opening the README in setup.py
+ The explicit use of utf8 was only done for Python2, this patch forces it
+ for Python3 as well.
+Author: Simon Chopin <chopin.simon at gmail.com>
+Forwarded: https://github.com/sampsyo/pyacoustid/pull/25
+Last-Update: 2014-09-29
+
+--- pyacoustid-1.1.0.orig/setup.py
++++ pyacoustid-1.1.0/setup.py
+@@ -20,7 +20,9 @@ def _read(fn):
+     path = os.path.join(os.path.dirname(__file__), fn)
+     data = open(path).read()
+     if sys.version_info[0] < 3:
+-        data = data.decode('utf8')
++        data = open(path).read().decode('utf8')
++    else:
++        data = open(path, encoding='utf8').read()
+     # Special case some Unicode characters; PyPI seems to only like ASCII.
+     data = data.replace(u'\xe1', u'a')
+     data = data.replace(u'\u0161', u's')

Modified: packages/pyacoustid/trunk/debian/rules
===================================================================
--- packages/pyacoustid/trunk/debian/rules	2014-09-29 07:33:43 UTC (rev 30817)
+++ packages/pyacoustid/trunk/debian/rules	2014-09-29 08:57:16 UTC (rev 30818)
@@ -3,9 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-%:
-	dh $@ --with python2
+export PYBUILD_NAME=acoustid
+export PYBUILD_DISABLE=clean
 
-override_dh_clean:
-	dh_clean
-	rm pyacoustid.egg-info -rf	# It is automatically updated by setuptools.
+%:
+	dh $@ --with python2,python3 --buildsystem=pybuild