[med-svn] r21681 - in trunk/packages/igstk/trunk/debian: . patches

Andreas Tille tille at moszumanska.debian.org
Mon Apr 11 06:20:24 UTC 2016 

Author: tille
Date: 2016-04-11 06:20:23 +0000 (Mon, 11 Apr 2016)
New Revision: 21681

Removed:
   trunk/packages/igstk/trunk/debian/README.source
   trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.diff
   trunk/packages/igstk/trunk/debian/patches/gcc-4.5.diff
Modified:
   trunk/packages/igstk/trunk/debian/changelog
   trunk/packages/igstk/trunk/debian/control
   trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff
   trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff
   trunk/packages/igstk/trunk/debian/patches/50_kfreebsd.diff
   trunk/packages/igstk/trunk/debian/patches/90_examples.diff
   trunk/packages/igstk/trunk/debian/patches/series
   trunk/packages/igstk/trunk/debian/rules
Log:
Mass commit my try to migrate to igstk 5.2


Deleted: trunk/packages/igstk/trunk/debian/README.source
===================================================================
--- trunk/packages/igstk/trunk/debian/README.source	2016-04-09 12:09:58 UTC (rev 21680)
+++ trunk/packages/igstk/trunk/debian/README.source	2016-04-11 06:20:23 UTC (rev 21681)
@@ -1,58 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-                break
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.

