[visp] 01/03: Add patch to solve update failure detected by piuparts (Closes: #754657)

[Thomas Moulard]

This is an automated email from the git hooks/post-receive script.

thomas_moulard-guest pushed a commit to branch master
in repository visp.

commit 7844e374de301af8231d91103c50810c81dd6398
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date:   Sun Jul 20 15:39:39 2014 +0900

    Add patch to solve update failure detected by piuparts (Closes: #754657)
---
 ...txt-install-share-data-in-visp-VERSION-if.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 53 insertions(+)

diff --git a/debian/patches/0006-CMakeLists.txt-install-share-data-in-visp-VERSION-if.patch b/debian/patches/0006-CMakeLists.txt-install-share-data-in-visp-VERSION-if.patch
new file mode 100644
index 0000000..a019906
--- /dev/null
+++ b/debian/patches/0006-CMakeLists.txt-install-share-data-in-visp-VERSION-if.patch
@@ -0,0 +1,52 @@
+From: Fabien Spindler <fabien.spindler at inria.fr>
+Date: Sun, 20 Jul 2014 15:36:45 +0900
+Subject: CMakeLists.txt: install share data in visp-VERSION if necessary
+
+* CMakeLists.txt: install share data packaged in libvispX.Y in
+  visp-VERSION directory to avoid failures on updates.
+
+Origin: upstream, http://bugs.debian.org/754657
+Bug-Debian: http://bugs.debian.org/754657
+---
+ CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e370fb9..b5c6fac 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
+     )
diff --git a/debian/patches/series b/debian/patches/series
index 5383c13..ba85b07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Install-OGRE-config-files-in-arch-specific-directory.patch
 0004-Remove-commented-lines-in-visp-config.install.in.patch
 0005-Avoid-linking-against-useless-dependency-in-FindGSL..patch
+0006-CMakeLists.txt-install-share-data-in-visp-VERSION-if.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/visp.git