[SCM] openni-sensor-avin2-sensorkinect/master: Fix rules (rely on debhelper for installation, update cleanup target)

[jspricke-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6419ca9cf585252558a80e0b0f208d0e0818b98b
Author: Jochen Sprickerhof <jochen at sprickerhof.de>
Date:   Wed Jul 11 16:58:02 2012 +0200

    Fix rules (rely on debhelper for installation, update cleanup target)

diff --git a/debian/TODO b/debian/TODO
index 59c17db..d054c5f 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -4,8 +4,6 @@ E: openni-sensor-primesense-kinect: embedded-library usr/lib/libXnFormats.so: li
 W: openni-sensor-primesense-kinect: new-package-should-close-itp-bug
 W: openni-sensor-primesense-kinect: wrong-bug-number-in-closes l3:#XXXXXX
 W: openni-sensor-primesense-kinect: binary-without-manpage usr/bin/XnSensorServer
-W: openni-sensor-primesense-kinect: executable-not-elf-or-script lib/udev/rules.d/55-primesense-usb.rules
-W: openni-sensor-primesense-kinect: executable-not-elf-or-script etc/primesense/GlobalDefaultsKinect.ini
 E: openni-sensor-primesense-kinect: sharedobject-in-library-directory-missing-soname usr/lib/libXnCore.so
 E: openni-sensor-primesense-kinect: sharedobject-in-library-directory-missing-soname usr/lib/libXnDDK.so
 E: openni-sensor-primesense-kinect: sharedobject-in-library-directory-missing-soname usr/lib/libXnDeviceFile.so
diff --git a/debian/openni-sensor-avin2-sensorkinect.install b/debian/openni-sensor-avin2-sensorkinect.install
new file mode 100644
index 0000000..4ccf38d
--- /dev/null
+++ b/debian/openni-sensor-avin2-sensorkinect.install
@@ -0,0 +1,3 @@
+Platform/Linux/Bin/*-Release/*.so usr/lib/
+Platform/Linux/Redist/Sensor-Bin-Linux-*/Config/*.ini etc/openni
+Platform/Linux/Bin/*-Release/XnSensorServer usr/bin/
diff --git a/debian/openni-sensor-avin2-sensorkinect.modprobe b/debian/openni-sensor-avin2-sensorkinect.modprobe
new file mode 120000
index 0000000..4bd5b05
--- /dev/null
+++ b/debian/openni-sensor-avin2-sensorkinect.modprobe
@@ -0,0 +1 @@
+../Platform/Linux/Install/blacklist-gspca-kinect.conf
\ No newline at end of file
diff --git a/debian/openni-sensor-avin2-sensorkinect.udev b/debian/openni-sensor-avin2-sensorkinect.udev
new file mode 120000
index 0000000..429f924
--- /dev/null
+++ b/debian/openni-sensor-avin2-sensorkinect.udev
@@ -0,0 +1 @@
+../Platform/Linux/Install/55-primesense-usb.rules
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index a8f94f7..10993db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,43 +1,19 @@
 #!/usr/bin/make -f
 
-PACKAGE = openni-sensor-avin2-sensorkinect
-
-COMPILED_BASE = $(CURDIR)/Platform/Linux-x86/Redist
-SENSOR_BASE = $(CURDIR)/debian/$(PACKAGE)
-
-prefix = /usr
-bindir = $(prefix)/bin
-libdir = $(prefix)/lib
-includedir = $(prefix)/include
-docdir = $(prefix)/share/doc
-etcdir = /etc/primesense
-logdir = /var/log/primesense/XnSensorServer
-usbruledir = /lib/udev/rules.d
-
 %:
 	dh $@ --buildsystem=makefile
 
 override_dh_auto_build:
-	cd Platform/Linux-x86/CreateRedist && ./RedistMaker
-
-override_dh_auto_install:
-	install -d $(SENSOR_BASE)/$(etcdir)
-	install -p $(COMPILED_BASE)/Config/*.ini $(SENSOR_BASE)/$(etcdir)
-	chmod a-wx $(SENSOR_BASE)/$(etcdir)/*
-	install -d $(CURDIR)/debian/$(PACKAGE)/$(libdir)
-	install -p $(COMPILED_BASE)/Lib/* $(SENSOR_BASE)/$(libdir)
-	install -d $(SENSOR_BASE)/$(bindir)
-	install -p $(COMPILED_BASE)/Bin/* $(SENSOR_BASE)/$(bindir)
-	chmod u+s $(SENSOR_BASE)/$(bindir)/XnSensorServer
-	install -d $(SENSOR_BASE)/var/log/primesense/XnSensorServer
-	install -d $(SENSOR_BASE)/$(usbruledir)
-	install -p $(COMPILED_BASE)/Install/*.rules $(SENSOR_BASE)/$(usbruledir)
-	chmod a-x $(SENSOR_BASE)/$(usbruledir)/*
-
-override_dh_fixperms:
-	dh_fixperms -XXnSensorServer
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf -- $(CURDIR)/Platform/Linux-x86/CreateRedist/Final
-	rm -rf -- $(CURDIR)/Platform/Linux-x86/CreateRedist/Output
+	cd Platform/Linux/CreateRedist && ./RedistMaker
+
+override_dh_clean:
+	dh_clean -X Platform/Win32/CreateRedist/EE_NI/Includes/EENIVariables.wxi.bak
+	rm -rf -- Platform/Linux/Bin/
+	rm -rf -- Platform/Linux/Build/Utils/XnSensorServer/*-Release/
+	rm -rf -- Platform/Linux/Build/XnCore/*-Release/
+	rm -rf -- Platform/Linux/Build/XnDDK/*-Release/
+	rm -rf -- Platform/Linux/Build/XnDeviceFile/*-Release/
+	rm -rf -- Platform/Linux/Build/XnDeviceSensorV2/*-Release/
+	rm -rf -- Platform/Linux/Build/XnFormats/*-Release/
+	rm -rf -- Platform/Linux/CreateRedist/Final/
+	rm -rf -- Platform/Linux/Redist/

-- 
openni-sensor-avin2-sensorkinect packaging