Modified: trunk/packages/igstk/trunk/debian/changelog
===================================================================
--- trunk/packages/igstk/trunk/debian/changelog	2016-04-09 12:09:58 UTC (rev 21680)
+++ trunk/packages/igstk/trunk/debian/changelog	2016-04-11 06:20:23 UTC (rev 21681)
@@ -1,3 +1,10 @@
+igstk (5.2-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+  * Removred redundant README.source
+
+ -- Andreas Tille <tille at debian.org>  Tue, 30 Sep 2014 16:52:48 +0200
+
 igstk (4.4.0-6) unstable; urgency=medium
 
   * debian/rules: Do not try to install examples for arch only builds

Modified: trunk/packages/igstk/trunk/debian/control
===================================================================
--- trunk/packages/igstk/trunk/debian/control	2016-04-09 12:09:58 UTC (rev 21680)
+++ trunk/packages/igstk/trunk/debian/control	2016-04-11 06:20:23 UTC (rev 21681)
@@ -7,10 +7,14 @@
 Priority: optional
 Build-Depends: debhelper (>= 9),
                cmake,
-               libinsighttoolkit3-dev (>= 3.20),
-               libvtk5-dev,
-               libqt4-dev,
-               libvtk5-qt4-dev,
+               libinsighttoolkit4-dev,
+               libvtk6-qt-dev,
+               libvtkgdcm2-dev,
+               libgdcm-tools,
+               php5-vtkgdcm,
+               libvtkgdcm-cil,
+#               libvtkgdcm-java, # only libvtk5.10
+               python-vtkgdcm (>= 2.6.0+dfsg-1),
                libfltk1.1-dev,
                libopenigtlink-dev
 Build-Depends-Indep: doxygen,
@@ -27,10 +31,8 @@
          ${misc:Depends},
          ${shlibs:Depends},
          libinsighttoolkit3-dev,
-         libvtk5-dev
-Suggests: libqt4-dev,
-          libvtk5-qt4-dev,
-          libfltk1.1-dev
+         libvtk6-dev
+Suggests: libfltk1.1-dev
 Description: Toolkit for image-guided surgery applications - development
  The Image-Guided Surgery Toolkit (IGstk: pronounced IGStick) is a
  high-level component-based framework providing common functionality

Modified: trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff	2016-04-09 12:09:58 UTC (rev 21680)
+++ trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff	2016-04-11 06:20:23 UTC (rev 21681)
@@ -1,10 +1,9 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: generate a newer doxygen input file
 
-diff -urNad igstk-4.2.0~/Source/igstkAnnotation2D.h igstk-4.2.0/Source/igstkAnnotation2D.h
---- igstk-4.2.0~/Source/igstkAnnotation2D.h	2009-08-24 21:55:55.000000000 -0400
-+++ igstk-4.2.0/Source/igstkAnnotation2D.h	2009-08-24 22:11:10.000000000 -0400
-@@ -45,8 +45,8 @@
+--- a/Source/igstkAnnotation2D.h
++++ b/Source/igstkAnnotation2D.h
+@@ -45,8 +45,8 @@ class View;
   * This class is used to add 2D annotations to the viewport. 
   * Annotations can be added to any of the four corners of the viewport.
   *
@@ -15,9 +14,8 @@
   *
   * \ingroup Object
   */
-diff -urNad igstk-4.2.0~/Utilities/Doxygen/doxyfile.in igstk-4.2.0/Utilities/Doxygen/doxyfile.in
---- igstk-4.2.0~/Utilities/Doxygen/doxyfile.in	2009-08-24 21:55:55.000000000 -0400
-+++ igstk-4.2.0/Utilities/Doxygen/doxyfile.in	2009-08-24 22:11:10.000000000 -0400
+--- a/Utilities/Doxygen/doxyfile.in
++++ b/Utilities/Doxygen/doxyfile.in
 @@ -1,106 +1,286 @@
 -# -------------------------------------------------------------------------
 -# doxyfile for IGSTK
@@ -410,15 +408,3 @@
 +INCLUDE_GRAPH          = YES
 +INCLUDED_BY_GRAPH      = YES
 +CALL_GRAPH             = NO
-+CALLER_GRAPH           = NO
-+GRAPHICAL_HIERARCHY    = YES
-+DIRECTORY_GRAPH        = YES
-+DOT_IMAGE_FORMAT       = png
-+DOT_PATH               = "@DOT_PATH@"
-+DOTFILE_DIRS           =
-+DOT_GRAPH_MAX_NODES    = 50
-+MAX_DOT_GRAPH_DEPTH    = 0
-+DOT_TRANSPARENT        = NO
-+DOT_MULTI_TARGETS      = YES
-+GENERATE_LEGEND        = YES
-+DOT_CLEANUP            = YES

Modified: trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff	2016-04-09 12:09:58 UTC (rev 21680)
+++ trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff	2016-04-11 06:20:23 UTC (rev 21681)
@@ -1,23 +1,22 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: disable resource intensely tests and tests based on FLTK or QT
 
-diff -urNad igstk-4.2.0~/Testing/IGSTKTestingMacros.cmake igstk-4.2.0/Testing/IGSTKTestingMacros.cmake
---- igstk-4.2.0~/Testing/IGSTKTestingMacros.cmake	2009-08-24 21:55:55.000000000 -0400
-+++ igstk-4.2.0/Testing/IGSTKTestingMacros.cmake	2009-08-24 22:11:27.000000000 -0400
-@@ -170,9 +170,9 @@ IF (IGSTK_DATA_ROOT)
+--- a/Testing/IGSTKTestingMacros.cmake
++++ b/Testing/IGSTKTestingMacros.cmake
+@@ -182,9 +182,9 @@ IF (IGSTK_DATA_ROOT)
+        ${IGSTK_DATA_ROOT}/Input/USLiver
         ${IGSTK_DATA_ROOT}/Input/MRLiver)
         
- IF (ITK_PRE4_VERSION)
 -  ADD_TEST( igstkMR3DImageToUS3DImageRegistrationTest ${IGSTK_TESTS} 
 -             igstkMR3DImageToUS3DImageRegistrationTest
 -             ${IGSTK_DATA_ROOT}/Input/MRLiver)
 +#  ADD_TEST( igstkMR3DImageToUS3DImageRegistrationTest ${IGSTK_TESTS} 
 +#             igstkMR3DImageToUS3DImageRegistrationTest
 +#             ${IGSTK_DATA_ROOT}/Input/MRLiver)
