[Python-modules-commits] [python-llfuse] 03/08: merge patched into master

[Nikolaus Rath]

This is an automated email from the git hooks/post-receive script.

nikratio-guest pushed a commit to branch master
in repository python-llfuse.

commit 12e2cfb6fd9ab9851a3b82bdcb60cad5ae4f5dbf
Merge: cceaa78 60a9bec
Author: Nikolaus Rath <Nikolaus at rath.org>
Date:   Mon Feb 1 10:16:51 2016 -0800

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0004-Use-cython3-instead-of-cython.patch       | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  4 +--
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 8c45446,0000000..9dd5b25
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 8d0b3c6a5ec067e7ca8852ab8e38aab63d3218fc
- 8d0b3c6a5ec067e7ca8852ab8e38aab63d3218fc
++60a9beccd0b6b77f7019e034b003495c7cfdb792
++60a9beccd0b6b77f7019e034b003495c7cfdb792
 +1de78f8c7c630dbc2338f5a51ed35328e2f79449
 +1de78f8c7c630dbc2338f5a51ed35328e2f79449
 +python-llfuse_0.42.1+dfsg.orig.tar.gz
 +23b9a0256f43de3fc8c232ffebfcbde852aee315
 +254890
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Use-cython3-instead-of-cython.patch
index 0000000,0000000..535bf89
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Use-cython3-instead-of-cython.patch
@@@ -1,0 -1,0 +1,34 @@@
++From 60a9beccd0b6b77f7019e034b003495c7cfdb792 Mon Sep 17 00:00:00 2001
++From: Nikolaus Rath <Nikolaus at rath.org>
++Date: Mon, 1 Feb 2016 10:15:47 -0800
++Subject: Use 'cython3' instead of 'cython'
++
++In Debian, the 'cython' command is provided by the Python 2.x version
++of Python. While both versions work, it's nicer to use the more recent
++version.
++---
++ setup.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index d028..c53d 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -211,7 +211,7 @@ class build_cython(setuptools.Command):
++ 
++     def run(self):
++         try:
++-            version = subprocess.check_output(['cython', '--version'],
+++            version = subprocess.check_output(['cython3', '--version'],
++                                               universal_newlines=True,
++                                               stderr=subprocess.STDOUT)
++         except OSError:
++@@ -221,7 +221,7 @@ class build_cython(setuptools.Command):
++         if not hit or LooseVersion(hit.group(1)) < "0.24":
++             raise SystemExit('Need Cython 0.24 or newer, found ' + version)
++ 
++-        cmd = ['cython', '-Wextra', '--force', '-3', '--fast-fail',
+++        cmd = ['cython3', '-Wextra', '--force', '-3', '--fast-fail',
++                '--directive', 'embedsignature=True', '--include-dir',
++                os.path.join(basedir, 'Include'), '--verbose' ]
++         if DEVELOPER_MODE:
diff --cc debian/patches/series
index 4601679,0000000..60b7fa9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +use-local-intersphinx-inventory.patch
 +force_xattr_api.diff
 +mips_dev_t.diff
++0004-Use-cython3-instead-of-cython.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-llfuse.git