From 75681682b73e6afb8a8f51dc60bfd41e60517a7b Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Tue, 23 Jun 2009 22:32:24 +0200 Subject: [PATCH] Add patch from #534123 to fix Hurd issues This needs to be applied upstream, but in the meantime we fix it by adding this patch, and a adding quilt framework. --- debian/control | 2 +- debian/patches/python-pylibacl_hurd.patch | 33 +++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 6 +++-- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 debian/patches/python-pylibacl_hurd.patch create mode 100644 debian/patches/series diff --git a/debian/control b/debian/control index 1af7193..e111c96 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Iustin Pop Build-Depends: debhelper (>= 7), python (>= 2.3.5-11), python-all-dev (>= 2.3.5-11), - python-support (>= 0.6), libacl1-dev, python-setuptools, python-epydoc + python-support (>= 0.6), libacl1-dev, python-setuptools, python-epydoc, quilt (>= 0.40) Standards-Version: 3.8.0 Homepage: http://pylibacl.sourceforge.net/ Vcs-Browser: http://git.k1024.org/debian-pylibacl.git diff --git a/debian/patches/python-pylibacl_hurd.patch b/debian/patches/python-pylibacl_hurd.patch new file mode 100644 index 0000000..430635c --- /dev/null +++ b/debian/patches/python-pylibacl_hurd.patch @@ -0,0 +1,33 @@ +Date: Sun, 21 Jun 2009 16:37:01 -0400 +From: Barry deFreese +To: Debian Bug Tracking System +Subject: Bug#534123: python-pylibacl: FTBFS on Debian GNU/Hurd [Patch] +Reply-To: bdefreese@debian.org, 534123@bugs.debian.org +Organization: Debian +User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) + +Package: python-pylibacl +Version: 0.4.0-2 +Severity: normal + +Hi, + +python-pylibacl currently fails to build on Debian GNU/Hurd because it +doesn't recognize GNU as an OS. Attached is a patch to resolve this. + +Thanks, + +Barry deFreese +--- a/setup.py ++++ b/setup.py +@@ -22,6 +22,10 @@ + macros.append(("HAVE_LEVEL2", None)) + elif u_sysname == "Darwin": + libs.append("pthread") ++elif u_sysname == "GNU": ++ macros.append(("HAVE_LINUX", None)) ++ macros.append(("HAVE_LEVEL2", None)) ++ libs.append("acl") + else: + raise ValueError("I don't know your system '%s'." + " Please contact the author" % u_sysname) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..be61a25 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +python-pylibacl_hurd.patch diff --git a/debian/rules b/debian/rules index 224b077..25d3cd8 100755 --- a/debian/rules +++ b/debian/rules @@ -11,9 +11,11 @@ # This has to be exported to make some magic below work. export DH_OPTIONS +include /usr/share/quilt/quilt.make + PYVERS := $(shell pyversions -vr) -build: $(PYVERS:%=build-python%) build-indep +build: $(PYVERS:%=build-python%) build-indep $(QUILT_STAMPFN) touch $@ build-python%: @@ -24,7 +26,7 @@ build-indep: make doc touch $@ -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-arch-stamp build-indep #CONFIGURE-STAMP# -- 2.39.5