[Python-modules-commits] [python-llfuse] 04/09: merge patched into master
Nikolaus Rath
nikratio-guest at moszumanska.debian.org
Mon Feb 1 16:49:54 UTC 2016
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 02917fb3aad918248be054e72be12fcc97362b86
Merge: c392c6f acd7a1b
Author: Nikolaus Rath <Nikolaus at rath.org>
Date: Mon Feb 1 08:39:31 2016 -0800
merge patched into master
Changes.rst | 263 +
Changes.txt | 189 -
Include/fuse_common.pxd | 39 +-
Include/fuse_lowlevel.pxd | 63 +-
Include/libc/errno.pxd | 23 -
Include/libc/sys/stat.pxd | 51 -
Include/libc/sys/statvfs.pxd | 5 +-
Include/libc/sys/types.pxd | 24 -
Include/libc/xattr.pxd | 59 -
Include/pthread.pxd | 49 +
PKG-INFO | 21 +-
README.rst | 19 +-
debian/.git-dpm | 6 +-
debian/patches/force_xattr_api.diff | 40 -
debian/patches/mips_dev_t.diff | 56 -
debian/patches/series | 3 -
debian/patches/setattr_compat_patch.diff | 38 -
.../patches/use-local-intersphinx-inventory.patch | 4 +-
examples/lltest.py | 48 +-
examples/passthroughfs.py | 119 +-
examples/tmpfs.py | 77 +-
rst/about.rst | 5 +-
rst/changes.rst | 1 +
rst/conf.py | 2 +-
rst/data.rst | 82 +-
rst/example.rst | 36 +-
rst/fuse_api.rst | 6 +-
rst/general.rst | 79 +
rst/getting_started.rst | 20 -
rst/gotchas.rst | 30 +
rst/index.rst | 10 +-
rst/install.rst | 15 +-
rst/util.rst | 14 +
setup.py | 125 +-
src/darwin_compat.c | 247 +
src/darwin_compat.h | 49 +
src/fuse_api.pxi | 627 +
src/gettime.h | 59 +
src/{llfuse => }/handlers.pxi | 464 +-
src/llfuse.c | 49713 +++++++++++++++++++
src/llfuse.egg-info/PKG-INFO | 21 +-
src/llfuse.egg-info/SOURCES.txt | 55 +-
src/llfuse.egg-info/requires.txt | 1 +
src/llfuse.h | 36 +
src/llfuse.pyx | 173 +
src/llfuse/__init__.py | 18 -
src/llfuse/capi.c | 10 -
src/llfuse/capi.pyx | 131 -
src/llfuse/capi_darwin.c | 32113 ------------
src/llfuse/capi_freebsd.c | 31314 ------------
src/llfuse/capi_linux.c | 31552 ------------
src/llfuse/fuse_api.pxi | 401 -
src/llfuse/misc.pxi | 341 -
src/llfuse/pyapi.py | 592 -
src/llfuse/version.c | 20 -
src/{llfuse => }/lock.c | 7 +-
src/lock.h | 22 +
src/{llfuse/time.c => macros.c} | 32 +-
src/misc.pxi | 617 +
src/operations.pxi | 537 +
src/xattr.h | 106 +
test/conftest.py | 21 +-
test/pytest.ini | 2 +-
test/test_api.py | 83 +
test/test_examples.py | 154 +-
test/test_fs.py | 241 +
test/util.py | 123 +
67 files changed, 53922 insertions(+), 97581 deletions(-)
diff --cc debian/.git-dpm
index 5904b12,0000000..f1b57fa
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
- 0a7ff2ca42cfe2e939248b0dc1fdfc756c0b4133
- 0a7ff2ca42cfe2e939248b0dc1fdfc756c0b4133
- 0c31f69dc414c2e45658c31e11222a8d20bc8262
++acd7a1b7ea0f16ef66ab95e68301acb28a6f207a
++acd7a1b7ea0f16ef66ab95e68301acb28a6f207a
++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/series
index 86e38b4,0000000..f7703c3
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,1 @@@
+use-local-intersphinx-inventory.patch
- force_xattr_api.diff
- setattr_compat_patch.diff
- mips_dev_t.diff
diff --cc debian/patches/use-local-intersphinx-inventory.patch
index 92f839b,0000000..445e407
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 860dbfb8afcd44583c5cdc8410bdb9e5e718d8e9 Mon Sep 17 00:00:00 2001
++From acd7a1b7ea0f16ef66ab95e68301acb28a6f207a 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 3bd0c4f..1fb9248 100644
++index 2290..f642 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