Author: malat-guest Date: 2008-12-22 13:15:26 +0000 (Mon, 22 Dec 2008) New Revision: 2830
Modified: trunk/packages/pvrg/trunk/debian/changelog trunk/packages/pvrg/trunk/debian/patches/cmakelists.txt.patch trunk/packages/pvrg/trunk/debian/pvrg.install trunk/packages/pvrg/trunk/debian/rules Log: update install Modified: trunk/packages/pvrg/trunk/debian/changelog =================================================================== --- trunk/packages/pvrg/trunk/debian/changelog 2008-12-22 11:27:13 UTC (rev 2829) +++ trunk/packages/pvrg/trunk/debian/changelog 2008-12-22 13:15:26 UTC (rev 2830) @@ -3,5 +3,6 @@ * Initial release (Closes: #508992) * Properly install in /usr (instead of /usr/local) * Add missing pvrg.install file. Add note about naming convention (pvrgjpeg) + * Install changelog. Install man page. Add CPack section. -- Mathieu Malaterre <[email protected]> Fri, 15 Dec 2008 18:28:01 +0100 Modified: trunk/packages/pvrg/trunk/debian/patches/cmakelists.txt.patch =================================================================== --- trunk/packages/pvrg/trunk/debian/patches/cmakelists.txt.patch 2008-12-22 11:27:13 UTC (rev 2829) +++ trunk/packages/pvrg/trunk/debian/patches/cmakelists.txt.patch 2008-12-22 13:15:26 UTC (rev 2830) @@ -1,6 +1,6 @@ --- pvrg.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ pvrg-1.2.1/CMakeLists.txt 2008-12-15 09:49:10.000000000 +0100 -@@ -0,0 +1,128 @@ ++++ pvrg-1.2.1/CMakeLists.txt 2008-12-22 14:05:09.000000000 +0100 +@@ -0,0 +1,147 @@ +# Main CMakeLists.txt to build the PVRG project using CMake (www.cmake.org) +# Written by Mathieu Malaterre +IF(NOT PVRG_NAMESPACE) @@ -9,6 +9,7 @@ + SET(PVRG_INSTALL_BIN_DIR bin) + SET(PVRG_INSTALL_LIB_DIR lib) + SET(PVRG_INSTALL_INCLUDE_DIR include/pvrg) ++ SET(PVRG_INSTALL_MAN_DIR man) + OPTION(PVRG_BUILD_SHARED_LIBS "Build PVRG with shared libraries." OFF) + SET(BUILD_SHARED_LIBS ${PVRG_BUILD_SHARED_LIBS}) +ELSE(NOT PVRG_NAMESPACE) @@ -106,6 +107,11 @@ +#ENDIF(NOT PVRG_INSTALL_NO_DEVELOPMENT) + +IF(NOT PVRG_INSTALL_NO_LIBRARIES) ++ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/jpeg.1 ++ ${CMAKE_CURRENT_BINARY_DIR}/${PVRG_LIBRARY_NAME}jpeg.1) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PVRG_LIBRARY_NAME}jpeg.1 ++ DESTINATION ${PVRG_INSTALL_MAN_DIR}/man1 COMPONENT Development ++ ) + INSTALL(TARGETS ${PVRG_LIBRARY_NAME}jpeg + RUNTIME DESTINATION ${PVRG_INSTALL_BIN_DIR} COMPONENT Runtime + LIBRARY DESTINATION ${PVRG_INSTALL_LIB_DIR} COMPONENT Runtime @@ -113,7 +119,20 @@ + ) +ENDIF(NOT PVRG_INSTALL_NO_LIBRARIES) + ++IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") ++ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PVRG_PACKAGE_DESCRIPTION_SUMMARY}) ++ SET(CPACK_PACKAGE_VENDOR "PVRG") ++ #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Copyright.txt") ++ #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/Copyright.txt") ++ SET(CPACK_PACKAGE_VERSION_MAJOR "${PVRG_MAJOR_VERSION}") ++ SET(CPACK_PACKAGE_VERSION_MINOR "${PVRG_MINOR_VERSION}") ++ SET(CPACK_PACKAGE_VERSION_PATCH "${PVRG_BUILD_VERSION}") ++ SET(CPACK_SOURCE_PACKAGE_FILE_NAME "pvrg-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") + ++ SET(CPACK_SOURCE_IGNORE_FILES "/debian/" "/CVS/" "/\\\\.svn/" "\\\\.swp$") ++ INCLUDE(CPack) ++ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") ++ +# +# Should you wish to modify the interpreter +# modify this portion here. Modified: trunk/packages/pvrg/trunk/debian/pvrg.install =================================================================== --- trunk/packages/pvrg/trunk/debian/pvrg.install 2008-12-22 11:27:13 UTC (rev 2829) +++ trunk/packages/pvrg/trunk/debian/pvrg.install 2008-12-22 13:15:26 UTC (rev 2830) @@ -1 +1,2 @@ usr/bin/pvrgjpeg +usr/man/man1/pvrgjpeg.1 Modified: trunk/packages/pvrg/trunk/debian/rules =================================================================== --- trunk/packages/pvrg/trunk/debian/rules 2008-12-22 11:27:13 UTC (rev 2829) +++ trunk/packages/pvrg/trunk/debian/rules 2008-12-22 13:15:26 UTC (rev 2830) @@ -81,7 +81,7 @@ binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs CHANGES dh_installdocs dh_installexamples dh_install --sourcedir=$(TARGET) --fail-missing _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
