From 49bd681fa7c67ac5ecefd480a4b5db8b71c102d6 Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Thu, 26 Jan 2017 00:33:05 +0100 Subject: [PATCH] 6.0.0-2 release fixing kfreebsd/hurd builds --- debian/changelog | 9 +++++++ debian/patches/fixup-non-linux.patch | 35 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 45 insertions(+) create mode 100644 debian/patches/fixup-non-linux.patch diff --git a/debian/changelog b/debian/changelog index d88bbe3..d7160ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-pyxattr (0.6.0-2) unstable; urgency=medium + + * Fixup building on hurd and kfreebsd; while neither of these + architectures have proper xattr support, the package was present and + importable on them previously (and hurd has some very basic support + for xattrs) + + -- Iustin Pop Thu, 26 Jan 2017 00:30:55 +0100 + python-pyxattr (0.6.0-1) unstable; urgency=medium * New upstream release, mainly fixing a race condition when diff --git a/debian/patches/fixup-non-linux.patch b/debian/patches/fixup-non-linux.patch new file mode 100644 index 0000000..2834c83 --- /dev/null +++ b/debian/patches/fixup-non-linux.patch @@ -0,0 +1,35 @@ +Author: iustin@debian.org +Subject: Fix building on hurd and kfreebsd +Description: Even though both of these arches don't have proper xattr support, + the package previously built on them. +--- a/setup.py ++++ b/setup.py +@@ -14,7 +14,7 @@ + author = "Iustin Pop" + author_email = "iustin@k1024.org" + libraries = [] +-if platform.system() == 'Linux': ++if platform.system() != 'Darwin': + libraries.append("attr") + macros = [ + ("_XATTR_VERSION", '"%s"' % version), +--- a/xattr.c ++++ b/xattr.c +@@ -25,7 +25,7 @@ + #include + #if defined(__APPLE__) + #include +-#elif defined(__linux__) ++#else + #include + #endif + #include +@@ -251,7 +251,7 @@ + return fremovexattr(filedes, name, 0); + } + +-#elif defined(__linux__) ++#else + #define _listxattr(path, list, size) listxattr(path, list, size) + #define _llistxattr(path, list, size) llistxattr(path, list, size) + #define _flistxattr(fd, list, size) flistxattr(fd, list, size) diff --git a/debian/patches/series b/debian/patches/series index 6712e7b..3f233c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ sphinx-1.3.patch +fixup-non-linux.patch -- 2.39.2