[SCM] openni-sensor-avin2-sensorkinect/master: Add patch to set SONAME and split packages accordingly

jspricke-guest at users.alioth.debian.org jspricke-guest at users.alioth.debian.org
Thu Oct 23 13:44:31 UTC 2014 

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

    Add patch to set SONAME and split packages accordingly

diff --git a/debian/TODO b/debian/TODO
index d054c5f..71693ca 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -4,8 +4,3 @@ 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
-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
-E: openni-sensor-primesense-kinect: sharedobject-in-library-directory-missing-soname usr/lib/libXnDeviceSensorV2KM.so
-E: openni-sensor-primesense-kinect: sharedobject-in-library-directory-missing-soname usr/lib/libXnFormats.so
diff --git a/debian/control b/debian/control
index 0954308..47f07cd 100644
--- a/debian/control
+++ b/debian/control
@@ -12,11 +12,12 @@ Homepage: http://www.openni.org
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/openni-sensor-avin2-sensorkinect.git
 Vcs-Browser: http://anonscm.debian.org/git/pkg-multimedia/openni-sensor-avin2-sensorkinect.git
 
-Package: openni-sensor-avin2-sensorkinect
+Package: openni-sensor-avin2-sensorkinect0
+Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libopenni (>= 1.1.0.41)
+         openni-utils
 Description:  Microsoft Kinect sensor modules for the OpenNI framework
  OpenNI is a framework for getting data to support 'Natural Interaction',
  i.e. skeleton tracking, gesture tracking, and similar ways of getting data
@@ -26,3 +27,34 @@ Description:  Microsoft Kinect sensor modules for the OpenNI framework
  .
  This module is an unofficial 'avin2' branch of PrimeSense Sensors patched for
  Kinect support.