- ENDIF(ITK_PRE4_VERSION)
  
    ADD_TEST( igstkAuroraTrackerSimulatedTest
-@@ -309,7 +309,7 @@ ENDIF(${IGSTK_TEST_FLOCKOFBIRD_ATTACHED}
+               ${IGSTK_TESTS}
+@@ -361,7 +361,7 @@ ENDIF(${IGSTK_TEST_NDICertusTracker_ATTA
  
  #-----------------------------------------------------------------------------
  # Tests that depend on FLTK
@@ -26,7 +25,7 @@
    ADD_TEST(igstkCylinderObjectTest ${IGSTK_TESTS} igstkCylinderObjectTest)
    ADD_TEST(igstkEllipsoidObjectTest ${IGSTK_TESTS} igstkEllipsoidObjectTest)
    ADD_TEST(igstkFLTKTextBufferLogOutputTest ${IGSTK_TESTS} igstkFLTKTextBufferLogOutputTest)
-@@ -582,7 +582,7 @@ ADD_TEST( igstkImageResliceObjectReprese
+@@ -634,7 +634,7 @@ ADD_TEST( igstkImageResliceObjectReprese
                ${IGSTK_DATA_ROOT}/Input/E000192 
                ${IGSTK_TEST_OUTPUT_DIR}/igstkCrossHairObjectRepresentationTest.png)
     
@@ -35,7 +34,7 @@
  
  IF(${IGSTK_TEST_MicronTracker_ATTACHED})
      ADD_TEST( igstkMicronTrackerTest
-@@ -642,7 +642,7 @@ IF(${IGSTK_USE_OpenIGTLink})
+@@ -700,7 +700,7 @@ IF(${IGSTK_USE_OpenIGTLink})
  
  ENDIF(${IGSTK_USE_OpenIGTLink})  
  
@@ -44,7 +43,7 @@
      ADD_TEST( igstkQTWidgetTest
                ${IGSTK_TESTS}
                igstkQTWidgetTest)
-@@ -739,7 +739,7 @@ IF(${IGSTK_USE_Qt})
+@@ -797,7 +797,7 @@ IF(${IGSTK_USE_Qt})
                ${IGSTK_TEST_OUTPUT_DIR}/igstkMeshResliceObjectRepresentationQtTest.png)
  
  

Modified: trunk/packages/igstk/trunk/debian/patches/50_kfreebsd.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/50_kfreebsd.diff	2016-04-09 12:09:58 UTC (rev 21680)
+++ trunk/packages/igstk/trunk/debian/patches/50_kfreebsd.diff	2016-04-11 06:20:23 UTC (rev 21681)
@@ -1,8 +1,6 @@
-Index: igstk-4.4.0/Source/igstkSerialCommunicationForPosix.cxx
-===================================================================
---- igstk-4.4.0.orig/Source/igstkSerialCommunicationForPosix.cxx	2011-03-21 23:17:50.000000000 -0400
-+++ igstk-4.4.0/Source/igstkSerialCommunicationForPosix.cxx	2011-03-21 23:18:15.000000000 -0400
-@@ -171,12 +171,9 @@
+--- a/Source/igstkSerialCommunicationForPosix.cxx
++++ b/Source/igstkSerialCommunicationForPosix.cxx
+@@ -171,12 +171,9 @@ SerialCommunicationForPosix::InternalUpd
    // set baud rate
  #if defined(sgi) && defined(__NEW_MAX_BAUD)
    t.c_ospeed = newbaud;

Deleted: trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.diff	2016-04-09 12:09:58 UTC (rev 21680)
+++ trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.diff	2016-04-11 06:20:23 UTC (rev 21681)
@@ -1,43 +0,0 @@
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: removes cyclic dependeny, adds soname generation
-
-diff -urNad igstk-4.2.0~/Source/CMakeLists.txt igstk-4.2.0/Source/CMakeLists.txt
---- igstk-4.2.0~/Source/CMakeLists.txt	2009-08-24 23:29:28.000000000 -0400
-+++ igstk-4.2.0/Source/CMakeLists.txt	2009-08-24 23:29:28.000000000 -0400
-@@ -409,13 +409,12 @@
-     ${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
--   VERSION ${IGSTK_VERSION_MAJOR}.${IGSTK_VERSION_MINOR}.${IGSTK_VERSION_PATCH}
--   SOVERSION ${IGSTK_VERSION_MAJOR}
--)
-+# Apply user-defined properties to the library target.
-+IF(IGSTK_LIBRARY_PROPERTIES)
-+  SET_TARGET_PROPERTIES(IGSTK PROPERTIES
-+     ${IGSTK_LIBRARY_PROPERTIES}
-+  )
-+ENDIF(IGSTK_LIBRARY_PROPERTIES)
- 
- IF(IGSTK_USE_FLTK)
-   TARGET_LINK_LIBRARIES( IGSTK ${FLTK_LIBRARIES} )
-diff -urNad igstk-4.2.0~/Utilities/SceneGraphVisualization/CMakeLists.txt igstk-4.2.0/Utilities/SceneGraphVisualization/CMakeLists.txt
---- igstk-4.2.0~/Utilities/SceneGraphVisualization/CMakeLists.txt	2009-08-24 23:21:09.000000000 -0400
-+++ igstk-4.2.0/Utilities/SceneGraphVisualization/CMakeLists.txt	2009-08-24 23:30:03.000000000 -0400
-@@ -22,4 +22,12 @@
-   )
-   
- ADD_LIBRARY(SceneGraphVisualization ${SceneGraphVisualization_SRC} )
--TARGET_LINK_LIBRARIES(SceneGraphVisualization IGSTK)
-+TARGET_LINK_LIBRARIES(SceneGraphVisualization)
-+
-+# Apply user-defined properties to the library target.
-+IF(IGSTK_LIBRARY_PROPERTIES)
-+  SET_TARGET_PROPERTIES(SceneGraphVisualization PROPERTIES
-+     ${IGSTK_LIBRARY_PROPERTIES}
-+  )
-+ENDIF(IGSTK_LIBRARY_PROPERTIES)
-+

Modified: trunk/packages/igstk/trunk/debian/patches/90_examples.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/90_examples.diff	2016-04-09 12:09:58 UTC (rev 21680)
+++ trunk/packages/igstk/trunk/debian/patches/90_examples.diff	2016-04-11 06:20:23 UTC (rev 21681)
@@ -1,10 +1,8 @@
 ## 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
 
-Index: igstk-4.2.0/Examples/CMakeLists.txt
-===================================================================
---- igstk-4.2.0.orig/Examples/CMakeLists.txt	2009-12-05 15:31:08.000000000 -0500
-+++ igstk-4.2.0/Examples/CMakeLists.txt	2009-12-05 15:31:13.000000000 -0500
+--- a/Examples/CMakeLists.txt
++++ b/Examples/CMakeLists.txt
 @@ -1,3 +1,58 @@
 +cmake_minimum_required(VERSION 2.4)
 +

Deleted: trunk/packages/igstk/trunk/debian/patches/gcc-4.5.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/gcc-4.5.diff	2016-04-09 12:09:58 UTC (rev 21680)
+++ trunk/packages/igstk/trunk/debian/patches/gcc-4.5.diff	2016-04-11 06:20:23 UTC (rev 21681)
@@ -1,11 +0,0 @@
---- igstk-4.2.0.orig/Utilities/SceneGraphVisualization/igstkSceneGraphNode.cxx
-+++ igstk-4.2.0/Utilities/SceneGraphVisualization/igstkSceneGraphNode.cxx
-@@ -21,7 +21,7 @@
- 
- SceneGraphNode::SceneGraphNode(void)
- {  
--  m_ParentTransform = igstk::Transform::Transform();
-+  m_ParentTransform = igstk::Transform();
-   m_XC1 = 0;
-   m_YC1 = 0;
-   m_IsCurrentTransform = false;

Modified: trunk/packages/igstk/trunk/debian/patches/series
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/series	2016-04-09 12:09:58 UTC (rev 21680)
+++ trunk/packages/igstk/trunk/debian/patches/series	2016-04-11 06:20:23 UTC (rev 21681)
@@ -3,5 +3,4 @@
 #70_vtk_use_qvtk.diff
 #89_SceneGraphVisualization.diff
 90_examples.diff
-gcc-4.5.diff
 50_kfreebsd.diff

Modified: trunk/packages/igstk/trunk/debian/rules
===================================================================
--- trunk/packages/igstk/trunk/debian/rules	2016-04-09 12:09:58 UTC (rev 21680)
+++ trunk/packages/igstk/trunk/debian/rules	2016-04-11 06:20:23 UTC (rev 21681)
@@ -29,7 +29,8 @@
               -DBUILD_DOCUMENTATION: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
+              -DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake \
+              -DVTK_USE_GUISUPPORT:BOOL=OFF
 
 # if using precompiled static library provided by Claron Tech.:
 #              -DIGSTK_USE_MicronTracker:BOOL=ON \

More information about the debian-med-commit mailing list