[SCM] openni-sensor-primesense/master: Revert "Bump SONAME"

Thu Jun 13 09:31:28 UTC 2013

The following commit has been merged in the master branch:
commit 82584167ede1eb27f55be2070ce142f37e0e320e
Author: Jochen Sprickerhof <jochen at sprickerhof.de>
Date:   Thu Jun 13 10:41:31 2013 +0200

    Revert "Bump SONAME"
    
    This reverts commit 846a9675ec7e82be9794afacd1d504231df926ae.

diff --git a/debian/control b/debian/control
index 99b0255..9cdccda 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libopenni-sensor-primesense1 (= ${binary:Version})
-Description: Headers for using Microsoft Kinect sensor OpenNI modules
+         libopenni-sensor-primesense0 (= ${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
@@ -27,7 +27,7 @@ Description: Headers for using Microsoft Kinect sensor OpenNI modules
  .
  This package provides the headers for building against these sensor modules.
 
-Package: libopenni-sensor-primesense1
+Package: libopenni-sensor-primesense0
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
diff --git a/debian/libopenni-sensor-primesense1.install b/debian/libopenni-sensor-primesense0.install
similarity index 90%
rename from debian/libopenni-sensor-primesense1.install
rename to debian/libopenni-sensor-primesense0.install
index ad31c58..a18da43 100644
--- a/debian/libopenni-sensor-primesense1.install
+++ b/debian/libopenni-sensor-primesense0.install
@@ -1,3 +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/lib/libopenni-sensor-primesense1/
+Platform/Linux/Bin/*-Release/XnSensorServer usr/lib/libopenni-sensor-primesense0/
diff --git a/debian/libopenni-sensor-primesense1.modprobe b/debian/libopenni-sensor-primesense0.modprobe
similarity index 100%
rename from debian/libopenni-sensor-primesense1.modprobe
rename to debian/libopenni-sensor-primesense0.modprobe
diff --git a/debian/libopenni-sensor-primesense1.postinst b/debian/libopenni-sensor-primesense0.postinst
similarity index 86%
rename from debian/libopenni-sensor-primesense1.postinst
rename to debian/libopenni-sensor-primesense0.postinst
index 0d393e1..0b74fec 100644
--- a/debian/libopenni-sensor-primesense1.postinst
+++ b/debian/libopenni-sensor-primesense0.postinst
@@ -3,7 +3,7 @@
 set -e
 
 MODULE_DIR="/usr/lib/"
-MODULES="libXnDeviceSensorV2.so.1 libXnDeviceFile.so.1"
+MODULES="libXnDeviceSensorV2.so.0 libXnDeviceFile.so.0"
 
 case "$1" in
     configure)
diff --git a/debian/libopenni-sensor-primesense1.prerm b/debian/libopenni-sensor-primesense0.prerm
similarity index 86%
rename from debian/libopenni-sensor-primesense1.prerm
rename to debian/libopenni-sensor-primesense0.prerm
index 2b1062a..6c00f28 100644
--- a/debian/libopenni-sensor-primesense1.prerm
+++ b/debian/libopenni-sensor-primesense0.prerm
@@ -3,7 +3,8 @@
 set -e
 
 MODULE_DIR="/usr/lib/"
-MODULES="libXnDeviceSensorV2.so.1 libXnDeviceFile.so.1"
+MODULES="libXnDeviceSensorV2.so.0 libXnDeviceFile.so.0"
+
 
 case "$1" in
     remove)
diff --git a/debian/libopenni-sensor-primesense1.udev b/debian/libopenni-sensor-primesense0.udev
similarity index 100%
rename from debian/libopenni-sensor-primesense1.udev
rename to debian/libopenni-sensor-primesense0.udev
diff --git a/debian/patches/0013-Add-SONAME-to-libraries.patch b/debian/patches/0013-Add-SONAME-to-libraries.patch
index 1886c93..e94365d 100644
--- a/debian/patches/0013-Add-SONAME-to-libraries.patch
+++ b/debian/patches/0013-Add-SONAME-to-libraries.patch
@@ -7,7 +7,7 @@ Subject: Add SONAME to libraries
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Platform/Linux/Build/Common/CommonCppMakefile b/Platform/Linux/Build/Common/CommonCppMakefile
-index 5a15c82..a6ab68a 100644
+index 5a15c82..b6bbfe4 100644
 --- a/Platform/Linux/Build/Common/CommonCppMakefile
 +++ b/Platform/Linux/Build/Common/CommonCppMakefile
 @@ -77,8 +77,8 @@ ifneq "$(LIB_NAME)" ""
@@ -16,7 +16,7 @@ index 5a15c82..a6ab68a 100644
  		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.1
++		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
diff --git a/debian/patches/0016-Move-XnSensorServer-to-usr-lib-libopenni-sensor-prim.patch b/debian/patches/0016-Move-XnSensorServer-to-usr-lib-libopenni-sensor-prim.patch
index 70d77fc..2e588d3 100644
--- a/debian/patches/0016-Move-XnSensorServer-to-usr-lib-libopenni-sensor-prim.patch
+++ b/debian/patches/0016-Move-XnSensorServer-to-usr-lib-libopenni-sensor-prim.patch
@@ -1,13 +1,13 @@
 From: Jochen Sprickerhof <jochen at sprickerhof.de>
 Date: Thu, 20 Dec 2012 20:33:14 +0100
-Subject: Move XnSensorServer to /usr/lib/libopenni-sensor-primesense1
+Subject: Move XnSensorServer to /usr/lib/libopenni-sensor-primesense0
 
 ---
  Source/XnDeviceSensorV2/XnSensorClient.cpp |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Source/XnDeviceSensorV2/XnSensorClient.cpp b/Source/XnDeviceSensorV2/XnSensorClient.cpp
-index 269ddda..d171e9b 100644
+index 269ddda..782b281 100644
 --- a/Source/XnDeviceSensorV2/XnSensorClient.cpp
 +++ b/Source/XnDeviceSensorV2/XnSensorClient.cpp
 @@ -887,7 +887,7 @@ XnStatus XnSensorClient::StartServerProcess()
@@ -15,7 +15,7 @@ index 269ddda..d171e9b 100644
  	nRetVal = GetModuleDir(strServerDir);
  #elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_MACOSX)
 -	sprintf(strServerDir, "/usr/bin");
-+	sprintf(strServerDir, "/usr/lib/libopenni-sensor-primesense1");
++	sprintf(strServerDir, "/usr/lib/libopenni-sensor-primesense0");
  #endif
  
  	XnChar strProcessName[XN_FILE_MAX_PATH];

-- 
openni-sensor-primesense packaging

