diff --git a/debian/changelog b/debian/changelog index b218dc6e1..cd3ff23df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -cmake (2.8.3-4) UNRELEASED; urgency=low - - * debian/patches/FindVTK_fix_#600889.diff: Added. (Closes: #600889) - - -- Kai Wasserbäch Mon, 10 Jan 2011 22:16:51 +0100 - cmake (2.8.3-3) experimental; urgency=low * Install documentation to /usr/share/cmake-data instead as it's the "base" diff --git a/debian/patches/FindVTK_fix_#600889.diff b/debian/patches/FindVTK_fix_#600889.diff deleted file mode 100644 index a9ea87250..000000000 --- a/debian/patches/FindVTK_fix_#600889.diff +++ /dev/null @@ -1,35 +0,0 @@ -From: Kai Wasserbäch -Description: FindVTK.cmake missed a case which lead to NOT-FOUND errors. - FindVTK.cmake didn't handle the VTK 5.x case when trying to find VTK. This - caused CMake to error out with a misleading error message VTK_DIR not set. - This patch adds the missing case. -Last-Update: 2011-01-10 -Origin: vendor -Forwarded: http://cmake.org/Bug/view.php?id=11678 ---- - Modules/FindVTK.cmake | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - ---- a/Modules/FindVTK.cmake -+++ b/Modules/FindVTK.cmake -@@ -118,6 +118,20 @@ IF(_VTK_40_ALLOW AND NOT VTK_DIR) - IF(EXISTS ${VTK_DIR}/UseVTK.cmake AND NOT EXISTS ${VTK_DIR}/VTKConfig.cmake) - SET(VTK_FOUND 1) - INCLUDE(UseVTKConfig40) # No VTKConfig; load VTK 4.0 settings. -+ ELSEIF(EXISTS ${VTK_DIR}/VTKConfig.cmake AND NOT EXISTS ${VTK_DIR}/UseVTK.cmake) -+ INCLUDE("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake") -+ INCLUDE("${VTK_DIR}/VTKConfig.cmake") -+ SET(VTK_VERSION "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}") -+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(VTK REQUIRED_VARS VTK_USE_FILE -+ VTK_MAJOR_VERSION -+ VTK_MINOR_VERSION -+ VTK_BUILD_VERSION -+ VTK_INCLUDE_DIRS -+ VTK_LIBRARY_DIRS -+ VTK_KITS -+ VTK_LANGUAGES -+ VERSION_VAR VTK_VERSION -+ ) - ELSE() - # We found the wrong version. Pretend we did not find it. - SET(VTK_DIR "VTK_DIR-NOTFOUND" CACHE PATH "The ${VTK_DIR_DESCRIPTION}" FORCE) diff --git a/debian/patches/series b/debian/patches/series index eccbf95b8..a6807a6c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,3 @@ FindPython_fix_#569321_and_#580503.diff fixup_manpages.diff FindTCL_fix_#600245.diff backport_fix_asm_support.diff -FindVTK_fix_#600889.diff