[SCM] openni/master: Add patch to add SONAME and rename packages accordingly
eighthave at users.alioth.debian.org
eighthave at users.alioth.debian.org
Mon May 20 03:25:49 UTC 2013
The following commit has been merged in the master branch:
commit f74a4bdf37d272c2d29ed35c1aa525740ec9687b
Author: Jochen Sprickerhof <jochen at sprickerhof.de>
Date: Fri Jul 6 14:17:21 2012 +0200
Add patch to add SONAME and rename packages accordingly
diff --git a/debian/TODO b/debian/TODO
index 24182d3..a641a89 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -3,8 +3,3 @@ E: openni source: missing-build-dependency quilt
W: openni-doc: embedded-javascript-library usr/share/doc/openni-unstable-doc/html/jquery.js
E: libopenni: embedded-library usr/lib/libOpenNI.so: tinyxml
E: libopenni: embedded-library usr/lib/libnimCodecs.so: libjpeg
-E: libopenni: sharedobject-in-library-directory-missing-soname usr/lib/libOpenNI.so
-E: libopenni: sharedobject-in-library-directory-missing-soname usr/lib/libnimCodecs.so
-E: libopenni: sharedobject-in-library-directory-missing-soname usr/lib/libnimMockNodes.so
-E: libopenni: sharedobject-in-library-directory-missing-soname usr/lib/libnimRecorder.so
-
diff --git a/debian/control b/debian/control
index 0d4d319..556f4fc 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Homepage: http://www.openni.org
Vcs-Git: git://anonscm.debian.org/pkg-multimedia/openni.git
Vcs-Browser: http://anonscm.debian.org/git/pkg-multimedia/openni.git
-Package: libopenni
+Package: libopenni0
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends},
@@ -53,7 +53,7 @@ Section: libdevel
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libopenni (= ${binary:Version})
+ libopenni0 (= ${binary:Version})
Suggests: openni-doc
Description: headers for OpenNI 'Natural Interaction' frameworks
OpenNI is a framework for getting data to support 'Natural Interaction',
diff --git a/debian/libopenni.install b/debian/libopenni0.install
similarity index 100%
rename from debian/libopenni.install
rename to debian/libopenni0.install
diff --git a/debian/patches/0002-Add-SONAME-to-libraries.patch b/debian/patches/0002-Add-SONAME-to-libraries.patch
new file mode 100644
index 0000000..1760d56
--- /dev/null
+++ b/debian/patches/0002-Add-SONAME-to-libraries.patch
@@ -0,0 +1,23 @@
+From: Jochen Sprickerhof <jochen at sprickerhof.de>
+Date: Wed, 4 Jul 2012 17:38:49 +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 c2c4afc..d4f24c4 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 32e1bfa..d33028f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-do-not-build-mono-samples.patch
+0002-Add-SONAME-to-libraries.patch
--
openni packaging
More information about the pkg-multimedia-commits
mailing list