1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
From 01a09e2538ee70a2d66c432df0a9d80d424c42d6 Mon Sep 17 00:00:00 2001
From: Nicolas Bourdaud <nicolas.bourdaud@gmail.com>
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.1.install | 4 ++--
debian/rules | 17 +++++++++--------
5 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/debian/compat b/debian/compat
index ec63514..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+7
diff --git a/debian/control b/debian/control
index eb5882a..eaf72c8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,9 @@ Section: libdevel
Priority: extra
Maintainer: Nicolas Bourdaud <nicolas.bourdaud@gmail.com>
Uploaders: Arne Bernin <arne@alamut.de>, Yaroslav Halchenko <debian@onerussian.com>, Mark Renouf <mark.renouf@gmail.com>
-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/gitweb/?p=pkg-exppsy/libfreenect.git
Package: libfreenect0.1
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 Kinect device
Package: libfreenect-dev
Architecture: any
-Multi-Arch: same
Depends: ${misc:Depends}, libfreenect0.1 (= ${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 Kinect device -- dummy package
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
diff --git a/debian/libfreenect-dev.install b/debian/libfreenect-dev.install
index 40f49bf..a4aa9b1 100644
--- 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/*
diff --git a/debian/libfreenect0.1.install b/debian/libfreenect0.1.install
index 475934d..9bd042d 100644
--- a/debian/libfreenect0.1.install
+++ b/debian/libfreenect0.1.install
@@ -1,2 +1,2 @@
-usr/lib/*/*.so.*
-usr/lib/*/fakenect/*.so.*
+usr/lib/*.so.*
+usr/lib/fakenect/*.so.*
diff --git a/debian/rules b/debian/rules
index 44e37d7..986c711 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,16 @@
#!/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 LDFLAGS=-Wl,-Bsymbolic-functions -Wl,--as-needed
%:
- dh $@ --with python2
+ dh $@
override_dh_auto_configure:
- dh_auto_configure -- -DBUILD_PYTHON:Bool=True -DPROJECT_LIBRARY_INSTALL_DIR="lib/$(MA_TRIPLET)"
+ dh_auto_configure -- -DBUILD_PYTHON:Bool=True
-override_dh_auto_build-indep:
+override_dh_auto_build:
+ dh_auto_build
ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
doxygen debian/doxygen.conf
else
@@ -25,8 +25,8 @@ override_dh_auto_install:
mv debian/tmp/usr/bin/glpclview debian/tmp/usr/bin/freenect-glpclview
mv debian/tmp/usr/bin/cppview debian/tmp/usr/bin/freenect-cppview
-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:
@@ -35,5 +35,6 @@ override_dh_installdocs:
override_dh_makeshlibs:
dh_makeshlibs -Xfakenect
-override_dh_clean-indep:
+override_dh_clean:
rm -rf debian/html
+ dh_clean
--
1.7.10
|
