Author: domibel-guest Date: 2008-07-13 09:23:35 +0000 (Sun, 13 Jul 2008) New Revision: 2224
Added: trunk/packages/igstk/trunk/debian/ trunk/packages/igstk/trunk/debian/README.Debian trunk/packages/igstk/trunk/debian/changelog trunk/packages/igstk/trunk/debian/compat trunk/packages/igstk/trunk/debian/control trunk/packages/igstk/trunk/debian/copyright trunk/packages/igstk/trunk/debian/ctest_config.cmake trunk/packages/igstk/trunk/debian/get-orig-source trunk/packages/igstk/trunk/debian/patches/ trunk/packages/igstk/trunk/debian/patches/00list trunk/packages/igstk/trunk/debian/patches/100_make_install.dpatch trunk/packages/igstk/trunk/debian/patches/110_soname.dpatch trunk/packages/igstk/trunk/debian/patches/130_include.dpatch trunk/packages/igstk/trunk/debian/patches/20_exit_success.dpatch trunk/packages/igstk/trunk/debian/patches/30_igstkMultipleOutputTest.dpatch trunk/packages/igstk/trunk/debian/patches/50_igstkTimeStampTest.dpatch trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch trunk/packages/igstk/trunk/debian/patches/80_fltk_header.dpatch trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch trunk/packages/igstk/trunk/debian/rules Log: [svn-inject] Applying Debian modifications to trunk Property changes on: trunk/packages/igstk/trunk/debian ___________________________________________________________________ Name: mergeWithUpstream + 1 Added: trunk/packages/igstk/trunk/debian/README.Debian =================================================================== --- trunk/packages/igstk/trunk/debian/README.Debian (rev 0) +++ trunk/packages/igstk/trunk/debian/README.Debian 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,12 @@ +igstk for Debian +---------------- + + Some examples using this library can be found in the repository. + + cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot/IGSTK login + answer by 'igstk' + cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot/IGSTK co IGSTKSandbox + + +-- Dominique Belhachemi <[EMAIL PROTECTED]> Tue, 24 Jun 2008 20:51:56 +0200 + Added: trunk/packages/igstk/trunk/debian/changelog =================================================================== --- trunk/packages/igstk/trunk/debian/changelog (rev 0) +++ trunk/packages/igstk/trunk/debian/changelog 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,6 @@ +igstk (3.0.0~cvs20080713-1) unstable; urgency=low + + * Initial release (Closes: #490627) + + -- Dominique Belhachemi <[EMAIL PROTECTED]> Tue, 24 Jun 2008 20:51:56 +0200 + Added: trunk/packages/igstk/trunk/debian/compat =================================================================== --- trunk/packages/igstk/trunk/debian/compat (rev 0) +++ trunk/packages/igstk/trunk/debian/compat 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1 @@ +6 Added: trunk/packages/igstk/trunk/debian/control =================================================================== --- trunk/packages/igstk/trunk/debian/control (rev 0) +++ trunk/packages/igstk/trunk/debian/control 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,57 @@ +Source: igstk +Priority: optional +Maintainer: Debian-Med Packaging Team <[EMAIL PROTECTED]> +DM-Upload-Allowed: yes +Uploaders: Dominique Belhachemi <[EMAIL PROTECTED]> +Build-Depends: debhelper (>= 6), dpatch, cmake, libinsighttoolkit3-dev, libvtk5-dev, zlib1g-dev, libfreetype6-dev, libxext-dev, libpng-dev, libjpeg-dev, libtiff-dev, libexpat1-dev, libqt4-dev, libvtk5-qt4-dev, libfltk1.1-dev, fluid +Standards-Version: 3.8.0 +Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/igstk/trunk/?rev=0&sc=0 +Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/igstk/trunk/ +Section: libs +Homepage: http://www.igstk.org + + +Package: libigstk3-dev +Section: libdevel +Architecture: any +Depends: libigstk3 (= ${binary:Version}), ${shlibs:Depends} +Description: Toolkit for image-guided surgery applications + This package contains the development files needed to build + your own IGSTK applications. + + +Package: libigstk3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Toolkit for image-guided surgery applications + The Image-Guided Surgery Toolkit (IGstk: pronounced IGStick) is a + high-level component-based framework providing common functionality + for image-guided surgery applications. + . + This software framework consists of a set of high-level components + integrated with other low-level open source software libraries and + application programming interfaces (API) from hardware vendors. + . + The cornerstone of IGstk is robustness. IGstk provides the following + high-level functionality: + Ability to read and display medical images including CT and MRI in + DICOM format. + . + An interface to common tracking hardware (e.g. AURORA from + Northern Digital Inc.). A graphical user interface and visualization + capability including a four-quadrant view (axial, sagittal, coronal, + and 3D) as well as a multi-slice axial view (from 1 by 1 to many by + many such as 10 by 10). + . + Registration: point based registration and a means for selecting + these points. Robust common internal software services for logging, + exception-handling and problem resolution. + + +Package: igstk-examples +Architecture: all +Suggests: libigstk3-dev +Section: graphics +Description: Example programs for IGSTK + This package contains examples from the IGSTK source. Added: trunk/packages/igstk/trunk/debian/copyright =================================================================== --- trunk/packages/igstk/trunk/debian/copyright (rev 0) +++ trunk/packages/igstk/trunk/debian/copyright 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,71 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Debianized-By: Dominique Belhachemi <[EMAIL PROTECTED]> +Debianized-Date: Tue, 24 Jun 2008 20:51:56 +0200 +Original-Source: http://www.igstk.org/ + + +Files: debian/* +Copyright: 2008, Dominique Belhachemi <[EMAIL PROTECTED]> +License: GPL-2+ + The Debian packaging is licensed under the GPL, see `/usr/share/common-licenses/GPL' + + +Files: Utilities/MicronTracker/* +Copyright: Claron Technology Inc. +License: BSD-like + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + * The name of the Claron Technology, nor of any contributors, may be used to + endorse or promote products derived from this software without specific prior + written permission. + . + * Modified source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Files: * +Copyright: 2002-2008 Insight Software Consortium +License: BSD-like + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + * Neither the name of the Insight Software Consortium nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Added: trunk/packages/igstk/trunk/debian/ctest_config.cmake =================================================================== --- trunk/packages/igstk/trunk/debian/ctest_config.cmake (rev 0) +++ trunk/packages/igstk/trunk/debian/ctest_config.cmake 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,32 @@ +SET (CTEST_SOURCE_DIRECTORY ".") +SET (CTEST_BINARY_DIRECTORY ".") + +# which ctest command to use for running the dashboard +SET (CTEST_COMMAND + "ctest -D Nightly -A ${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME} -VV" +) + +# what cmake command to use for configuring this dashboard +SET (CTEST_CMAKE_COMMAND + "cmake" +) + +# set any extra envionment varibles here +#SET (CTEST_ENVIRONMENT +# "DISPLAY=:0" +#) + +SET (CTEST_ENVIRONMENT + "DISPLAY=:0" + "CXX=/usr/bin/g++" + "CC=/usr/bin/gcc" +) + +SET (CTEST_INITIAL_CACHE " +//Name of the build +BUILDNAME:STRING=Debian_Sid_g++-4.2.4-3 +//Name of the computer/site where compile is being run +SITE:STRING=LINUX.DEBIAN.SID +") + + Added: trunk/packages/igstk/trunk/debian/get-orig-source =================================================================== --- trunk/packages/igstk/trunk/debian/get-orig-source (rev 0) +++ trunk/packages/igstk/trunk/debian/get-orig-source 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,34 @@ +PACKAGE=igstk + +#VERSION=3.0.0 +VERSION=3.0.0~cvs20080713 +CVSDATE="13 Jul 2008" + +FOLDER=$PACKAGE-$VERSION +TARFILE=igstk_$VERSION.orig.tar.gz +CVSHOME=:pserver:[EMAIL PROTECTED]:/cvsroot/IGSTK + +echo "ENTER PASSWORD : igstk" +cvs -d$CVSHOME login +cvs -d$CVSHOME co -D "$CVSDATE" IGSTK + + +# Remove all CVS directories +echo "Removing all CVS directories" +for REMOVE_CVS in `find IGSTK -name CVS`; do + rm -rf "$REMOVE_CVS" +done + + +mv IGSTK/ igstk-$VERSION + +# Create the tarball +if [ ! -f igstk_$VERSION.orig.tar.gz ]; then + echo "Creating orig tarball." + tar -czf igstk_$VERSION.orig.tar.gz igstk-$VERSION/ + echo "Removing extracted directory." + rm -rf igstk-$VERSION/ +else + echo "Already found orig tarball." + exit 1 +fi Added: trunk/packages/igstk/trunk/debian/patches/00list =================================================================== --- trunk/packages/igstk/trunk/debian/patches/00list (rev 0) +++ trunk/packages/igstk/trunk/debian/patches/00list 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,9 @@ +20_exit_success.dpatch +30_igstkMultipleOutputTest.dpatch +50_igstkTimeStampTest.dpatch +70_vtk_use_qvtk.dpatch +80_fltk_header.dpatch +90_cmake_minimum_required.dpatch +100_make_install.dpatch +110_soname.dpatch +130_include.dpatch Added: trunk/packages/igstk/trunk/debian/patches/100_make_install.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/100_make_install.dpatch (rev 0) +++ trunk/packages/igstk/trunk/debian/patches/100_make_install.dpatch 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,36 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 100_make_install.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Installs *.cmake + [EMAIL PROTECTED]@ +diff -urNad igstk-3.0.0~/CMakeLists.txt igstk-3.0.0/CMakeLists.txt +--- igstk-3.0.0~/CMakeLists.txt 2008-07-06 14:34:29.000000000 +0200 ++++ igstk-3.0.0/CMakeLists.txt 2008-07-06 14:35:05.000000000 +0200 +@@ -272,6 +272,7 @@ + INCLUDE(InstallRequiredSystemLibraries) + SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IGSTK ") + SET(CPACK_PACKAGE_VENDOR "ISC") ++SET(CPACK_GENERATOR "TBZ2;DEB") + SET(CPACK_PACKAGE_VERSION_MAJOR "${IGSTK_VERSION_MAJOR}") + SET(CPACK_PACKAGE_VERSION_MINOR "${IGSTK_VERSION_MINOR}") + SET(CPACK_PACKAGE_VERSION_PATCH "${IGSTK_VERSION_PATCH}") +@@ -341,3 +342,17 @@ + ADD_CUSTOM_TARGET(StyleCheck DEPENDS ${IGSTK_BINARY_DIR}/KWStyleReport.txt) + ENDIF(IGSTK_USE_KWSTYLE) + ++IF(NOT IGSTK_INSTALL_NO_DEVELOPMENT) ++ INSTALL(FILES ++ ${IGSTK_BINARY_DIR}/IGSTKBuildSettings.cmake ++ ${IGSTK_BINARY_DIR}/IGSTKLibraryDepends.cmake ++ ${IGSTK_BINARY_DIR}/UseIGSTK.cmake ++ ${IGSTK_BINARY_DIR}/CPackConfig.cmake ++ ${IGSTK_BINARY_DIR}/CPackSourceConfig.cmake ++ ${IGSTK_BINARY_DIR}/CTestTestfile.cmake ++ ${IGSTK_BINARY_DIR}/cmake_install.cmake ++ DESTINATION ${IGSTK_INSTALL_PACKAGE_DIR} ++ COMPONENT Development ++ ) ++ENDIF(NOT IGSTK_INSTALL_NO_DEVELOPMENT) ++ Property changes on: trunk/packages/igstk/trunk/debian/patches/100_make_install.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/packages/igstk/trunk/debian/patches/110_soname.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/110_soname.dpatch (rev 0) +++ trunk/packages/igstk/trunk/debian/patches/110_soname.dpatch 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 110_soname.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds soname version number + [EMAIL PROTECTED]@ +diff -urNad igstk-3.0.1~/Source/CMakeLists.txt igstk-3.0.1/Source/CMakeLists.txt +--- igstk-3.0.1~/Source/CMakeLists.txt 2008-07-05 20:31:33.000000000 +0200 ++++ igstk-3.0.1/Source/CMakeLists.txt 2008-07-05 20:32:27.000000000 +0200 +@@ -271,6 +271,18 @@ + ${EXTRA_LIBS} + ) + ++ ++#----------------------------------------------------------------------------- ++SET_TARGET_PROPERTIES(IGSTK PROPERTIES ++ BUILD_WITH_INSTALL_RPATH OFF ++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib ++ INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib ++ SOVERSION 3 ++ VERSION 3.0.0 ++ ) ++#----------------------------------------------------------------------------- ++ ++ + IF(IGSTK_USE_FLTK) + TARGET_LINK_LIBRARIES( IGSTK ${FLTK_LIBRARIES} ) + ENDIF(IGSTK_USE_FLTK) Property changes on: trunk/packages/igstk/trunk/debian/patches/110_soname.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/packages/igstk/trunk/debian/patches/130_include.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/130_include.dpatch (rev 0) +++ trunk/packages/igstk/trunk/debian/patches/130_include.dpatch 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,123 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 130_include.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: necessary changes to install IGSTK + [EMAIL PROTECTED]@ +diff -urNad igstk-3.0.0~/CMakeLists.txt igstk-3.0.0/CMakeLists.txt +--- igstk-3.0.0~/CMakeLists.txt 2008-06-17 20:45:33.000000000 +0200 ++++ igstk-3.0.0/CMakeLists.txt 2008-07-12 17:55:04.000000000 +0200 +@@ -232,20 +232,28 @@ + ENDIF(NOT IGSTK_INSTALL_BIN_DIR) + + IF(NOT IGSTK_INSTALL_LIB_DIR) +- SET(IGSTK_INSTALL_LIB_DIR "lib/IGSTK") ++ SET(IGSTK_INSTALL_LIB_DIR ++ ${CMAKE_INSTALL_PREFIX}/lib/IGSTK ++ ) + ENDIF(NOT IGSTK_INSTALL_LIB_DIR) + + IF(NOT IGSTK_INSTALL_DATA_DIR) +- SET(IGSTK_INSTALL_DATA_DIR "share/IGSTK") ++ SET(IGSTK_INSTALL_DATA_DIR ++ ${CMAKE_INSTALL_PREFIX}/share/IGSTK ++ ) + ENDIF(NOT IGSTK_INSTALL_DATA_DIR) + + IF(NOT IGSTK_INSTALL_INCLUDE_DIR) +- SET(IGSTK_INSTALL_INCLUDE_DIR "include/IGSTK") ++ SET(IGSTK_INSTALL_INCLUDE_DIR ++ ${CMAKE_INSTALL_PREFIX}/include/IGSTK ++ ) + ENDIF(NOT IGSTK_INSTALL_INCLUDE_DIR) + + IF(NOT IGSTK_INSTALL_PACKAGE_DIR) +- SET(IGSTK_INSTALL_PACKAGE_DIR ${IGSTK_INSTALL_LIB_DIR} +- CACHE INTERNAL "") ++ SET(IGSTK_INSTALL_PACKAGE_DIR ++ ${IGSTK_INSTALL_LIB_DIR} ++ CACHE INTERNAL "" ++ ) + ENDIF(NOT IGSTK_INSTALL_PACKAGE_DIR) + + +diff -urNad igstk-3.0.0~/IGSTKConfig.cmake.in igstk-3.0.0/IGSTKConfig.cmake.in +--- igstk-3.0.0~/IGSTKConfig.cmake.in 2008-04-07 17:17:37.000000000 +0200 ++++ igstk-3.0.0/IGSTKConfig.cmake.in 2008-07-12 17:55:42.000000000 +0200 +@@ -6,7 +6,7 @@ + # to load IGSTK's settings for an external project. + + # The IGSTK source tree. +-SET(IGSTK_SOURCE_DIR "@IGSTK_SOURCE_DIR@") ++SET(IGSTK_SOURCE_DIR "") + + # The IGSTK include file directories. + SET(IGSTK_INCLUDE_DIRS "@IGSTK_INCLUDE_DIRS_CONFIG@") +diff -urNad igstk-3.0.0~/igstkGenerateIGSTKConfig.cmake igstk-3.0.0/igstkGenerateIGSTKConfig.cmake +--- igstk-3.0.0~/igstkGenerateIGSTKConfig.cmake 2008-07-10 17:40:59.000000000 +0200 ++++ igstk-3.0.0/igstkGenerateIGSTKConfig.cmake 2008-07-12 17:59:42.000000000 +0200 +@@ -25,18 +25,18 @@ + MESSAGE("IGSTK library path=${IGSTK_LIBRARY_PATH}") + + IF(IGSTK_USE_FLTK) +- SET(IGSTK_LIBRARY_DIRS_CONFIG ${IGSTK_LIBRARY_DIRS_CONFIG} ${FLTK_LIBRARY_DIRS}) ++ SET(IGSTK_LIBRARY_DIRS_CONFIG ${IGSTK_LIBRARY_DIRS_CONFIG} ${FLTK_LIBRARY_DIRS}) + ENDIF(IGSTK_USE_FLTK) + + IF(IGSTK_USE_MicronTracker) +- SET(IGSTK_LIBRARY_DIRS_CONFIG ${IGSTK_LIBRARY_DIRS_CONFIG} ${MTC_INCLUDE_DIRECTORY}) ++ SET(IGSTK_LIBRARY_DIRS_CONFIG ${IGSTK_LIBRARY_DIRS_CONFIG} ${MTC_INCLUDE_DIRECTORY}) + ENDIF(IGSTK_USE_MicronTracker) + + # Determine the include directories needed. + SET(IGSTK_INCLUDE_DIRS_CONFIG +- ${IGSTK_INCLUDE_DIRS_BUILD_TREE} +- ${IGSTK_INCLUDE_DIRS_SOURCE_TREE} +- ${IGSTK_INCLUDE_DIRS_SYSTEM} ++ ${IGSTK_INCLUDE_DIRS_BUILD_TREE} ++ ${IGSTK_INCLUDE_DIRS_SOURCE_TREE} ++ ${IGSTK_INCLUDE_DIRS_SYSTEM} + ) + + IF(IGSTK_USE_MicronTracker) +@@ -53,28 +53,29 @@ + # Settings specific to the install tree. + + # The "use" file. +-SET(IGSTK_USE_FILE ${CMAKE_INSTALL_PREFIX}/lib/IGSTK/UseIGSTK.cmake) ++SET(IGSTK_USE_FILE ++ ${IGSTK_INSTALL_PACKAGE_DIR}/UseIGSTK.cmake ++) + + # The library dependencies file. + SET(IGSTK_LIBRARY_DEPENDS_FILE +- ${CMAKE_INSTALL_PREFIX}/lib/IGSTK/IGSTKLibraryDepends.cmake) ++ ${IGSTK_INSTALL_PACKAGE_DIR}/IGSTKLibraryDepends.cmake ++) + + # The build settings file. + SET(IGSTK_BUILD_SETTINGS_FILE +- ${CMAKE_INSTALL_PREFIX}/lib/IGSTK/IGSTKBuildSettings.cmake) ++ ${IGSTK_INSTALL_PACKAGE_DIR}/IGSTKBuildSettings.cmake ++) + + # Include directories. + SET(IGSTK_INCLUDE_DIRS_CONFIG +- ${IGSTK_INCLUDE_DIRS_INSTALL_TREE} +- ${IGSTK_INCLUDE_DIRS_SYSTEM} ++ ${IGSTK_INSTALL_INCLUDE_DIR} + ) + + # Link directories. +-SET(IGSTK_LIBRARY_DIRS_CONFIG +- ${CMAKE_INSTALL_PREFIX}/lib/IGSTK +- ${ITK_LIBRARY_DIRS} +- ${VTK_LIBRARY_DIRS} +- ) ++SET(IGSTK_LIBRARY_DIRS_CONFIG ++ ${IGSTK_INSTALL_LIB_DIR} ++) + + #----------------------------------------------------------------------------- + # Configure IGSTKConfig.cmake for the install tree. Property changes on: trunk/packages/igstk/trunk/debian/patches/130_include.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/packages/igstk/trunk/debian/patches/20_exit_success.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/20_exit_success.dpatch (rev 0) +++ trunk/packages/igstk/trunk/debian/patches/20_exit_success.dpatch 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_exit_success.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: GCC4.3: #include <cstdlib> + [EMAIL PROTECTED]@ +diff -urNad igstk-3.0.1~/Testing/igstkBinaryDataTest.cxx igstk-3.0.1/Testing/igstkBinaryDataTest.cxx +--- igstk-3.0.1~/Testing/igstkBinaryDataTest.cxx 2008-06-29 04:38:48.000000000 +0200 ++++ igstk-3.0.1/Testing/igstkBinaryDataTest.cxx 2008-06-29 04:58:04.000000000 +0200 +@@ -23,6 +23,7 @@ + + #include <iostream> + #include <cstring> ++#include <cstdlib> + #include "igstkBinaryData.h" + #include "igstkRealTimeClock.h" + Property changes on: trunk/packages/igstk/trunk/debian/patches/20_exit_success.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/packages/igstk/trunk/debian/patches/30_igstkMultipleOutputTest.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/30_igstkMultipleOutputTest.dpatch (rev 0) +++ trunk/packages/igstk/trunk/debian/patches/30_igstkMultipleOutputTest.dpatch 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_igstkMultipleOutputTest.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds missing <cstdlib> header + [EMAIL PROTECTED]@ +diff -urNad igstk-3.0.1~/Testing/igstkMultipleOutputTest.cxx igstk-3.0.1/Testing/igstkMultipleOutputTest.cxx +--- igstk-3.0.1~/Testing/igstkMultipleOutputTest.cxx 2008-02-11 02:41:51.000000000 +0100 ++++ igstk-3.0.1/Testing/igstkMultipleOutputTest.cxx 2008-06-24 21:48:05.000000000 +0200 +@@ -23,7 +23,7 @@ + + #include <iostream> + #include <fstream> +- ++#include <cstdlib> + #include "igstkMultipleOutput.h" + #include "igstkRealTimeClock.h" + Property changes on: trunk/packages/igstk/trunk/debian/patches/30_igstkMultipleOutputTest.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/packages/igstk/trunk/debian/patches/50_igstkTimeStampTest.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/50_igstkTimeStampTest.dpatch (rev 0) +++ trunk/packages/igstk/trunk/debian/patches/50_igstkTimeStampTest.dpatch 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_igstkTimeStampTest.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds missing <cstdlib> header + [EMAIL PROTECTED]@ +diff -urNad igstk-3.0.1~/Testing/igstkTimeStampTest.cxx igstk-3.0.1/Testing/igstkTimeStampTest.cxx +--- igstk-3.0.1~/Testing/igstkTimeStampTest.cxx 2008-03-20 17:47:55.000000000 +0100 ++++ igstk-3.0.1/Testing/igstkTimeStampTest.cxx 2008-06-24 21:51:42.000000000 +0200 +@@ -23,6 +23,7 @@ + + #include <math.h> + #include <iostream> ++#include <cstdlib> + #include "igstkTimeStamp.h" + + int igstkTimeStampTest( int, char * [] ) Property changes on: trunk/packages/igstk/trunk/debian/patches/50_igstkTimeStampTest.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch (rev 0) +++ trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 70_vtk_use_qvtk.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Not necessary: Check if VTK was built with Qt on, VTK_USE_QVTK could not be found + [EMAIL PROTECTED]@ +diff -urNad igstk-3.0.1~/CMakeLists.txt igstk-3.0.1/CMakeLists.txt +--- igstk-3.0.1~/CMakeLists.txt 2008-06-17 20:45:33.000000000 +0200 ++++ igstk-3.0.1/CMakeLists.txt 2008-06-26 23:18:42.000000000 +0200 +@@ -105,10 +105,10 @@ + ENDIF( NOT VTK_USE_GUISUPPORT ) + + # Check if VTK was built with Qt on +- IF( NOT VTK_USE_QVTK ) +- MESSAGE(FATAL_ERROR "To build IGSTK with Qt support, you will need to use a VTK +-build with Qt support i.e VTK_USE_QVTK turned on in VTK configuration") +- ENDIF( NOT VTK_USE_QVTK ) ++# IF( NOT VTK_USE_QVTK ) ++# MESSAGE(FATAL_ERROR "To build IGSTK with Qt support, you will need to use a VTK ++#build with Qt support i.e VTK_USE_QVTK turned on in VTK configuration") ++# ENDIF( NOT VTK_USE_QVTK ) + + # use what QVTK built with + SET(QT_QMAKE_EXECUTABLE ${VTK_QT_QMAKE_EXECUTABLE} CACHE FILEPATH "") Property changes on: trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/packages/igstk/trunk/debian/patches/80_fltk_header.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/80_fltk_header.dpatch (rev 0) +++ trunk/packages/igstk/trunk/debian/patches/80_fltk_header.dpatch 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,35 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_fltk_header.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: capitalizes the .H + [EMAIL PROTECTED]@ +diff -urNad igstk-3.0.1~/Testing/igstkFLTKTextBufferLogOutputTest.cxx igstk-3.0.1/Testing/igstkFLTKTextBufferLogOutputTest.cxx +--- igstk-3.0.1~/Testing/igstkFLTKTextBufferLogOutputTest.cxx 2008-02-11 02:41:51.000000000 +0100 ++++ igstk-3.0.1/Testing/igstkFLTKTextBufferLogOutputTest.cxx 2008-06-27 00:35:51.000000000 +0200 +@@ -27,8 +27,8 @@ + #include "igstkFLTKTextBufferLogOutput.h" + #include "igstkRealTimeClock.h" + +-#include <FL/Fl.h> +-#include <FL/Fl_Window.h> ++#include <FL/Fl.H> ++#include <FL/Fl_Window.H> + #include <FL/Fl_Text_Display.H> + #include <FL/Fl_Text_Buffer.H> + +diff -urNad igstk-3.0.1~/Testing/igstkFLTKTextLogOutputTest.cxx igstk-3.0.1/Testing/igstkFLTKTextLogOutputTest.cxx +--- igstk-3.0.1~/Testing/igstkFLTKTextLogOutputTest.cxx 2008-02-11 02:41:51.000000000 +0100 ++++ igstk-3.0.1/Testing/igstkFLTKTextLogOutputTest.cxx 2008-06-27 00:36:04.000000000 +0200 +@@ -27,8 +27,8 @@ + #include "igstkFLTKTextLogOutput.h" + #include "igstkRealTimeClock.h" + +-#include <FL/Fl.h> +-#include <FL/Fl_Window.h> ++#include <FL/Fl.H> ++#include <FL/Fl_Window.H> + #include <FL/Fl_Text_Display.H> + #include <FL/Fl_Text_Buffer.H> + Property changes on: trunk/packages/igstk/trunk/debian/patches/80_fltk_header.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch (rev 0) +++ trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,35 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 90_cmake_minimum_required.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Makes the example cmake 2.6 ready, The example can now be built from outside the source directory + [EMAIL PROTECTED]@ +diff -urNad igstk-3.0.0~/Examples/HelloWorld/CMakeLists.txt igstk-3.0.0/Examples/HelloWorld/CMakeLists.txt +--- igstk-3.0.0~/Examples/HelloWorld/CMakeLists.txt 2008-07-06 13:56:25.000000000 +0200 ++++ igstk-3.0.0/Examples/HelloWorld/CMakeLists.txt 2008-07-06 13:57:02.000000000 +0200 +@@ -1,4 +1,24 @@ ++cmake_minimum_required(VERSION 2.6) ++ + PROJECT(HelloWorld) ++ ++INCLUDE( /usr/lib/IGSTK/IGSTKConfig.cmake ) ++INCLUDE( /usr/lib/IGSTK/UseIGSTK.cmake ) ++ ++FIND_PACKAGE(FLTK) ++ IF (FLTK_FOUND) ++ INCLUDE_DIRECTORIES (${FLTK_INCLUDE_DIR}) ++ IF(WIN32) ++ ADD_DEFINITIONS(-DWIN32) ++ ENDIF(WIN32) ++ LINK_LIBRARIES( ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES} ) ++ IF(CYGWIN) ++ LINK_LIBRARIES( ole32 uuid comctl32 wsock32 supc++ -lm -lgdi32) ++ ENDIF(CYGWIN) ++ ELSE (FLTK_FOUND) ++ MESSAGE( FATAL_ERROR "This application requires FLTK. One of these components is missing. Please verify configuration") ++ ENDIF (FLTK_FOUND) ++ + + SET(HelloWorld_GUI_SRCS + HelloWorldGUI.fl Property changes on: trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/packages/igstk/trunk/debian/rules =================================================================== --- trunk/packages/igstk/trunk/debian/rules (rev 0) +++ trunk/packages/igstk/trunk/debian/rules 2008-07-13 09:23:35 UTC (rev 2224) @@ -0,0 +1,161 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 + +PACKAGE=igstk + +# DPatch +DEB_SOURCE_PACKAGE:=$(PACKAGE) +include /usr/share/dpatch/dpatch.make + +STATIC_BUILD_PATH = DEB_build_static +SHARED_BUILD_PATH = DEB_build_shared + +CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_CXX_FLAGS="-Wno-deprecated" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DBUILD_DOCUMENTATION:BOOL=ON \ + -DIGSTK_BUILD_EXAMPLES:BOOL=OFF \ + -DIGSTK_USE_Qt:BOOL=ON \ + -DIGSTK_USE_FLTK:BOOL=ON \ + -DQT_MOC_EXECUTABLE:PATH=/usr/bin/moc-qt4 \ + -DQT_UIC_EXECUTABLE:PATH=/usr/bin/uic-qt4 \ + -DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake \ + -DBUILDNAME:STRING=SID \ + -DSITE:STRING=DEBIAN \ + -DCTEST_ENVIRONMENT="DISPLAY=:0" + +# if using precompiled static library provided by Claron Tech.: +# -DIGSTK_USE_MicronTracker:BOOL=ON \ +# -DMTC_INCLUDE_DIRECTORY:PATH=/tmp/MTC/Dist \ +# -DMTC_LIBRARY:PATH=/tmp/MTC/Dist \ +# TODO: /usr/bin/ld: cannot find -lMTC \ + + +# shared library versions, option 1 +version=2.0.5 +major=2 + + +get-orig-source: + . debian/get-orig-source + + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + + + if [ ! -d $(STATIC_BUILD_PATH) ]; then mkdir $(STATIC_BUILD_PATH); fi + + # double execution (necessary) + cd $(STATIC_BUILD_PATH) \ + && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=OFF + + cd $(STATIC_BUILD_PATH) \ + && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=OFF + + + + if [ ! -d $(SHARED_BUILD_PATH) ]; then mkdir $(SHARED_BUILD_PATH); fi + + cd $(SHARED_BUILD_PATH) \ + && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON + + cd $(SHARED_BUILD_PATH) \ + && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON + + + touch configure-stamp + + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + + # build static libs + cd $(STATIC_BUILD_PATH) && $(MAKE) VERBOSE=1 + + # perform tests ('-' ignores return values) +# cd $(STATIC_BUILD_PATH) && ctest -S ../debian/ctest_config.cmake -VV +# - cd $(STATIC_BUILD_PATH) && ctest -D Nightly -VV + + # build shared libs and binaries + cd $(SHARED_BUILD_PATH) && $(MAKE) VERBOSE=1 + + + + touch $@ + +clean: clean-patched unpatch + +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + rm -rf $(STATIC_BUILD_PATH) + rm -rf $(SHARED_BUILD_PATH) + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + + # install examples + dh_installexamples -pigstk-examples Examples/* + find debian/igstk-examples/usr/share/doc/igstk-examples/examples \ + -type f -print0 | xargs -0 chmod 644 + + + # install binaries and static libs + cd $(STATIC_BUILD_PATH) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + + # install development files + dh_install -plibigstk3-dev debian/tmp/usr/include/IGSTK/* usr/include/IGSTK/ + + + # install libs and *cmake files + dh_install -plibigstk3-dev debian/tmp/usr/lib/IGSTK/*.a usr/lib + dh_install -plibigstk3-dev $(SHARED_BUILD_PATH)/bin/*.so usr/lib + dh_install -plibigstk3-dev debian/tmp/usr/lib/IGSTK/*.cmake usr/lib/IGSTK + + dh_install -plibigstk3 $(SHARED_BUILD_PATH)/bin/*.so.* usr/lib + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_install + dh_installchangelogs + dh_installdocs + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure Property changes on: trunk/packages/igstk/trunk/debian/rules ___________________________________________________________________ Name: svn:executable + * _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