+
+Package: openni-sensor-avin2-sensorkinect-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         openni-sensor-avin2-sensorkinect0 (= ${binary:Version})
+Description:  Microsoft Kinect sensor modules for the OpenNI framework
+ OpenNI is a framework for getting data to support 'Natural Interaction',
+ i.e. skeleton tracking, gesture tracking, and similar ways of getting data
+ from humans. This package provides modules for OpenNI that get the data from
+ the Kinect camera for processing with the OpenNI Middleware, like PrimeSense
+ NITE.
+ .
+ This module is an unofficial 'avin2' branch of PrimeSense Sensors patched for
+ Kinect support.
+
+Package: openni-sensor-avin2-sensorkinect-bin
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description:  Microsoft Kinect sensor modules for the OpenNI framework
+ OpenNI is a framework for getting data to support 'Natural Interaction',
+ i.e. skeleton tracking, gesture tracking, and similar ways of getting data
+ from humans. This package provides modules for OpenNI that get the data from
+ the Kinect camera for processing with the OpenNI Middleware, like PrimeSense
+ NITE.
+ .
+ This module is an unofficial 'avin2' branch of PrimeSense Sensors patched for
+ Kinect support. This package provides the XnSensorServer tool.
diff --git a/debian/openni-sensor-avin2-sensorkinect-bin.install b/debian/openni-sensor-avin2-sensorkinect-bin.install
new file mode 100644
index 0000000..35be461
--- /dev/null
+++ b/debian/openni-sensor-avin2-sensorkinect-bin.install
@@ -0,0 +1 @@
+Platform/Linux/Bin/*-Release/XnSensorServer usr/bin/
diff --git a/debian/openni-sensor-avin2-sensorkinect-dev.install b/debian/openni-sensor-avin2-sensorkinect-dev.install
new file mode 100644
index 0000000..fd6805a
--- /dev/null
+++ b/debian/openni-sensor-avin2-sensorkinect-dev.install
@@ -0,0 +1 @@
+Platform/Linux/Bin/*-Release/*.so usr/lib/
diff --git a/debian/openni-sensor-avin2-sensorkinect.install b/debian/openni-sensor-avin2-sensorkinect.install
deleted file mode 100644
index 4ccf38d..0000000
--- a/debian/openni-sensor-avin2-sensorkinect.install
+++ /dev/null
@@ -1,3 +0,0 @@
-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-sensorkinect0.install b/debian/openni-sensor-avin2-sensorkinect0.install
new file mode 100644
index 0000000..cbbe6b2
--- /dev/null
+++ b/debian/openni-sensor-avin2-sensorkinect0.install
@@ -0,0 +1,2 @@
+Platform/Linux/Bin/*-Release/*.so.* usr/lib/
+Platform/Linux/Redist/Sensor-Bin-Linux-*/Config/*.ini etc/openni
diff --git a/debian/openni-sensor-avin2-sensorkinect.modprobe b/debian/openni-sensor-avin2-sensorkinect0.modprobe
similarity index 100%
rename from debian/openni-sensor-avin2-sensorkinect.modprobe
rename to debian/openni-sensor-avin2-sensorkinect0.modprobe
diff --git a/debian/postinst b/debian/openni-sensor-avin2-sensorkinect0.postinst
similarity index 55%
rename from debian/postinst
rename to debian/openni-sensor-avin2-sensorkinect0.postinst
index d6d8a2f..3b0210b 100644
--- a/debian/postinst
+++ b/debian/openni-sensor-avin2-sensorkinect0.postinst
@@ -3,11 +3,11 @@
 set -e
 
 MODULE_DIR="/usr/lib/"
-MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so"
+MODULES="libXnDeviceSensorV2KM.so.0 libXnDeviceFile.so.0"
 
 if [ "$1" = "configure" ]; then
 	for module in $MODULES; do
-		niReg -r $MODULE_DIR/$module /etc/primesense
+		niReg -r $MODULE_DIR/$module /etc/openni
 	done
 fi
 
diff --git a/debian/prerm b/debian/openni-sensor-avin2-sensorkinect0.prerm
similarity index 55%
rename from debian/prerm
rename to debian/openni-sensor-avin2-sensorkinect0.prerm
index e7712df..6ef247b 100644
--- a/debian/prerm
+++ b/debian/openni-sensor-avin2-sensorkinect0.prerm
@@ -3,11 +3,11 @@
 set -e
 
 MODULE_DIR="/usr/lib/"
-MODULES="libXnDeviceSensorV2.so libXnDeviceFile.so"
+MODULES="libXnDeviceSensorV2.so.0 libXnDeviceFile.so.0"
 
 if [ "$1" = "remove" ]; then
 	for module in $MODULES; do
-		niReg -u $MODULE_DIR/$module /etc/primesense
+		niReg -u $MODULE_DIR/$module /etc/openni
 	done
 fi
 
diff --git a/debian/openni-sensor-avin2-sensorkinect.udev b/debian/openni-sensor-avin2-sensorkinect0.udev
similarity index 100%
rename from debian/openni-sensor-avin2-sensorkinect.udev
rename to debian/openni-sensor-avin2-sensorkinect0.udev
diff --git a/debian/patches/0004-Add-SONAME-to-libraries.patch b/debian/patches/0004-Add-SONAME-to-libraries.patch
new file mode 100644
index 0000000..24d86de
--- /dev/null
+++ b/debian/patches/0004-Add-SONAME-to-libraries.patch
@@ -0,0 +1,23 @@
+From: Jochen Sprickerhof <jochen at sprickerhof.de>
+Date: Wed, 11 Jul 2012 16:32:21 +0200
+Subject: Add SONAME to libraries
+
+---
+ Platform/Linux/Build/Common/CommonCppMakefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Platform/Linux/Build/Common/CommonCppMakefile b/Platform/Linux/Build/Common/CommonCppMakefile
+index 5a15c82..b6bbfe4 100644
+--- a/Platform/Linux/Build/Common/CommonCppMakefile
++++ b/Platform/Linux/Build/Common/CommonCppMakefile
+@@ -77,8 +77,8 @@ ifneq "$(LIB_NAME)" ""
+ 	CFLAGS += -fPIC -fvisibility=hidden
+ 	ifneq ("$(OSTYPE)","Darwin")
+ 		LDFLAGS += -Wl,--no-undefined
+-		OUTPUT_NAME = lib$(LIB_NAME).so
+-		OUTPUT_COMMAND = $(CXX) -o $(OUTPUT_FILE) $(OBJ_FILES) $(LDFLAGS) -shared
++		OUTPUT_NAME = lib$(LIB_NAME).so.0
++		OUTPUT_COMMAND = $(CXX) -o $(OUTPUT_FILE) $(OBJ_FILES) $(LDFLAGS) -shared -Wl,-soname,${OUTPUT_NAME} && cd ${OUT_DIR} && ln -fs ${OUTPUT_NAME} lib${LIB_NAME}.so
+ 	else
+ 		LDFLAGS += -undefined error
+ 		OUTPUT_NAME = lib$(LIB_NAME).dylib
diff --git a/debian/patches/series b/debian/patches/series
index 4993576..780103c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Don-t-build-in-parallel-because-not-all-dependencies.patch
 0002-Disable-SSE.patch
 0003-Don-t-write-log-file-upon-OpenNI-invocation.patch
+0004-Add-SONAME-to-libraries.patch

-- 
openni-sensor-avin2-sensorkinect packaging

More information about the pkg-multimedia-commits mailing list