[med-svn] [SCM] vistaio branch, master, updated. upstream/1.2.14-15-g6f7b555

[Gert Wollny]

The following commit has been merged in the master branch:
commit 073628246df2151a3320180b0eaf4799651e938d
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Wed Nov 28 19:16:02 2012 +0100

    add multiarch patch

diff --git a/debian/patches/cmake-multiarch-install.patch b/debian/patches/cmake-multiarch-install.patch
new file mode 100644
index 0000000..4cbbc89
--- /dev/null
+++ b/debian/patches/cmake-multiarch-install.patch
@@ -0,0 +1,33 @@
+Description: Enable multiarch install on Debian 
+ Ths patch enables the multiarch install by using the corresponding 
+ cmake variables for the install targets. 
+ vistaio (1.2.14-1) UNRELEASED; urgency=low
+ .
+   * Initial packaging (Closes:  #694434)
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Bug-Debian: http://bugs.debian.org/694434
+
+---
+Origin: upstream
+Last-Update: 2012-11-28
+
+--- vistaio-1.2.14.orig/vistaio/CMakeLists.txt
++++ vistaio-1.2.14/vistaio/CMakeLists.txt
+@@ -68,10 +68,12 @@ ADD_SIMPLE_TEST(2dspline)
+ 
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/vconfig.h)
+ 
+-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/vconfig.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${VISTAIO_NAME}/vistaio)
+-INSTALL(FILES ${VISTAIO_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${VISTAIO_NAME}/vistaio)
++INCLUDE(GNUInstallDirs)
++
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/vconfig.h DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${VISTAIO_NAME}/vistaio)
++INSTALL(FILES ${VISTAIO_HEADERS} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${VISTAIO_NAME}/vistaio)
+ INSTALL(TARGETS vistaio 
+-	RUNTIME DESTINATION "bin"
+-	LIBRARY DESTINATION "lib"
+-	ARCHIVE DESTINATION "lib")
++	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..77f65e3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+cmake-multiarch-install.patch

-- 
Packaging of vistaio in Debian