[med-svn] r6445 - in trunk/packages/vtkedge/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Sun Apr 3 19:56:06 UTC 2011
Author: malat-guest
Date: 2011-04-03 19:55:58 +0000 (Sun, 03 Apr 2011)
New Revision: 6445
Modified:
trunk/packages/vtkedge/trunk/debian/changelog
trunk/packages/vtkedge/trunk/debian/get-orig-source
trunk/packages/vtkedge/trunk/debian/patches/sharedlibs_version.patch
trunk/packages/vtkedge/trunk/debian/rules
Log:
Update for VTK 5.6
Modified: trunk/packages/vtkedge/trunk/debian/changelog
===================================================================
--- trunk/packages/vtkedge/trunk/debian/changelog 2011-04-03 17:23:11 UTC (rev 6444)
+++ trunk/packages/vtkedge/trunk/debian/changelog 2011-04-03 19:55:58 UTC (rev 6445)
@@ -1,7 +1,8 @@
-vtkedge (0.1.0-4) UNRELEASED; urgency=low
+vtkedge (0.1.0~20110403-1) UNRELEASED; urgency=low
* debian/source/format: 3.0 (quilt)
* Debhelper 8 (control+compat)
+ * Use vtkedge from svn trunk to build against VTK 5.6
-- Andreas Tille <tille at debian.org> Wed, 16 Mar 2011 09:18:47 +0100
Modified: trunk/packages/vtkedge/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/vtkedge/trunk/debian/get-orig-source 2011-04-03 17:23:11 UTC (rev 6444)
+++ trunk/packages/vtkedge/trunk/debian/get-orig-source 2011-04-03 19:55:58 UTC (rev 6445)
@@ -10,15 +10,16 @@
VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'`
fi
-REVISION=`echo $VERSION | sed -e 's/^.*svn//g'`
-#REVISION=878
+REVISION=`echo $VERSION | sed -e 's/^.*~//g'`
+echo $REVISION
+#REVISION=3538 / 20110403
FOLDER=${PACKAGE}-${VERSION}
if [ -z ${TARFILE}]; then
TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
fi
-svn export --quiet https://www.kitware.com:8443/svn/KWPublic/trunk/VTKEdge-5-4-0 ${FOLDER}
+svn export --quiet -r "{$REVISION}" https://www.kitware.com:8443/svn/KWPublic/trunk/VTKEdge ${FOLDER}
GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER}
rm -rf ${FOLDER}
Modified: trunk/packages/vtkedge/trunk/debian/patches/sharedlibs_version.patch
===================================================================
--- trunk/packages/vtkedge/trunk/debian/patches/sharedlibs_version.patch 2011-04-03 17:23:11 UTC (rev 6444)
+++ trunk/packages/vtkedge/trunk/debian/patches/sharedlibs_version.patch 2011-04-03 19:55:58 UTC (rev 6445)
@@ -1,6 +1,7 @@
-diff -ru vtkedge-0.1.0/CMakeLists.txt vtkedge-0.1.0.version/CMakeLists.txt
---- vtkedge-0.1.0/CMakeLists.txt 2009-01-04 11:59:18.000000000 +0100
-+++ vtkedge-0.1.0.version/CMakeLists.txt 2010-02-26 15:42:03.000000000 +0100
+Index: vtkedge-0.1.0~20110403/CMakeLists.txt
+===================================================================
+--- vtkedge-0.1.0~20110403.orig/CMakeLists.txt 2010-04-20 22:41:44.000000000 +0200
++++ vtkedge-0.1.0~20110403/CMakeLists.txt 2011-04-03 21:53:01.000000000 +0200
@@ -44,6 +44,14 @@
set(VTKEdge_VERSION_BUILD 0)
set(VTKEdge_VERSION
@@ -16,10 +17,11 @@
# -----------------------------------------------------------------------------
# Setup the output paths
-diff -ru vtkedge-0.1.0/Common/CMakeLists.txt vtkedge-0.1.0.version/Common/CMakeLists.txt
---- vtkedge-0.1.0/Common/CMakeLists.txt 2009-02-15 14:31:03.000000000 +0100
-+++ vtkedge-0.1.0.version/Common/CMakeLists.txt 2010-02-26 15:41:12.000000000 +0100
-@@ -172,6 +172,7 @@
+Index: vtkedge-0.1.0~20110403/Common/CMakeLists.txt
+===================================================================
+--- vtkedge-0.1.0~20110403.orig/Common/CMakeLists.txt 2010-05-17 21:03:25.000000000 +0200
++++ vtkedge-0.1.0~20110403/Common/CMakeLists.txt 2011-04-03 21:53:01.000000000 +0200
+@@ -123,6 +123,7 @@
# -----------------------------------------------------------------------------
add_library(vtkKWECommon ${KIT_SRCS})
target_link_libraries(vtkKWECommon ${KIT_LIBS})
@@ -27,31 +29,23 @@
# -----------------------------------------------------------------------------
# Testing
-diff -ru vtkedge-0.1.0/Examples/VolumeRendering/CMakeLists.txt vtkedge-0.1.0.version/Examples/VolumeRendering/CMakeLists.txt
---- vtkedge-0.1.0/Examples/VolumeRendering/CMakeLists.txt 2008-09-11 23:49:20.000000000 +0200
-+++ vtkedge-0.1.0.version/Examples/VolumeRendering/CMakeLists.txt 2010-02-26 15:42:40.000000000 +0100
-@@ -22,4 +22,4 @@
- # -----------------------------------------------------------------------------
- # Just add all the subdirectories
- # -----------------------------------------------------------------------------
--add_subdirectory(Cxx)
-\ No newline at end of file
-+add_subdirectory(Cxx)
-diff -ru vtkedge-0.1.0/Filtering/CMakeLists.txt vtkedge-0.1.0.version/Filtering/CMakeLists.txt
---- vtkedge-0.1.0/Filtering/CMakeLists.txt 2009-02-13 21:04:30.000000000 +0100
-+++ vtkedge-0.1.0.version/Filtering/CMakeLists.txt 2010-02-26 15:43:03.000000000 +0100
+Index: vtkedge-0.1.0~20110403/Filtering/CMakeLists.txt
+===================================================================
+--- vtkedge-0.1.0~20110403.orig/Filtering/CMakeLists.txt 2010-04-20 22:41:44.000000000 +0200
++++ vtkedge-0.1.0~20110403/Filtering/CMakeLists.txt 2011-04-03 21:53:01.000000000 +0200
@@ -73,6 +73,7 @@
# -----------------------------------------------------------------------------
add_library(vtkKWEFiltering ${KIT_SRCS} ${KIT_EXTRA_SRCS} ${FilteringInstantiatorFiles})
target_link_libraries(vtkKWEFiltering ${KIT_LIBS})
+set_target_properties(vtkKWEFiltering PROPERTIES ${VTKEdge_LIBRARY_PROPERTIES} LINK_INTERFACE_LIBRARIES "")
-
+
# -----------------------------------------------------------------------------
-diff -ru vtkedge-0.1.0/Graphics/CMakeLists.txt vtkedge-0.1.0.version/Graphics/CMakeLists.txt
---- vtkedge-0.1.0/Graphics/CMakeLists.txt 2008-09-13 00:07:57.000000000 +0200
-+++ vtkedge-0.1.0.version/Graphics/CMakeLists.txt 2010-02-26 15:42:51.000000000 +0100
-@@ -40,6 +40,7 @@
+Index: vtkedge-0.1.0~20110403/Graphics/CMakeLists.txt
+===================================================================
+--- vtkedge-0.1.0~20110403.orig/Graphics/CMakeLists.txt 2010-04-20 22:41:44.000000000 +0200
++++ vtkedge-0.1.0~20110403/Graphics/CMakeLists.txt 2011-04-03 21:53:01.000000000 +0200
+@@ -37,6 +37,7 @@
# -----------------------------------------------------------------------------
add_library(vtkKWEGraphics ${KIT_SRCS})
target_link_libraries(vtkKWEGraphics ${KIT_LIBS})
@@ -59,30 +53,22 @@
# -----------------------------------------------------------------------------
# Testing
-diff -ru vtkedge-0.1.0/Graphics/Testing/CMakeLists.txt vtkedge-0.1.0.version/Graphics/Testing/CMakeLists.txt
---- vtkedge-0.1.0/Graphics/Testing/CMakeLists.txt 2008-09-11 23:49:20.000000000 +0200
-+++ vtkedge-0.1.0.version/Graphics/Testing/CMakeLists.txt 2010-02-26 15:42:54.000000000 +0100
-@@ -22,4 +22,4 @@
+Index: vtkedge-0.1.0~20110403/Hybrid/CMakeLists.txt
+===================================================================
+--- vtkedge-0.1.0~20110403.orig/Hybrid/CMakeLists.txt 2010-05-05 18:12:17.000000000 +0200
++++ vtkedge-0.1.0~20110403/Hybrid/CMakeLists.txt 2011-04-03 21:53:01.000000000 +0200
+@@ -75,6 +75,7 @@
# -----------------------------------------------------------------------------
- # Add the Cxx testing directory
- # -----------------------------------------------------------------------------
--add_subdirectory(Cxx)
-\ No newline at end of file
-+add_subdirectory(Cxx)
-diff -ru vtkedge-0.1.0/Hybrid/CMakeLists.txt vtkedge-0.1.0.version/Hybrid/CMakeLists.txt
---- vtkedge-0.1.0/Hybrid/CMakeLists.txt 2008-10-21 17:54:11.000000000 +0200
-+++ vtkedge-0.1.0.version/Hybrid/CMakeLists.txt 2010-02-26 15:41:30.000000000 +0100
-@@ -80,6 +80,7 @@
- # -----------------------------------------------------------------------------
add_library(vtkKWEHybrid ${KIT_SRCS} ${KIT_EXTRA_SRCS})
target_link_libraries(vtkKWEHybrid ${KIT_LIBS})
+set_target_properties(vtkKWEHybrid PROPERTIES ${VTKEdge_LIBRARY_PROPERTIES} LINK_INTERFACE_LIBRARIES "")
# -----------------------------------------------------------------------------
# Testing
-diff -ru vtkedge-0.1.0/Imaging/CMakeLists.txt vtkedge-0.1.0.version/Imaging/CMakeLists.txt
---- vtkedge-0.1.0/Imaging/CMakeLists.txt 2008-09-13 00:07:57.000000000 +0200
-+++ vtkedge-0.1.0.version/Imaging/CMakeLists.txt 2010-02-26 15:41:58.000000000 +0100
+Index: vtkedge-0.1.0~20110403/Imaging/CMakeLists.txt
+===================================================================
+--- vtkedge-0.1.0~20110403.orig/Imaging/CMakeLists.txt 2010-04-20 22:41:44.000000000 +0200
++++ vtkedge-0.1.0~20110403/Imaging/CMakeLists.txt 2011-04-03 21:53:01.000000000 +0200
@@ -61,6 +61,7 @@
if(KIT_CUDA_C_SOURCES OR KIT_SRCS OR KIT_CUDA_DEPENDANT_SRCS)
add_library(vtkKWEImaging ${KIT_CUDA_C_SOURCES} ${KIT_SRCS} ${KIT_CUDA_DEPENDANT_SRCS})
@@ -91,9 +77,10 @@
endif(KIT_CUDA_C_SOURCES OR KIT_SRCS OR KIT_CUDA_DEPENDANT_SRCS)
# -----------------------------------------------------------------------------
-diff -ru vtkedge-0.1.0/IO/CMakeLists.txt vtkedge-0.1.0.version/IO/CMakeLists.txt
---- vtkedge-0.1.0/IO/CMakeLists.txt 2009-02-25 22:58:59.000000000 +0100
-+++ vtkedge-0.1.0.version/IO/CMakeLists.txt 2010-02-26 15:40:54.000000000 +0100
+Index: vtkedge-0.1.0~20110403/IO/CMakeLists.txt
+===================================================================
+--- vtkedge-0.1.0~20110403.orig/IO/CMakeLists.txt 2010-04-20 22:41:44.000000000 +0200
++++ vtkedge-0.1.0~20110403/IO/CMakeLists.txt 2011-04-03 21:53:01.000000000 +0200
@@ -73,6 +73,7 @@
# -----------------------------------------------------------------------------
add_library(vtkKWEIO ${KIT_SRCS} ${KIT_EXTRA_SRCS})
@@ -102,10 +89,11 @@
# -----------------------------------------------------------------------------
# Testing
-diff -ru vtkedge-0.1.0/Rendering/CMakeLists.txt vtkedge-0.1.0.version/Rendering/CMakeLists.txt
---- vtkedge-0.1.0/Rendering/CMakeLists.txt 2009-01-16 17:46:47.000000000 +0100
-+++ vtkedge-0.1.0.version/Rendering/CMakeLists.txt 2010-02-26 15:42:13.000000000 +0100
-@@ -95,6 +95,7 @@
+Index: vtkedge-0.1.0~20110403/Rendering/CMakeLists.txt
+===================================================================
+--- vtkedge-0.1.0~20110403.orig/Rendering/CMakeLists.txt 2010-06-30 21:57:03.000000000 +0200
++++ vtkedge-0.1.0~20110403/Rendering/CMakeLists.txt 2011-04-03 21:53:01.000000000 +0200
+@@ -70,6 +70,7 @@
# -----------------------------------------------------------------------------
add_library(vtkKWERendering ${KIT_SRCS} ${KIT_EXTRA_SRCS})
target_link_libraries(vtkKWERendering ${KIT_LIBS})
@@ -113,10 +101,11 @@
# -----------------------------------------------------------------------------
# Testing
-diff -ru vtkedge-0.1.0/VolumeRendering/CMakeLists.txt vtkedge-0.1.0.version/VolumeRendering/CMakeLists.txt
---- vtkedge-0.1.0/VolumeRendering/CMakeLists.txt 2008-10-21 17:54:11.000000000 +0200
-+++ vtkedge-0.1.0.version/VolumeRendering/CMakeLists.txt 2010-02-26 15:43:17.000000000 +0100
-@@ -94,6 +94,7 @@
+Index: vtkedge-0.1.0~20110403/VolumeRendering/CMakeLists.txt
+===================================================================
+--- vtkedge-0.1.0~20110403.orig/VolumeRendering/CMakeLists.txt 2010-05-17 21:03:25.000000000 +0200
++++ vtkedge-0.1.0~20110403/VolumeRendering/CMakeLists.txt 2011-04-03 21:53:01.000000000 +0200
+@@ -68,6 +68,7 @@
# -----------------------------------------------------------------------------
add_library(vtkKWEVolumeRendering ${KIT_SRCS} ${KIT_OpenGL_SRCS} ${KIT_EXTRA_SRCS})
target_link_libraries(vtkKWEVolumeRendering ${KIT_LIBS})
@@ -124,20 +113,11 @@
# -----------------------------------------------------------------------------
# Testing
-diff -ru vtkedge-0.1.0/VolumeRendering/Testing/CMakeLists.txt vtkedge-0.1.0.version/VolumeRendering/Testing/CMakeLists.txt
---- vtkedge-0.1.0/VolumeRendering/Testing/CMakeLists.txt 2008-09-11 23:49:20.000000000 +0200
-+++ vtkedge-0.1.0.version/VolumeRendering/Testing/CMakeLists.txt 2010-02-26 15:43:19.000000000 +0100
-@@ -22,4 +22,4 @@
- # -----------------------------------------------------------------------------
- # Add the Cxx testing directory
- # -----------------------------------------------------------------------------
--add_subdirectory(Cxx)
-\ No newline at end of file
-+add_subdirectory(Cxx)
-diff -ru vtkedge-0.1.0/Widgets/CMakeLists.txt vtkedge-0.1.0.version/Widgets/CMakeLists.txt
---- vtkedge-0.1.0/Widgets/CMakeLists.txt 2009-04-13 18:26:25.000000000 +0200
-+++ vtkedge-0.1.0.version/Widgets/CMakeLists.txt 2010-02-26 15:41:43.000000000 +0100
-@@ -136,6 +136,7 @@
+Index: vtkedge-0.1.0~20110403/Widgets/CMakeLists.txt
+===================================================================
+--- vtkedge-0.1.0~20110403.orig/Widgets/CMakeLists.txt 2010-12-14 19:44:17.000000000 +0100
++++ vtkedge-0.1.0~20110403/Widgets/CMakeLists.txt 2011-04-03 21:53:01.000000000 +0200
+@@ -138,6 +138,7 @@
ENDIF(VTKEdge_USE_ITK)
add_library(vtkKWEWidgets ${KIT_SRCS})
target_link_libraries(vtkKWEWidgets ${KIT_LIBS})
Modified: trunk/packages/vtkedge/trunk/debian/rules
===================================================================
--- trunk/packages/vtkedge/trunk/debian/rules 2011-04-03 17:23:11 UTC (rev 6444)
+++ trunk/packages/vtkedge/trunk/debian/rules 2011-04-03 19:55:58 UTC (rev 6445)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh --with quilt --buildsystem=cmake $@
+ dh $@ --parallel --with quilt --buildsystem=cmake
override_dh_auto_configure:
# testing does not work as we deactivate rpath during conf time
More information about the debian-med-commit
mailing list