Le 15/07/14 20:10, Thomas Moulard a écrit :
On Tue, Jul 15, 2014 at 7:46 PM, Fabien Spindler
<fabien.spind...@inria.fr> wrote:
Thomas,
I have attached a patch that fixes this issue.
Moreover debian/libvisp2.9.install need to be changed with
"usr/share/visp-2.9.0/data/"
And also debian/libvisp-dev.install to add the line "usr/lib/*/visp/data/"
since we introduce patch
0003-Install-OGRE-config-files-in-arch-specific-directory.patch
Thanks Fabien, I won't have time to apply this patch this week but I will
upload the next revision of the visp packages solving this bug next week.
Sorry, but my previous patch was corrupted. Attached the good version
that applies on CMakeLists.txt from upstream (and not the version where
patch 0001 and 0003 were applied previously).
Fabien
From d3e3f90b622b64031f0689a33cb26072ff97106d Mon Sep 17 00:00:00 2001
From: Fabien Spindler <fabien.spind...@inria.fr>
Date: Tue, 15 Jul 2014 22:58:28 +0200
Subject: [PATCH 2/2] Shared data are linked to a given version
---
CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b44006..133040a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -928,14 +928,14 @@ IF(USE_OGRE)
if(UNIX)
install(FILES
${VISP_BINARY_DIR}/install/resources.cfg
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/ogre-simulator
+ DESTINATION
${CMAKE_INSTALL_DATAROOTDIR}/visp-${VISP_VERSION}/data/ogre-simulator
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
COMPONENT libraries
)
if(OGRE_MEDIA_NOT_AVAILABLE)
install(DIRECTORY
data/ogre-simulator/media
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/ogre-simulator
+ DESTINATION
${CMAKE_INSTALL_DATAROOTDIR}/visp-${VISP_VERSION}/data/ogre-simulator
FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
COMPONENT libraries
)
@@ -2157,7 +2157,7 @@ IF(UNIX)
foreach(SCENE ${WIREFRAME_SCENES})
INSTALL(FILES
"${VISP_SOURCE_DIR}/src/simulator/wireframe-simulator/scene/${SCENE}"
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/wireframe-simulator
+ DESTINATION
${CMAKE_INSTALL_DATAROOTDIR}/visp-${VISP_VERSION}/data/wireframe-simulator
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
COMPONENT libraries
)
@@ -2165,7 +2165,7 @@ IF(UNIX)
foreach(SCENE ${ROBOT_ARMS_SCENES})
INSTALL(FILES
"${VISP_SOURCE_DIR}/src/robot/simulator-robot/arms/${SCENE}"
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/robot-simulator
+ DESTINATION
${CMAKE_INSTALL_DATAROOTDIR}/visp-${VISP_VERSION}/data/robot-simulator
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
COMPONENT libraries
)
--
2.0.0
--
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
