Author: domibel-guest Date: 2008-07-14 22:35:07 +0000 (Mon, 14 Jul 2008) New Revision: 2230
Removed: trunk/packages/igstk/trunk/debian/patches/100_make_install.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 Modified: trunk/packages/igstk/trunk/debian/changelog trunk/packages/igstk/trunk/debian/control trunk/packages/igstk/trunk/debian/copyright trunk/packages/igstk/trunk/debian/get-orig-source trunk/packages/igstk/trunk/debian/patches/00list trunk/packages/igstk/trunk/debian/patches/110_soname.dpatch trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch Log: unnecessary patches removed, they have been applied upstream Modified: trunk/packages/igstk/trunk/debian/changelog =================================================================== --- trunk/packages/igstk/trunk/debian/changelog 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/changelog 2008-07-14 22:35:07 UTC (rev 2230) @@ -1,4 +1,4 @@ -igstk (3.0.0~cvs20080713-1) unstable; urgency=low +igstk (3.0.0~cvs20080715-1) unstable; urgency=low * Initial release (Closes: #490627) Modified: trunk/packages/igstk/trunk/debian/control =================================================================== --- trunk/packages/igstk/trunk/debian/control 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/control 2008-07-14 22:35:07 UTC (rev 2230) @@ -3,7 +3,9 @@ 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 +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/ Modified: trunk/packages/igstk/trunk/debian/copyright =================================================================== --- trunk/packages/igstk/trunk/debian/copyright 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/copyright 2008-07-14 22:35:07 UTC (rev 2230) @@ -7,7 +7,8 @@ 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' + The Debian packaging is licensed under the GPL, + see `/usr/share/common-licenses/GPL' Files: Utilities/MicronTracker/* @@ -24,8 +25,8 @@ 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. + 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. Modified: trunk/packages/igstk/trunk/debian/get-orig-source =================================================================== --- trunk/packages/igstk/trunk/debian/get-orig-source 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/get-orig-source 2008-07-14 22:35:07 UTC (rev 2230) @@ -1,8 +1,8 @@ PACKAGE=igstk #VERSION=3.0.0 -VERSION=3.0.0~cvs20080713 -CVSDATE="13 Jul 2008" +VERSION=3.0.0~cvs20080715 +CVSDATE="15 Jul 2008" FOLDER=$PACKAGE-$VERSION TARFILE=igstk_$VERSION.orig.tar.gz Modified: trunk/packages/igstk/trunk/debian/patches/00list =================================================================== --- trunk/packages/igstk/trunk/debian/patches/00list 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/patches/00list 2008-07-14 22:35:07 UTC (rev 2230) @@ -1,9 +1,3 @@ -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 Deleted: trunk/packages/igstk/trunk/debian/patches/100_make_install.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/100_make_install.dpatch 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/patches/100_make_install.dpatch 2008-07-14 22:35:07 UTC (rev 2230) @@ -1,36 +0,0 @@ -#! /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) -+ Modified: trunk/packages/igstk/trunk/debian/patches/110_soname.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/110_soname.dpatch 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/patches/110_soname.dpatch 2008-07-14 22:35:07 UTC (rev 2230) @@ -5,9 +5,9 @@ ## DP: Adds soname version number @DPATCH@ -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 +diff -urNad igstk-3.0.0~cvs20080715~/Source/CMakeLists.txt igstk-3.0.0~cvs20080715/Source/CMakeLists.txt +--- igstk-3.0.0~cvs20080715~/Source/CMakeLists.txt 2008-07-14 22:50:52.000000000 +0200 ++++ igstk-3.0.0~cvs20080715/Source/CMakeLists.txt 2008-07-14 22:56:36.000000000 +0200 @@ -271,6 +271,18 @@ ${EXTRA_LIBS} ) Deleted: trunk/packages/igstk/trunk/debian/patches/130_include.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/130_include.dpatch 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/patches/130_include.dpatch 2008-07-14 22:35:07 UTC (rev 2230) @@ -1,123 +0,0 @@ -#! /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. Deleted: trunk/packages/igstk/trunk/debian/patches/20_exit_success.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/20_exit_success.dpatch 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/patches/20_exit_success.dpatch 2008-07-14 22:35:07 UTC (rev 2230) @@ -1,18 +0,0 @@ -#! /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" - Deleted: trunk/packages/igstk/trunk/debian/patches/30_igstkMultipleOutputTest.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/30_igstkMultipleOutputTest.dpatch 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/patches/30_igstkMultipleOutputTest.dpatch 2008-07-14 22:35:07 UTC (rev 2230) @@ -1,19 +0,0 @@ -#! /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" - Deleted: trunk/packages/igstk/trunk/debian/patches/50_igstkTimeStampTest.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/50_igstkTimeStampTest.dpatch 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/patches/50_igstkTimeStampTest.dpatch 2008-07-14 22:35:07 UTC (rev 2230) @@ -1,18 +0,0 @@ -#! /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 * [] ) Modified: trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch 2008-07-14 22:35:07 UTC (rev 2230) @@ -5,9 +5,9 @@ ## DP: Not necessary: Check if VTK was built with Qt on, VTK_USE_QVTK could not be found @DPATCH@ -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 +diff -urNad igstk-3.0.0~cvs20080715~/CMakeLists.txt igstk-3.0.0~cvs20080715/CMakeLists.txt +--- igstk-3.0.0~cvs20080715~/CMakeLists.txt 2008-07-14 22:50:52.000000000 +0200 ++++ igstk-3.0.0~cvs20080715/CMakeLists.txt 2008-07-14 22:57:24.000000000 +0200 @@ -105,10 +105,10 @@ ENDIF( NOT VTK_USE_GUISUPPORT ) Modified: trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch =================================================================== --- trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch 2008-07-14 16:28:46 UTC (rev 2229) +++ trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch 2008-07-14 22:35:07 UTC (rev 2230) @@ -5,9 +5,9 @@ ## DP: Makes the example cmake 2.6 ready, The example can now be built from outside the source directory @DPATCH@ -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 +diff -urNad igstk-3.0.0~cvs20080715~/Examples/HelloWorld/CMakeLists.txt igstk-3.0.0~cvs20080715/Examples/HelloWorld/CMakeLists.txt +--- igstk-3.0.0~cvs20080715~/Examples/HelloWorld/CMakeLists.txt 2008-07-14 22:50:52.000000000 +0200 ++++ igstk-3.0.0~cvs20080715/Examples/HelloWorld/CMakeLists.txt 2008-07-14 22:56:13.000000000 +0200 @@ -1,4 +1,24 @@ +cmake_minimum_required(VERSION 2.6) + _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
