[SCM] OCE packaging branch, debian, updated. debian/0.10-2-5-ge059424

[Denis Barbier]

The following commit has been merged in the debian branch:
commit 50b908853a7f392f61895cfd0f517e36dcfc103e
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sat Aug 4 16:00:12 2012 +0200

    Move usr/include/oce/oce_build_config.defs into usr/include/oce/<triplet>/
    
    Overwrite libFWOSPlugin-3.so symlink if it does already exist.

diff --git a/debian/liboce-foundation-dev.install b/debian/liboce-foundation-dev.install
index ee161d0..8762e3d 100644
--- a/debian/liboce-foundation-dev.install
+++ b/debian/liboce-foundation-dev.install
@@ -2,7 +2,7 @@ usr/lib/*/oce-*/OCE01_FoundationTargets*.cmake
 usr/lib/*/oce-*/OCEConfig.cmake
 usr/lib/*/oce-*/OCEConfigVersion.cmake
 
-usr/include/oce/oce_build_config.defs
+usr/include/oce/*/oce_build_config.defs
 usr/include/oce/oce-config.h
 
 #   PACKAGES = TKernel TKMath TKAdvTools
diff --git a/debian/rules b/debian/rules
index c77fead..b393c9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,8 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	dh_auto_install
+	-mkdir debian/tmp/usr/include/oce/$(DEB_HOST_MULTIARCH)
+	mv debian/tmp/usr/include/oce/oce_build_config.defs debian/tmp/usr/include/oce/$(DEB_HOST_MULTIARCH)/oce_build_config.defs
 	# Improve integration in Debian desktop
 	install -d debian/tmp/usr/share/applications
 	cp -p debian/oce-draw.desktop debian/tmp/usr/share/applications/
@@ -49,7 +51,7 @@ override_dh_install:
 	rm -rf debian/oce-draw/usr/include
 	# Allow using plugins when liboce-ocaf-lite-dev is not installed, see #683374
 	sed -i -e 's/FWOSPlugin$$/&-3/' debian/liboce-foundation3/usr/share/oce-0.10/src/StdResource/Plugin
-	ln -s libFWOSPlugin.so.3 debian/liboce-ocaf-lite3/usr/lib/$(DEB_HOST_MULTIARCH)/libFWOSPlugin-3.so
+	ln -sf libFWOSPlugin.so.3 debian/liboce-ocaf-lite3/usr/lib/$(DEB_HOST_MULTIARCH)/libFWOSPlugin-3.so
 
 override_dh_makeshlibs:
 	dh_makeshlibs -Noce-draw

-- 
OCE packaging