[Python-modules-commits] [python-llfuse] 08/11: merge patched into master
Nikolaus Rath
nikratio-guest at moszumanska.debian.org
Mon Nov 13 12:52:49 UTC 2017
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 714f5b55e1bd46085044adf9bed2399edbafd813
Merge: 8bfc4a3 962f96a
Author: Nikolaus Rath <Nikolaus at rath.org>
Date: Mon Nov 13 12:32:47 2017 +0000
merge patched into master
Changes.rst | 11 +
Include/posix/__init__.pxd | 1 -
Include/posix/stat.pxd | 48 -
Include/pthread.pxd | 1 +
PKG-INFO | 128 +-
README.rst | 2 +-
debian/.git-dpm | 6 +-
debian/changelog | 6 +
...002-Use-cython3-instead-of-cython-command.patch | 8 +-
...tended-attribute-tests-under-GNU-kFreeBSD.patch | 2 +-
...re-exceptions-during-interpreter-shutdown.patch | 2 +-
debian/patches/mips_dev_t.diff | 48 +-
.../patches/use-local-intersphinx-inventory.patch | 2 +-
examples/lltest.py | 8 +-
examples/passthroughfs.py | 8 +-
examples/tmpfs.py | 8 +-
setup.py | 24 +-
src/fuse_api.pxi | 44 +-
src/llfuse.c | 2197 +++++++++++---------
src/llfuse.egg-info/PKG-INFO | 128 +-
src/llfuse.egg-info/SOURCES.txt | 3 +-
src/llfuse.egg-info/requires.txt | 1 +
src/misc.pxi | 16 +-
23 files changed, 1503 insertions(+), 1199 deletions(-)
diff --cc debian/.git-dpm
index 08ff52c,0000000..f04cbb7
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
- 388d91ac97404f71f429c2a78fd676f0bc0a4e77
- 388d91ac97404f71f429c2a78fd676f0bc0a4e77
- 823c9326ae89b37d14c45999f956af6270993162
++962f96aa30c98566c6b214ef31a32268a853824e
++962f96aa30c98566c6b214ef31a32268a853824e
++1921f2f34497ebd923bf57c3c5db71af7ce70668
+1921f2f34497ebd923bf57c3c5db71af7ce70668
+python-llfuse_1.3.2+dfsg.orig.tar.gz
+671f1fbd7195ec5989fa24112e93d5ec0774ef2e
+276475
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index ae612f6,0000000..15dd1d0
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,268 -1,0 +1,274 @@@
++python-llfuse (1.3.2+dfsg-1) UNRELEASED; urgency=medium
++
++ * New upstream version.
++
++ -- Nikolaus Rath <Nikolaus at rath.org> Mon, 13 Nov 2017 12:33:02 +0000
++
+python-llfuse (1.3+dfsg-3) unstable; urgency=medium
+
+ * Updated standards version to 4.1.1
+ * Added support for 'nodoc' in DEB_BUILD_OPTIONS.
+ * python-llfuse-doc is now Multi-Arch: foreign
+ * Fixed mips_dev_t.diff one more time. One mips, dev_t is unsigned
+ and we have to apply the match for mips, not just mips64.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sun, 01 Oct 2017 15:21:45 +0100
+
+python-llfuse (1.3+dfsg-2) unstable; urgency=medium
+
+ * Fix build for mips
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Fri, 15 Sep 2017 14:58:36 +0100
+
+python-llfuse (1.3+dfsg-1) unstable; urgency=medium
+
+ * new upstream release
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Fri, 15 Sep 2017 11:30:10 +0100
+
+python-llfuse (1.2+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sun, 22 Jan 2017 14:42:22 -0800
+
+python-llfuse (1.1.1+dfsg-7) unstable; urgency=medium
+
+ * Fix syntax error introduced with new Debian patch in -6.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sun, 22 Jan 2017 09:54:54 -0800
+
+python-llfuse (1.1.1+dfsg-6) unstable; urgency=medium
+
+ * Ignore exceptions during interpreter shutdown
+
+ These can most likely be ignored in general. In the specific
+ case that we are addressing with this, they also seem to be
+ caused by a bug in Python. Closes: #851724.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sat, 21 Jan 2017 16:36:43 -0800
+
+python-llfuse (1.1.1+dfsg-5) unstable; urgency=medium
+
+ * Added missing python-pytest-catchlog dependency for tests
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Mon, 02 Jan 2017 20:17:51 -0800
+
+python-llfuse (1.1.1+dfsg-4) unstable; urgency=medium
+
+ * Added missing python3-pytest-catchlog dependency for tests
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Fri, 07 Oct 2016 20:46:10 -0700
+
+python-llfuse (1.1.1+dfsg-3) unstable; urgency=medium
+
+ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+
+ [ Nikolaus Rath ]
+ * Don't use pytest.skip at module level. Closes: #837254.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Fri, 23 Sep 2016 20:41:07 -0700
+
+python-llfuse (1.1.1+dfsg-2) unstable; urgency=medium
+
+ * Added missing pytest-catchlog build dependency
+ * Fixup 0004-Backport-properties-to-Cython-0.23-syntax.patch
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 27 Jul 2016 11:25:48 -0700
+
+python-llfuse (1.1.1+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 27 Jul 2016 10:20:40 -0700
+
+python-llfuse (1.0+dfsg-2) unstable; urgency=medium
+
+ * Cherry picked ns-resolution support for kFreeBSD
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 10 Mar 2016 09:13:08 -0800
+
+python-llfuse (1.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Tue, 08 Mar 2016 09:04:29 -0800
+
+python-llfuse (0.43+dfsg-3) unstable; urgency=medium
+
+ * Skip extended attribute tests under kFreeBSD.
+ * Bump standards version to 3.9.7, no changes required.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Mon, 07 Mar 2016 13:23:53 -0800
+
+python-llfuse (0.43+dfsg-2) unstable; urgency=medium
+
+ * Added Breaks: borgbackup.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 25 Feb 2016 09:42:48 -0800
+
+python-llfuse (0.43+dfsg-1) unstable; urgency=medium
+
+ * Updated URL in copyright file.
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Tue, 23 Feb 2016 16:10:05 -0800
+
+python-llfuse (0.41.1+dfsg-4) unstable; urgency=medium
+
+ * Added patches/mips_dev_t.diff to work around bug in mips/mipsel libc
+ (cf. https://sourceware.org/bugzilla/show_bug.cgi?id=17786).
+ Closes: #635197.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 16 Sep 2015 13:59:11 -0700
+
+python-llfuse (0.41.1+dfsg-3) unstable; urgency=medium
+
+ * Bumped Cython dependency to >= 0.21.1. Older versions don't have
+ posix/time.pxi.
+ * Added patches/setattr_compat.diff to restore full backwards
+ compatibility with version 0.40 (some applications were relying
+ on undocumented behavior were broken by the update to 0.41.1).
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 10 Sep 2015 14:09:16 -0700
+
+python-llfuse (0.41.1+dfsg-1) unstable; urgency=medium
+
+ * Added test suite.
+ * 'nostrip' build option is now honored.
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sat, 22 Aug 2015 19:34:48 -0700
+
+python-llfuse (0.41+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Use Python 3 versions of Cython and Sphinx.
+ * Dropped build dependency on cython3-dbg (fixed upstream).
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Fri, 21 Aug 2015 08:52:21 -0700
+
+python-llfuse (0.40+dfsg-2) unstable; urgency=medium
+
+ * Correctly handle symlink-to-directory transition of
+ /usr/share/doc/{python,python3}-llfuse-dbg when upgrading from jessie.
+ Closes: #788161.
+ * Add versioned Breaks and Conflicts to -dbg packages to avoid
+ upgrade problems due to moved file. Closes: #781652.
+ * Put debugging symbols for regular interpreter into -dbg
+ package again. Closes: #781719.
+ * Bumped Standards-Version to 3.9.6 (no changes needed).
+ * Added missing build-depends on cython3 and cython-dbg.
+ Closes: #794056.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 29 Jul 2015 20:49:49 -0700
+
+python-llfuse (0.40+dfsg-1) unstable; urgency=medium
+
+ * Updated watch file to use pypi, and validate pgp signature.
+ * Remove minified javascript files from upstream source.
+ * Switched package build system to pybuild.
+ * Updated project URL.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 10 Jul 2014 21:34:34 -0700
+
+python-llfuse (0.40-2) unstable; urgency=low
+
+ * Some cosmetic fixes to debian/
+ * Bumped standards version to 3.9.5, no other changes required.
+ * Added force_xattr_api.diff to support compilation under GNU/kFreeBSD.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 27 Nov 2013 20:19:13 -0800
+
+python-llfuse (0.40-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Tue, 26 Nov 2013 21:59:10 -0800
+
+python-llfuse (0.39-1) unstable; urgency=low
+
+ [ Nikolaus Rath ]
+ * Bumped standards version to 3.9.4, no other changes required.
+ * Bumped debhelper compatibility level to 9 to get support for
+ dpkg-buildflags.
+ * Added lintian override for hardening-no-fortify-functions,
+ this is a false positive.
+ * Build depend on newer Cython (> 0.16).
+ * New upstream release.
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sat, 11 May 2013 12:33:34 -0700
+
+python-llfuse (0.37.1-2) unstable; urgency=low
+
+ * Fix build failure, only call dh_sphinxdoc when building
+ python-llfuse-doc package.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 22 Dec 2011 22:37:26 -0500
+
+python-llfuse (0.37.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sat, 10 Dec 2011 20:57:38 -0500
+
+python-llfuse (0.36-2) unstable; urgency=low
+
+ * Use dh_sphinxdoc. Closes: #637393.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Mon, 24 Oct 2011 19:36:59 -0400
+
+python-llfuse (0.36-1) unstable; urgency=low
+
+ * New upstream release.
+ * Depend on Cython > 0.15.1, previous versions generated segfaulting
+ code.
+ * Breaks S3QL < 1.2, API changed in non-backwards compatible way.
+ (python-llfuse is not in any stable release, and S3QL is the
+ only reverse dependency, so a new package name does not seem
+ justified).
+ * Update format of copyright file.
+ * Fixed argument parsing under Python 3.x
+ * Do correct typecasting of mode_t constants. Fix introduces
+ build dependency on Cython 0.15 (Closes: #635196).
+ * Use underscore.js from libjs-underscore rather than shipping
+ our own version.
+ * Added correct copyright information for files in doc/html/_static.
+ * Thanks to Jakub Wilk for his packaging review.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Tue, 20 Sep 2011 22:16:17 -0400
+
+python-llfuse (0.33-1) unstable; urgency=low
+
+ * New upstream release.
+ * Build extension before generating documentation, so that
+ autogenerated documentation is no longer empty. Closes: 631871
+ * Ship cached python intersphinx file in debian/, so that it
+ does not need to be downloaded at build time.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 06 Jul 2011 09:32:38 -0400
+
+python-llfuse (0.32-2) unstable; urgency=low
+
+ * Created separate -doc package for documentation. Closes: 630632
+ * Regenerate documentation in debian/rules. Closes: 630605
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sat, 25 Jun 2011 13:01:03 -0400
+
+python-llfuse (0.32-1) unstable; urgency=low
+
+ * First official debian release. Closes: 626658
+ * Breaks and Replaces s3ql <= 0.28, this package isn't in the official
+ debian package but was provided by upstream over various channels (LLFUSE
+ was factored out of S3QL in version 0.29).
+ * Rebuilding of HTML documentation requires (yet unreleased) Sphinx version
+ 1.1 or resolution of wishlist bug #63040, therefore we do not rebuild the
+ documentation in debian/rules but use the HTML files included in the
+ upstream tarball.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 12 May 2011 10:19:11 -0400
+
diff --cc debian/patches/0002-Use-cython3-instead-of-cython-command.patch
index c24eae2,0000000..635dc79
mode 100644,000000..100644
--- a/debian/patches/0002-Use-cython3-instead-of-cython-command.patch
+++ b/debian/patches/0002-Use-cython3-instead-of-cython-command.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 102dd300004b26428cab14684c71e8659b54c1ed Mon Sep 17 00:00:00 2001
++From 49ba7065315c429d61fde890d7c81d75229b7f46 Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus at rath.org>
+Date: Tue, 23 Feb 2016 16:30:36 -0800
+Subject: Use 'cython3' instead of 'cython' command
+
+Origin: debian
+Forwarded: not-needed
+
+In Debian, python3-cython provides only a 'cython3' command. To avoid
+pulling in the complete Python 2.x runtime environment for
+python-cython, we use 'cython3' instead.
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index b7f1c..9513b 100755
++index 194c3..c1ef9 100755
+--- a/setup.py
++++ b/setup.py
- @@ -205,7 +205,7 @@ class build_cython(setuptools.Command):
++@@ -225,7 +225,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:
- @@ -215,7 +215,7 @@ class build_cython(setuptools.Command):
++@@ -235,7 +235,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/0003-Skip-extended-attribute-tests-under-GNU-kFreeBSD.patch
index 149bc60,0000000..06c938c
mode 100644,000000..100644
--- a/debian/patches/0003-Skip-extended-attribute-tests-under-GNU-kFreeBSD.patch
+++ b/debian/patches/0003-Skip-extended-attribute-tests-under-GNU-kFreeBSD.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 3066e929d05083c9db8ca1ce5833eabadf2ae9f9 Mon Sep 17 00:00:00 2001
++From 62cbe4de1143ae5a7f3c27ae2706ea75ee66c394 Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus at rath.org>
+Date: Mon, 7 Mar 2016 13:22:36 -0800
+Subject: Skip extended attribute tests under GNU/kFreeBSD
+
+Origin: Debian
+Forwarded: not-needed
+
+Under GNU/kFreeBSD the setxattr and getxattr functions are dummies
+that return ENOTIMPL.
+---
+ test/test_api.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/test_api.py b/test/test_api.py
+index 92fab..5c110 100755
+--- a/test/test_api.py
++++ b/test/test_api.py
+@@ -23,6 +23,7 @@ import errno
+ import pytest
+ from copy import copy
+ from pickle import PicklingError
++import sys
+
+ def test_inquire_bits():
+ assert 0 < llfuse.get_ino_t_bits() < 256
+@@ -66,6 +67,9 @@ def test_entry_res():
+ a.st_atime_ns = val*1e9
+ assert a.st_atime_ns / 1e9 == val
+
++
++ at pytest.mark.skipif(sys.platform.startswith('gnukfreebsd'),
++ reason='GNU/kFreeBSD does not have xattr support')
+ def test_xattr():
+ with tempfile.NamedTemporaryFile() as fh:
+ key = 'user.new_attribute'
diff --cc debian/patches/0004-Ignore-exceptions-during-interpreter-shutdown.patch
index 730b95f,0000000..332257a
mode 100644,000000..100644
--- a/debian/patches/0004-Ignore-exceptions-during-interpreter-shutdown.patch
+++ b/debian/patches/0004-Ignore-exceptions-during-interpreter-shutdown.patch
@@@ -1,30 -1,0 +1,30 @@@
- From a63daae603aec0b930f4a1d9bed2f5084e191485 Mon Sep 17 00:00:00 2001
++From 6bf746d68824d5fe1d89d6cf3f11c7e89dee83b1 Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus at rath.org>
+Date: Sat, 21 Jan 2017 16:34:50 -0800
+Subject: Ignore exceptions during interpreter shutdown
+
+These can most likely be ignored in general. In the specific
+case that we are addressing with this, they also seem to be
+caused by a bug in Python. Closes: #851724.
+---
+ test/conftest.py | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/test/conftest.py b/test/conftest.py
+index fa19c..d1e88 100644
+--- a/test/conftest.py
++++ b/test/conftest.py
+@@ -21,6 +21,13 @@ def register_false_checklog_pos(reg_output):
+ reg_output(r'^==\d+== For counts of detected and suppressed errors, rerun with: -v')
+ reg_output(r'^==\d+== ERROR SUMMARY: 0 errors from 0 contexts')
+
++ # Exception during interpreter shutdown (cf. https://bugs.debian.org/851724)
++ reg_output(r'^Exception in thread [a-z0-9_-]+ '
++ r'\(most likely raised during interpreter shutdown\):\n'
++ r'Traceback .+\n'
++ r'( File.+\n)+'
++ r'.+: .+\n')
++
+ def pytest_addoption(parser):
+ group = parser.getgroup("general")
+ group._addoption("--installed", action="store_true", default=False,
diff --cc debian/patches/mips_dev_t.diff
index 4349263,0000000..0a61792
mode 100644,000000..100644
--- a/debian/patches/mips_dev_t.diff
+++ b/debian/patches/mips_dev_t.diff
@@@ -1,93 -1,0 +1,67 @@@
- From 388d91ac97404f71f429c2a78fd676f0bc0a4e77 Mon Sep 17 00:00:00 2001
++From 962f96aa30c98566c6b214ef31a32268a853824e Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus at rath.org>
- Date: Mon, 1 Feb 2016 09:40:04 -0800
++Date: Mon, 13 Nov 2017 12:31:56 +0000
+Subject: Work around bug in mips+mipsel libc
+
+Forwarded: no
+Patch-Name: mips_dev_t.diff
+
+On mips and mipsel, the st_dev and st_rdev members of struct stat do not
+have type dev_t. This breaks POSIX compatibility, but is difficult to fix
+(cf. https://sourceware.org/bugzilla/show_bug.cgi?id=17786).
+
+To work around the issue, we change the definition of struct stat that
+is used by Cython when we are compiling under mips. Note that this
+requires the Cython compilation to run under mips, and that the
+resulting C file will be mips specific (without the patch, the
+generated C file is suitable for any architecture).
+
+Upstream is not interested in this change for obvious reasons.
+---
- Include/posix/__init__.pxd | 1 +
- Include/posix/stat.pxd | 50 +++++++++++++++++++++++++++++++---------------
- 2 files changed, 35 insertions(+), 16 deletions(-)
- create mode 100644 Include/posix/__init__.pxd
++ Include/posix/stat.pxd | 37 +++++++++++++++++++++++++++++++++++++
++ 1 file changed, 37 insertions(+)
++ create mode 100644 Include/posix/stat.pxd
+
- diff --git a/Include/posix/__init__.pxd b/Include/posix/__init__.pxd
++diff --git a/Include/posix/stat.pxd b/Include/posix/stat.pxd
+new file mode 100644
- index 00000..ea305
++index 00000..f9038
+--- /dev/null
- +++ b/Include/posix/__init__.pxd
- @@ -0,0 +1 @@
- +#empty
- diff --git a/Include/posix/stat.pxd b/Include/posix/stat.pxd
- index 0d61b..a4ee4 100644
- --- a/Include/posix/stat.pxd
++++ b/Include/posix/stat.pxd
- @@ -2,22 +2,40 @@ from posix.types cimport (blkcnt_t, blksize_t, dev_t, gid_t, ino_t, mode_t,
- nlink_t, off_t, time_t, uid_t)
-
-
- -cdef extern from "<sys/stat.h>" nogil:
- - cdef struct struct_stat "stat":
- - dev_t st_dev
- - ino_t st_ino
- - mode_t st_mode
- - nlink_t st_nlink
- - uid_t st_uid
- - gid_t st_gid
- - dev_t st_rdev
- - off_t st_size
- - blksize_t st_blksize
- - blkcnt_t st_blocks
- - time_t st_atime
- - time_t st_mtime
- - time_t st_ctime
- - time_t st_birthtime
++@@ -0,0 +1,37 @@
+++from posix.types cimport (blkcnt_t, blksize_t, dev_t, gid_t, ino_t, mode_t,
+++ nlink_t, off_t, time_t, uid_t)
+++
++IF UNAME_MACHINE.startswith('mips'):
++ cdef extern from "<sys/stat.h>" nogil:
++ cdef struct struct_stat "stat":
++ unsigned st_dev
++ ino_t st_ino
++ mode_t st_mode
++ nlink_t st_nlink
++ uid_t st_uid
++ gid_t st_gid
++ unsigned st_rdev
++ off_t st_size
++ blksize_t st_blksize
++ blkcnt_t st_blocks
++ time_t st_atime
++ time_t st_mtime
++ time_t st_ctime
++ time_t st_birthtime
++ELSE:
++ cdef extern from "<sys/stat.h>" nogil:
++ cdef struct struct_stat "stat":
++ dev_t st_dev
++ ino_t st_ino
++ mode_t st_mode
++ nlink_t st_nlink
++ uid_t st_uid
++ gid_t st_gid
++ dev_t st_rdev
++ off_t st_size
++ blksize_t st_blksize
++ blkcnt_t st_blocks
++ time_t st_atime
++ time_t st_mtime
++ time_t st_ctime
++ time_t st_birthtime
-
- # POSIX prescribes including both <sys/stat.h> and <unistd.h> for these
- cdef extern from "<unistd.h>" nogil:
diff --cc debian/patches/use-local-intersphinx-inventory.patch
index 7a07127,0000000..51bada2
mode 100644,000000..100644
--- a/debian/patches/use-local-intersphinx-inventory.patch
+++ b/debian/patches/use-local-intersphinx-inventory.patch
@@@ -1,28 -1,0 +1,28 @@@
- From e2b3ff27d5af81f5752beb7e7d2fdb5c7fb1a901 Mon Sep 17 00:00:00 2001
++From c58298017cff2751391e7d2e72a97fdb93102f7e Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus at rath.org>
+Date: Thu, 8 Oct 2015 12:24:34 -0700
+Subject: Use local intersphinx inventory
+
+Forwarded: not-needed
+Last-Update: 2011-07-06
+ Instead of downloading the Python intersphinx directory
+ at build time, use the cached copy shipped in debian/.
+Patch-Name: use-local-intersphinx-inventory.patch
+---
+ rst/conf.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rst/conf.py b/rst/conf.py
+index 2290d..f6425 100644
+--- a/rst/conf.py
++++ b/rst/conf.py
+@@ -27,7 +27,8 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
+ 'sphinx_cython' ]
+
+ # Link to Python standard library
+-intersphinx_mapping = {'python': ('http://docs.python.org/3/', None) }
++intersphinx_mapping = {'python': ('http://docs.python.org/3/',
++ '../debian/python.inv')}
+
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-llfuse.git
More information about the Python-modules-commits
mailing list