The following commit has been merged in the master branch:
commit 9b267bd7bbd62e1ce7cd7921c1cd0efcb111a9bd
Author: Gert Wollny <[email protected]>
Date: Wed Nov 28 19:20:02 2012 +0100
add multiarch patch
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7441748..8af2927 100644
--- a/CMakeLists.txt
+++ b/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_DIR}/libvistaio.pc.cmake ${CMAKE_CURRENT_B
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}")
diff --git a/debian/patches/cmake-multiarch-install.patch
b/debian/patches/cmake-multiarch-install.patch
deleted file mode 100644
index 4cbbc89..0000000
--- a/debian/patches/cmake-multiarch-install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 <[email protected]>
-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
deleted file mode 100644
index 77f65e3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-cmake-multiarch-install.patch
diff --git a/vistaio/CMakeLists.txt b/vistaio/CMakeLists.txt
index cbc9f95..4e6fb51 100644
--- a/vistaio/CMakeLists.txt
+++ b/vistaio/CMakeLists.txt
@@ -68,8 +68,6 @@ ADD_SIMPLE_TEST(2dspline)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vconfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/vconfig.h)
-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
--
Packaging of vistaio in Debian
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
