[Python-modules-commits] [python-llfuse] 06/09: 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 cec8adcc36bc6de0cb46d3e93e7b312571e09dde
Merge: 02917fb f1417ab
Author: Nikolaus Rath <Nikolaus at rath.org>
Date:   Mon Feb 1 08:41:54 2016 -0800

    merge patched into master

 debian/.git-dpm                     |  4 ++--
 debian/patches/force_xattr_api.diff | 47 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 src/llfuse.h                        | 11 ---------
 4 files changed, 50 insertions(+), 13 deletions(-)

diff --cc debian/.git-dpm
index f1b57fa,0000000..20419ca
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
- acd7a1b7ea0f16ef66ab95e68301acb28a6f207a
- acd7a1b7ea0f16ef66ab95e68301acb28a6f207a
++f1417ab403aefb0446f59018a8360afc3895b51b
++f1417ab403aefb0446f59018a8360afc3895b51b
 +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/force_xattr_api.diff
index 0000000,0000000..cdc8268
new file mode 100644
--- /dev/null
+++ b/debian/patches/force_xattr_api.diff
@@@ -1,0 -1,0 +1,47 @@@
++From f1417ab403aefb0446f59018a8360afc3895b51b Mon Sep 17 00:00:00 2001
++From: Nikolaus Rath <Nikolaus at rath.org>
++Date: Mon, 1 Feb 2016 08:40:44 -0800
++Subject: =?UTF-8?q?From=204baa45092b0517cb905c0993610885f52a09c735=20Mon?=
++ =?UTF-8?q?=20Sep=2017=2000:00:00=202001=0AFrom:=20Nikolaus=20Rath=20<Niko?=
++ =?UTF-8?q?laus at rath.org>=0ADate:=20Thu,=208=20Oct=202015=2012:24:35=20-07?=
++ =?UTF-8?q?00=0ASubject:=20Force=20use=20of=20libattr1-dev=20API?=
++
++Forwarded: not-needed
++Last-Update: 2015-08-21
++ Compilation under GNU/kFreeBSD fails because none of upstream's
++ preprocessor macros matches this combination. It is also not clear
++ how to properly test for the extended attribute API without
++ introducing something heavyweight like autoconf. In Debian, however,
++ the libattr1-dev API is available for all supported architectures,
++ so it is safe to just hardcode the use of this API. This is what
++ this patch does.
++ .
++
++Patch-Name: force_xattr_api.diff
++---
++ src/llfuse.h | 11 -----------
++ 1 file changed, 11 deletions(-)
++
++diff --git a/src/llfuse.h b/src/llfuse.h
++index 159e..1606 100644
++--- a/src/llfuse.h
+++++ b/src/llfuse.h
++@@ -12,18 +12,7 @@ the terms of the GNU LGPL.
++ #define PLATFORM_BSD 2
++ #define PLATFORM_DARWIN 3
++ 
++-#ifdef __gnu_linux__
++ #define PLATFORM PLATFORM_LINUX
++-#elif __FreeBSD__
++-#define PLATFORM PLATFORM_BSD
++-#elif __NetBSD__
++-#define PLATFORM PLATFORM_BSD
++-#elif __APPLE__ && __MACH__
++-#define PLATFORM PLATFORM_DARWIN
++-#include "darwin_compat.h"
++-#else
++-#error "Unable to determine system (Linux/FreeBSD/NetBSD/Darwin)"
++-#endif
++ 
++ #include <fuse.h>
++ 
diff --cc debian/patches/series
index f7703c3,0000000..350d05f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +use-local-intersphinx-inventory.patch
++force_xattr_api.diff

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