Bug#754164: libvisp2.9: arch-dependent file in "Multi-Arch: same" package

[Fabien Spindler]

Attached you will find a patch that fixes this issue.

It consists in installing plugins.cfg rather 
/usr/lib/<arch-triplet>/visp/data/ogre-simulator

Best regards
Fabien

Le 08/07/14 12:04, Jakub Wilk a écrit :
> Package: libvisp2.9
> Version: 2.9.0-1
> Severity: important
> User: multiarch-devel at lists.alioth.debian.org
> Usertags: multiarch
>
> libvisp2.9 is marked as "Multi-Arch: same", but the following file is 
> architecture-dependent:
>
> /usr/share/visp/data/ogre-simulator/plugins.cfg
>
> An example diff between i386 and amd64 is attached.
>

-------------- next part --------------
From 38801f5680f05dd508e89d6ae29bc3f25ac287e9 Mon Sep 17 00:00:00 2001
From: Fabien Spindler <Fabien.Spindler at inria.fr>
Date: Wed, 9 Jul 2014 08:06:32 +0200
Subject: [PATCH 2/3] Fix plugings.cfg multi arch support

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b44006..d6ee2b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -840,7 +840,7 @@ IF(USE_OGRE)
       if(OGRE_PLUGIN_DIR_REL)
         INSTALL(FILES
           ${VISP_HAVE_OGRE_PLUGINS_PATH}/plugins.cfg
-          DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/ogre-simulator
+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/visp/data/ogre-simulator
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
           COMPONENT libraries
           )
@@ -848,7 +848,7 @@ IF(USE_OGRE)
       if(OGRE_PLUGIN_DIR_DBG)
         INSTALL(FILES
           ${VISP_HAVE_OGRE_PLUGINS_PATH}/plugins_d.cfg
-          DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/ogre-simulator
+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/visp/data/ogre-simulator
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
           COMPONENT libraries
           )
@@ -2097,7 +2097,7 @@ if(VISP_INSTALL_DIR_OGRE_RESOURCES)
 endif()
 # Only if plugins.cfg created by hand, we change the path to plugins.cfg in install/vpConfig.h
 if(VISP_INSTALL_DIR_OGRE_RESOURCES)
-  SET(VISP_HAVE_OGRE_PLUGINS_PATH ${VISP_ROOT_DIR_DATA_CONFIGCMAKE}/data/ogre-simulator)
+  SET(VISP_HAVE_OGRE_PLUGINS_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/visp/data/ogre-simulator)
 endif()
 
 # Generate the package dependent file include/visp/vpConfig.h
-- 
2.0.0