Skip to content

Commit 32b978f

Browse files
committed
Update NeuroDebian backport patch
1 parent 52634a7 commit 32b978f

8 files changed

Lines changed: 133 additions & 50 deletions

debian/patches/lenny-dsc-patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
link-flags-oldway-dh-noindep-rules.patch
1+
neurodebian-backport.patch

debian/patches/link-flags-oldway-dh-noindep-rules.patch

Lines changed: 0 additions & 44 deletions
This file was deleted.

debian/patches/lucid-dsc-patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
link-flags-oldway-dh-noindep-rules.patch
1+
neurodebian-backport.patch

debian/patches/maverick-dsc-patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
link-flags-oldway-dh-noindep-rules.patch
1+
neurodebian-backport.patch

debian/patches/natty-dsc-patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
link-flags-oldway-dh-noindep-rules.patch
1+
neurodebian-backport.patch
Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
From 1e5e3641644b2c5321274f2e455033f227f5e079 Mon Sep 17 00:00:00 2001
2+
From: Nicolas Bourdaud <nicolas.bourdaud@gmail.com>
3+
Date: Tue, 22 May 2012 14:46:08 +0200
4+
Subject: [PATCH] NeuroDebian backport patch
5+
6+
---
7+
debian/compat | 2 +-
8+
debian/control | 6 +-----
9+
debian/libfreenect-dev.install | 6 +++---
10+
debian/libfreenect0.1.install | 4 ++--
11+
debian/rules | 17 +++++++++--------
12+
5 files changed, 16 insertions(+), 19 deletions(-)
13+
14+
diff --git a/debian/compat b/debian/compat
15+
index ec63514..7f8f011 100644
16+
--- a/debian/compat
17+
+++ b/debian/compat
18+
@@ -1 +1 @@
19+
-9
20+
+7
21+
diff --git a/debian/control b/debian/control
22+
index eb5882a..7bafd2e 100644
23+
--- a/debian/control
24+
+++ b/debian/control
25+
@@ -3,7 +3,7 @@ Section: libdevel
26+
Priority: extra
27+
Maintainer: Nicolas Bourdaud <nicolas.bourdaud@gmail.com>
28+
Uploaders: Arne Bernin <arne@alamut.de>, Yaroslav Halchenko <debian@onerussian.com>, Mark Renouf <mark.renouf@gmail.com>
29+
-Build-Depends: debhelper (>= 9), cmake, pkg-config,
30+
+Build-Depends: debhelper (>= 7.0.50~), cmake, pkg-config, python-support,
31+
libusb-1.0-0-dev, freeglut3-dev, libxmu-dev, libxi-dev,
32+
python-all-dev (>= 2.6.6-3~), cython, python-numpy, doxygen
33+
X-Python-Version: 2.7
34+
@@ -15,8 +15,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-exppsy/libfreenect.git
35+
Package: libfreenect0.1
36+
Section: libs
37+
Architecture: any
38+
-Multi-Arch: same
39+
-Pre-Depends: ${misc:Pre-Depends}
40+
Depends: ${shlibs:Depends}, ${misc:Depends}
41+
Conflicts: libfreenect
42+
Description: library for accessing Kinect device
43+
@@ -34,7 +32,6 @@ Description: library for accessing Kinect device
44+
45+
Package: libfreenect-dev
46+
Architecture: any
47+
-Multi-Arch: same
48+
Depends: ${misc:Depends}, libfreenect0.1 (= ${binary:Version})
49+
Description: library for accessing Kinect device -- development files
50+
libfreenect is a cross-platform library that provides the necessary interfaces
51+
@@ -89,7 +86,6 @@ Description: library for accessing Kinect device -- dummy package
52+
Package: libfreenect-doc
53+
Section: doc
54+
Architecture: all
55+
-Multi-Arch: foreign
56+
Depends: ${misc:Depends}
57+
Description: library for accessing Kinect device -- documentation
58+
libfreenect is a cross-platform library that provides the necessary interfaces
59+
diff --git a/debian/libfreenect-dev.install b/debian/libfreenect-dev.install
60+
index 40f49bf..a4aa9b1 100644
61+
--- a/debian/libfreenect-dev.install
62+
+++ b/debian/libfreenect-dev.install
63+
@@ -1,4 +1,4 @@
64+
usr/include/libfreenect*
65+
-usr/lib/*/*.so
66+
-usr/lib/*/fakenect/*.so
67+
-usr/lib/*/pkgconfig/*
68+
+usr/lib/*.so
69+
+usr/lib/fakenect/*.so
70+
+usr/lib/pkgconfig/*
71+
diff --git a/debian/libfreenect0.1.install b/debian/libfreenect0.1.install
72+
index 475934d..9bd042d 100644
73+
--- a/debian/libfreenect0.1.install
74+
+++ b/debian/libfreenect0.1.install
75+
@@ -1,2 +1,2 @@
76+
-usr/lib/*/*.so.*
77+
-usr/lib/*/fakenect/*.so.*
78+
+usr/lib/*.so.*
79+
+usr/lib/fakenect/*.so.*
80+
diff --git a/debian/rules b/debian/rules
81+
index 44e37d7..986c711 100755
82+
--- a/debian/rules
83+
+++ b/debian/rules
84+
@@ -1,16 +1,16 @@
85+
#!/usr/bin/make -f
86+
# -*- makefile -*-
87+
88+
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,-Bsymbolic-functions -Wl,--as-needed
89+
-export MA_TRIPLET=`dpkg-architecture -qDEB_HOST_MULTIARCH`
90+
+export LDFLAGS=-Wl,-Bsymbolic-functions -Wl,--as-needed
91+
92+
%:
93+
- dh $@ --with python2
94+
+ dh $@
95+
96+
override_dh_auto_configure:
97+
- dh_auto_configure -- -DBUILD_PYTHON:Bool=True -DPROJECT_LIBRARY_INSTALL_DIR="lib/$(MA_TRIPLET)"
98+
+ dh_auto_configure -- -DBUILD_PYTHON:Bool=True
99+
100+
-override_dh_auto_build-indep:
101+
+override_dh_auto_build:
102+
+ dh_auto_build
103+
ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
104+
doxygen debian/doxygen.conf
105+
else
106+
@@ -25,8 +25,8 @@ override_dh_auto_install:
107+
mv debian/tmp/usr/bin/glpclview debian/tmp/usr/bin/freenect-glpclview
108+
mv debian/tmp/usr/bin/cppview debian/tmp/usr/bin/freenect-cppview
109+
110+
-override_dh_python2:
111+
- dh_python2 -p python-freenect
112+
+override_dh_pysupport:
113+
+ dh_pysupport -ppython-freenect
114+
if [ -x /usr/bin/dh_numpy ]; then dh_numpy -ppython-freenect; fi
115+
116+
override_dh_installdocs:
117+
@@ -35,5 +35,6 @@ override_dh_installdocs:
118+
override_dh_makeshlibs:
119+
dh_makeshlibs -Xfakenect
120+
121+
-override_dh_clean-indep:
122+
+override_dh_clean:
123+
rm -rf debian/html
124+
+ dh_clean
125+
--
126+
1.7.10
127+

debian/patches/oneiric-dsc-patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
link-flags-oldway-dh-noindep-rules.patch
1+
neurodebian-backport.patch

debian/patches/squeeze-dsc-patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
link-flags-oldway-dh-noindep-rules.patch
1+
neurodebian-backport.patch

0 commit comments

Comments
 (0)