[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 379b79dae46d2cace64d402e38efcb184db69c1b
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Wed Nov 28 19:22:21 2012 +0100

    add multiarch patch

diff --git a/debian/patches/cmake-multiarch.patch b/debian/patches/cmake-multiarch.patch
new file mode 100644
index 0000000..13da59b
--- /dev/null
+++ b/debian/patches/cmake-multiarch.patch
@@ -0,0 +1,54 @@
+Description: Set multiarch install targets
+ This patch sets the proper install destinations for multiarch 
+ support. 
+ .
+ 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/CMakeLists.txt
++++ vistaio-1.2.14/CMakeLists.txt
+@@ -29,6 +29,7 @@ SET(MICRO_VERSION 14)
+ SET(INTERFACE_AGE 0)
+ SET(BINARY_AGE    0)
+ 
++INCLUDE(GNUInstallDirs)
+ 
+ MATH(EXPR VISTAIO_CURRENT "${MICRO_VERSION} - ${INTERFACE_AGE}")
+ MATH(EXPR VISTAIO_AGE     "${BINARY_AGE} - ${INTERFACE_AGE}")
+@@ -52,9 +53,8 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
+ 
+ SET(DOC_FILES Authors COPYING)
+ 
+-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libvistaio.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libvistaio.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig)
+ INSTALL(FILES ${DOC_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/${VISTAIO_NAME})
+-INSTALL(FILES vistaio.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${VISTAIO_NAME})
+-
++INSTALL(FILES vistaio.h DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${VISTAIO_NAME})
+ 
+ ADD_CUSTOM_TARGET(dist bash ${CMAKE_SOURCE_DIR}/create_package "${PACKAGE_NAME}" "${PACKAGE_VERSION}" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}")
+--- vistaio-1.2.14.orig/vistaio/CMakeLists.txt
++++ vistaio-1.2.14/vistaio/CMakeLists.txt
+@@ -68,10 +68,10 @@ 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)
++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..de4bc00
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+cmake-multiarch.patch

-- 
Packaging of vistaio in Debian