[Pkg-phototools-commits] [SCM] openjpeg packaging branch, master, updated. 1.3+dfsg-4-62-g446710c

[Mathieu Malaterre]

The following commit has been merged in the master branch:
commit 446710ced97ba8e0685f34fd33a00e99e26cae0a
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date:   Thu Apr 19 13:48:52 2012 +0200

    Make sure to use multi-arch even for jni/ installed modules

diff --git a/debian/libopenjpeg-java.install b/debian/libopenjpeg-java.install
index 60a5b04..28e4812 100644
--- a/debian/libopenjpeg-java.install
+++ b/debian/libopenjpeg-java.install
@@ -1 +1 @@
-debian/tmp/usr/lib/*/libopenjpegjni.so usr/lib/jni
+usr/lib/*/jni/libopenjpegjni.so
diff --git a/debian/patches/installjava.patch b/debian/patches/installjava.patch
index 688238a..14fe16f 100644
--- a/debian/patches/installjava.patch
+++ b/debian/patches/installjava.patch
@@ -1,7 +1,7 @@
-Index: openjpeg-1.5.0/applications/JavaOpenJPEG/CMakeLists.txt
+Index: openjpeg/applications/JavaOpenJPEG/CMakeLists.txt
 ===================================================================
---- openjpeg-1.5.0.orig/applications/JavaOpenJPEG/CMakeLists.txt	2012-04-19 12:54:35.481899188 +0200
-+++ openjpeg-1.5.0/applications/JavaOpenJPEG/CMakeLists.txt	2012-04-19 12:57:20.257452866 +0200
+--- openjpeg.orig/applications/JavaOpenJPEG/CMakeLists.txt	2012-04-19 13:39:11.000000000 +0200
++++ openjpeg/applications/JavaOpenJPEG/CMakeLists.txt	2012-04-19 13:44:48.859653460 +0200
 @@ -4,6 +4,9 @@
  SET(openjpegjni_SRCS
    JavaOpenJPEGDecoder.c
@@ -26,7 +26,7 @@ Index: openjpeg-1.5.0/applications/JavaOpenJPEG/CMakeLists.txt
 +
 +INSTALL(TARGETS openjpegjni
 +  EXPORT OpenJPEGTargets
-+  LIBRARY DESTINATION ${OPENJPEG_INSTALL_JNI_DIR} COMPONENT Libraries
++  LIBRARY DESTINATION ${OPENJPEG_INSTALL_JNI_DIR}/jni COMPONENT Libraries
 +)
  
  # build jar:
diff --git a/debian/rules b/debian/rules
index 62fc1b8..6941dc2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,9 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
+	# technically a java module should not need a SONAME, use a trick from python module+cmake
+	# http://lists.debian.org/debian-python/2012/04/msg00059.html
+	sed -i -e 's/ -Wl,-soname,[^ ]\+ / /' obj-*/applications/JavaOpenJPEG/CMakeFiles/openjpegjni.dir/link.txt
 
 override_dh_strip:
 	dh_strip --dbg-package=libopenjpeg5-dbg

-- 
openjpeg packaging