From 01a09e2538ee70a2d66c432df0a9d80d424c42d6 Mon Sep 17 00:00:00 2001 From: Nicolas Bourdaud Date: Tue, 22 May 2012 14:46:08 +0200 Subject: [PATCH] NeuroDebian backport patch --- debian/compat | 2 +- debian/control | 9 ++------- debian/libfreenect-dev.install | 6 +++--- debian/libfreenect0.5.install | 4 ++-- debian/rules | 17 +++++++++-------- 5 files changed, 17 insertions(+), 21 deletions(-) --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +7 --- a/debian/control +++ b/debian/control @@ -3,10 +3,9 @@ Section: libdevel Priority: extra Maintainer: Nicolas Bourdaud Uploaders: Arne Bernin , Yaroslav Halchenko , Mark Renouf -Build-Depends: debhelper (>= 9), cmake, pkg-config, +Build-Depends: debhelper (>= 7.0.50~), cmake, pkg-config, python-support, libusb-1.0-0-dev, freeglut3-dev, libxmu-dev, libxi-dev, - python-all-dev (>= 2.6.6-3~), cython, python-numpy, doxygen -X-Python-Version: 2.7 + python-dev, cython, python-numpy, doxygen Standards-Version: 3.9.3 Homepage: http://openkinect.org/ Vcs-Git: git://anonscm.debian.org/pkg-exppsy/libfreenect.git @@ -15,8 +14,6 @@ Vcs-Browser: http://anonscm.debian.org/g Package: libfreenect0.5 Section: libs Architecture: any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libfreenect Description: library for accessing Kinect device @@ -34,7 +31,6 @@ Description: library for accessing Kinec Package: libfreenect-dev Architecture: any -Multi-Arch: same Depends: ${misc:Depends}, libfreenect0.5 (= ${binary:Version}) Description: library for accessing Kinect device -- development files libfreenect is a cross-platform library that provides the necessary interfaces @@ -89,7 +85,6 @@ Description: library for accessing Kinec Package: libfreenect-doc Section: doc Architecture: all -Multi-Arch: foreign Depends: ${misc:Depends} Description: library for accessing Kinect device -- documentation libfreenect is a cross-platform library that provides the necessary interfaces --- a/debian/libfreenect-dev.install +++ b/debian/libfreenect-dev.install @@ -1,4 +1,4 @@ usr/include/libfreenect* -usr/lib/*/*.so -usr/lib/*/fakenect/*.so -usr/lib/*/pkgconfig/* +usr/lib/*.so +usr/lib/fakenect/*.so +usr/lib/pkgconfig/* --- a/debian/libfreenect0.5.install +++ b/debian/libfreenect0.5.install @@ -1,2 +1,2 @@ -usr/lib/*/*.so.* -usr/lib/*/fakenect/*.so.* +usr/lib/*.so.* +usr/lib/fakenect/*.so.* --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,19 @@ #!/usr/bin/make -f # -*- makefile -*- -export DEB_LDFLAGS_MAINT_APPEND=-Wl,-Bsymbolic-functions -Wl,--as-needed -export MA_TRIPLET=`dpkg-architecture -qDEB_HOST_MULTIARCH` +#export DEB_LDFLAGS_MAINT_APPEND=-Wl,-Bsymbolic-functions -Wl,--as-needed +#export MA_TRIPLET=`dpkg-architecture -qDEB_HOST_MULTIARCH` +export LDFLAGS=-Wl,-Bsymbolic-functions -Wl,--as-needed %: - dh $@ --with python2 + dh $@ override_dh_auto_configure: dh_auto_configure -- \ - -DBUILD_PYTHON:Bool=True -DPYTHON_EXECUTABLE=python -DPROJECT_LIBRARY_INSTALL_DIR:Path="lib/$(MA_TRIPLET)" + -DBUILD_PYTHON:Bool=True -DPYTHON_EXECUTABLE=python -override_dh_auto_build-indep: +override_dh_auto_build: + dh_auto_build ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) doxygen debian/doxygen.conf else @@ -20,8 +22,8 @@ else mkdir -p debian/html endif -override_dh_python2: - dh_python2 -p python-freenect +override_dh_pysupport: + dh_pysupport -ppython-freenect if [ -x /usr/bin/dh_numpy ]; then dh_numpy -ppython-freenect; fi override_dh_installdocs: @@ -30,5 +32,6 @@ override_dh_installdocs: override_dh_makeshlibs: dh_makeshlibs -Xfakenect -override_dh_clean-indep: +override_dh_clean: rm -rf debian/html + dh_clean