[med-svn] r4437 - in trunk/packages/igstk/trunk/debian: . patches
Dominique Belhachemi
domibel-guest at alioth.debian.org
Sun Dec 6 17:28:35 UTC 2009
Author: domibel-guest
Date: 2009-12-06 17:28:32 +0000 (Sun, 06 Dec 2009)
New Revision: 4437
Added:
trunk/packages/igstk/trunk/debian/patches/05_cvs20090823.diff
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/70_vtk_use_qvtk.diff
trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.diff
trunk/packages/igstk/trunk/debian/patches/90_examples.diff
trunk/packages/igstk/trunk/debian/patches/series
Removed:
trunk/packages/igstk/trunk/debian/patches/00list
trunk/packages/igstk/trunk/debian/patches/12_doxygen.dpatch
trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.dpatch
trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch
trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.dpatch
trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch
Modified:
trunk/packages/igstk/trunk/debian/changelog
trunk/packages/igstk/trunk/debian/control
trunk/packages/igstk/trunk/debian/get-orig-source
trunk/packages/igstk/trunk/debian/rules
Log:
link with --no-add-needed option (Closes: #554864)
Modified: trunk/packages/igstk/trunk/debian/changelog
===================================================================
--- trunk/packages/igstk/trunk/debian/changelog 2009-12-05 23:06:10 UTC (rev 4436)
+++ trunk/packages/igstk/trunk/debian/changelog 2009-12-06 17:28:32 UTC (rev 4437)
@@ -1,3 +1,23 @@
+igstk (4.2.0-3) UNRELEASED; urgency=low
+
+ * link with --no-add-needed option (Closes: #554864)
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sat, 05 Dec 2009 13:54:17 -0500
+
+igstk (4.2.0-2) unstable; urgency=low
+
+ * Fixed link issue (Closes: #549799)
+ * switch to quilt
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Wed, 07 Oct 2009 17:35:43 -0400
+
+igstk (4.2.0-1) unstable; urgency=low
+
+ * new release
+ * upload to unstable
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Mon, 24 Aug 2009 15:12:48 -0400
+
igstk (4.2.0~cvs20090616-1) experimental; urgency=low
* new upstream snapshot
Modified: trunk/packages/igstk/trunk/debian/control
===================================================================
--- trunk/packages/igstk/trunk/debian/control 2009-12-05 23:06:10 UTC (rev 4436)
+++ trunk/packages/igstk/trunk/debian/control 2009-12-06 17:28:32 UTC (rev 4437)
@@ -3,12 +3,13 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>, Steve M. Robbins <smr at debian.org>
-Build-Depends: debhelper (>= 7), dpatch, cmake, libinsighttoolkit3-dev, libvtk5-dev,
+Build-Depends: debhelper (>= 7), quilt, cmake, libinsighttoolkit3-dev (>= 3.16), 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, uuid-dev,
- libxss-dev, libxft-dev, libopenigtlink1-dev
+ libxss-dev, libxft-dev, libopenigtlink1-dev, libgdcm2-dev, libssl-dev, libopenjpeg-dev,
+ libavcodec-dev, libavformat-dev, libswscale-dev
Build-Depends-Indep: doxygen, graphviz
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
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
@@ -134,5 +135,3 @@
exception-handling and problem resolution.
.
This package contains examples from the IGstk source.
-
-
Modified: trunk/packages/igstk/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/igstk/trunk/debian/get-orig-source 2009-12-05 23:06:10 UTC (rev 4436)
+++ trunk/packages/igstk/trunk/debian/get-orig-source 2009-12-06 17:28:32 UTC (rev 4437)
@@ -1,17 +1,15 @@
PACKAGE=igstk
-
-
#################### RELEASE ######################
-#wget -c http://public.kitware.com/IGSTKWIKI/images/2/2b/IGSTK-4-0.tar.gz
-#tar -xzf IGSTK-4-0.tar.gz
-#mv IGSTK-4-0 igstk-4.0.0
-#echo "Creating orig tarball."
-#tar -czf igstk_4.0.0.orig.tar.gz igstk-4.0.0/
-#echo "Removing extracted directory."
-#rm -rf igstk-4.0.0/
-#rm IGSTK-4-0.tar.gz
-#exit
+wget -c http://public.kitware.com/IGSTKWIKI/images/2/25/IGSTK-4-2.tar.gz
+tar -xzf IGSTK-4-2.tar.gz
+mv IGSTK-4-2 igstk-4.2.0
+echo "Creating orig tarball."
+tar -czf igstk_4.2.0.orig.tar.gz igstk-4.2.0/
+echo "Removing extracted directory."
+rm -rf igstk-4.2.0/
+rm IGSTK-4-2.tar.gz
+exit
################## DEVELOPMENT ####################
#VERSION=4.0.0
Deleted: trunk/packages/igstk/trunk/debian/patches/00list
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/00list 2009-12-05 23:06:10 UTC (rev 4436)
+++ trunk/packages/igstk/trunk/debian/patches/00list 2009-12-06 17:28:32 UTC (rev 4437)
@@ -1,5 +0,0 @@
-12_doxygen.dpatch
-34_disable_resource_intensely_tests.dpatch
-70_vtk_use_qvtk.dpatch
-90_examples.dpatch
-89_SceneGraphVisualization.dpatch
Added: trunk/packages/igstk/trunk/debian/patches/05_cvs20090823.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/05_cvs20090823.diff (rev 0)
+++ trunk/packages/igstk/trunk/debian/patches/05_cvs20090823.diff 2009-12-06 17:28:32 UTC (rev 4437)
@@ -0,0 +1,126 @@
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Apply upstream's CVS patches
+
+Index: igstk-4.2.0/CMakeLists.txt
+===================================================================
+--- igstk-4.2.0.orig/CMakeLists.txt 2009-06-18 14:40:54.000000000 -0400
++++ igstk-4.2.0/CMakeLists.txt 2009-12-05 14:43:46.000000000 -0500
+@@ -7,12 +7,24 @@
+
+ # version
+ SET(IGSTK_VERSION_MAJOR "4")
+-SET(IGSTK_VERSION_MINOR "0")
++SET(IGSTK_VERSION_MINOR "2")
+ SET(IGSTK_VERSION_PATCH "0")
+
+ SET (LIBRARY_OUTPUT_PATH ${IGSTK_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries." FORCE)
+ SET (EXECUTABLE_OUTPUT_PATH ${IGSTK_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables." FORCE)
+
++# Append the library version information to the library target properties.
++OPTION(IGSTK_WITH_LIBRARY_VERSION "Build with library version information" OFF)
++IF(IGSTK_WITH_LIBRARY_VERSION)
++ SET(IGSTK_LIBRARY_PROPERTIES ${IGSTK_LIBRARY_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}
++ )
++ENDIF(IGSTK_WITH_LIBRARY_VERSION)
++
+ # Build with shared libraries
+ OPTION(BUILD_SHARED_LIBS "Build with shared libraries" OFF)
+
+@@ -181,6 +193,32 @@
+ LINK_DIRECTORIES( ${MTC_LIBRARY_DIRS} )
+ ENDIF(MTC_INCLUDE_DIRECTORY)
+ ENDIF(IGSTK_USE_MicronTracker)
++# Connect InfiniTrack
++OPTION(IGSTK_USE_InfiniTrack "Connect InfiniTrack " OFF)
++
++IF(IGSTK_USE_InfiniTrack)
++ IF(WIN32)
++ FIND_PATH(InfiniTrack_INCLUDE_DIRECTORY itkInterface.h
++ "C:/Program Files/Atracsys/infiniTrack/include"
++ DOC "Directory where the itkInterface.h file is located")
++ INCLUDE_DIRECTORIES( ${InfiniTrack_INCLUDE_DIRECTORY} )
++
++ FIND_LIBRARY( InfiniTrack_LIBRARY
++ NAMES v9ITK.dll v9ITK
++ PATHS "C:/Program Files/Atracsys/infiniTrack/lib"
++ DOC "Full path to the InfiniTrack library file"
++ )
++
++ IF(InfiniTrack_INCLUDE_DIRECTORY)
++ GET_FILENAME_COMPONENT( InfiniTrack_LIBRARY_DIRS ${InfiniTrack_LIBRARY} PATH )
++ LINK_DIRECTORIES( ${InfiniTrack_LIBRARY_DIRS} )
++ ENDIF(InfiniTrack_INCLUDE_DIRECTORY)
++
++ ELSE(WIN32)
++ MESSAGE(FATAL_ERROR " Please turn off InfiniTrack option. Only windows operating system is currently supported for InfiniTrack")
++ ENDIF(WIN32)
++
++ENDIF(IGSTK_USE_InfiniTrack)
+
+ #
+ # Use OpenIGTLink protocol
+Index: igstk-4.2.0/IGSTKConfig.cmake.in
+===================================================================
+--- igstk-4.2.0.orig/IGSTKConfig.cmake.in 2008-04-07 11:17:37.000000000 -0400
++++ igstk-4.2.0/IGSTKConfig.cmake.in 2009-12-05 14:43:46.000000000 -0500
+@@ -62,4 +62,7 @@
+ # MicronTracker option
+ SET(IGSTK_USE_MicronTracker "@IGSTK_USE_MicronTracker@")
+
++# InfinitTrack option
++SET(IGSTK_USE_InfiniTrack "@IGSTK_USE_MicronTracker@")
++
+
+Index: igstk-4.2.0/igstkConfigure.h.in
+===================================================================
+--- igstk-4.2.0.orig/igstkConfigure.h.in 2009-06-18 15:15:55.000000000 -0400
++++ igstk-4.2.0/igstkConfigure.h.in 2009-12-05 14:43:46.000000000 -0500
+@@ -35,3 +35,4 @@
+ #cmakedefine IGSTK_USE_SceneGraphVisualization
+ #cmakedefine IGSTK_USE_OpenCV
+ #cmakedefine IGSTK_USE_VideoImager
++#cmakedefine IGSTK_USE_InfiniTrack
+Index: igstk-4.2.0/igstkIncludeDirectories.cmake
+===================================================================
+--- igstk-4.2.0.orig/igstkIncludeDirectories.cmake 2008-07-10 11:40:59.000000000 -0400
++++ igstk-4.2.0/igstkIncludeDirectories.cmake 2009-12-05 14:43:46.000000000 -0500
+@@ -33,7 +33,7 @@
+
+ IF(IGSTK_USE_MicronTracker)
+ SET(IGSTK_INCLUDE_DIRS_SOURCE_TREE ${IGSTK_INCLUDE_DIRS_SOURCE_TREE}
+- ${MTC_INCLUDE_DIRECTORY})
++ ${MTC_INCLUDE_DIRECTORY} ${IGSTK_SOURCE_DIR}/Utilities/MicronTracker/src)
+ ENDIF(IGSTK_USE_MicronTracker)
+
+
+@@ -53,12 +53,4 @@
+ ${VTK_INCLUDE_DIRS}
+ )
+
+-# Patended include directories added only if the user explicitly enabled the
+-# IGSTK_USE_PATENTED option. Users are responsible for getting a license from the
+-# patent holders in order to use any of those methods.
+-IF(IGSTK_USE_PATENTED)
+- SET(IGSTK_INCLUDE_DIRS_INSTALL_TREE ${IGSTK_INCLUDE_DIRS_INSTALL_TREE}
+- ${IGSTK_INSTALL_INCLUDE_DIR}/Code/Patented
+- )
+-ENDIF(IGSTK_USE_PATENTED)
+
+Index: igstk-4.2.0/Testing/IGSTKTestingMacros.cmake
+===================================================================
+--- igstk-4.2.0.orig/Testing/IGSTKTestingMacros.cmake 2009-12-05 14:44:02.000000000 -0500
++++ igstk-4.2.0/Testing/IGSTKTestingMacros.cmake 2009-12-05 14:44:17.000000000 -0500
+@@ -1014,7 +1014,7 @@
+ TARGET_LINK_LIBRARIES(igstkStateMachineExportTest ${LIBRARY_NAME})
+ ENDIF(${SANDBOX_BUILD})
+
+-TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${LIBRARY_NAME})
++TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${LIBRARY_NAME} QtGui)
+
+ #-----------------------------------------------------------------------------
+ # Configure a header needed by igstkSystemInformation.
Property changes on: trunk/packages/igstk/trunk/debian/patches/05_cvs20090823.diff
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff (rev 0)
+++ trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff 2009-12-06 17:28:32 UTC (rev 4437)
@@ -0,0 +1,412 @@
+## 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 @@
+ * This class is used to add 2D annotations to the viewport.
+ * Annotations can be added to any of the four corners of the viewport.
+ *
+- * \image html igstkAnnotation2D.png "2D Annotation State Machine Diagram"
+- * \image latex igstkAnnotation2D.eps "2D Annotation Machine Diagram"
++ * TODO image html igstkAnnotation2D.png "2D Annotation State Machine Diagram"
++ * TODO image latex igstkAnnotation2D.eps "2D Annotation Machine Diagram"
+ *
+ * \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
+@@ -1,106 +1,286 @@
+-# -------------------------------------------------------------------------
+-# doxyfile for IGSTK
+-# modified by S. Barre (Time-stamp: <2003-01-13 20:55:40 barre>
+-# -------------------------------------------------------------------------
+-
+-PROJECT_NAME = IGSTK
+-
+-FULL_PATH_NAMES = YES
+-WARN_IF_UNDOCUMENTED = NO
+-
+-GENERATE_TREEVIEW = NO
+-GENERATE_TODOLIST = YES
+-GENERATE_BUGLIST = YES
+-GENERATE_HTML = YES
+-GENERATE_HTMLHELP = YES
+-GENERATE_LATEX = NO
+-GENERATE_MAN = NO
+-GENERATE_RTF = NO
+-
+-HAVE_DOT = YES
+-#HAVE_DOT = NO
+-DOT_PATH = "@DOT_PATH@"
+-CLASS_GRAPH = YES
+-COLLABORATION_GRAPH = YES
+-TEMPLATE_RELATIONS = YES
+-INCLUDE_GRAPH = YES
+-INCLUDED_BY_GRAPH = YES
+-CLASS_DIAGRAMS = YES
+-GENERATE_LEGEND = YES
+-GRAPHICAL_HIERARCHY = YES
+-
+-ALLEXTERNALS = NO
+-
+-IMAGE_PATH = "@IGSTK_BINARY_DIR@/Testing/Temporary/StateMachineDiagrams"
+-
+-
+-OUTPUT_DIRECTORY = "@IGSTK_BINARY_DIR@/Utilities/Doxygen/doc"
+-
+-INPUT = "@IGSTK_SOURCE_DIR@/Source"
+-
+-EXTRACT_ALL = YES
+-EXTRACT_PRIVATE = NO
+-EXTRACT_STATIC = YES
+-HIDE_UNDOC_MEMBERS = NO
+-HIDE_UNDOC_CLASSES = YES
+-ALWAYS_DETAILED_SEC = NO
+-SOURCE_BROWSER = YES
+-INLINE_SOURCES = NO
+-CASE_SENSE_NAMES = YES
+-VERBATIM_HEADERS = NO
+-SHOW_INCLUDE_FILES = YES
+-JAVADOC_AUTOBRIEF = YES
+-SORT_MEMBER_DOCS = NO
+-DISTRIBUTE_GROUP_DOC = YES
+-TAB_SIZE = 3
+-
+-FILE_PATTERNS = *.h *.hxx
+-RECURSIVE = YES
+-EXCLUDE_PATTERNS =
+-
+-HTML_ALIGN_MEMBERS = YES
+-ALPHABETICAL_INDEX = YES
+-COLS_IN_ALPHA_INDEX = 3
+-IGNORE_PREFIX = igstk
+-
+-ENABLE_PREPROCESSING = YES
+-MACRO_EXPANSION = YES
+-SEARCH_INCLUDES = YES
+-INCLUDE_PATH =
+-
+-EXPAND_ONLY_PREDEF = YES
+-
++# Doxyfile 1.5.9
+
+-PREDEFINED = "igstkNotUsed(x)=" \
+- "igstkTypeMacro(thisClass,superclass)= \
+- virtual const char *GetNameOfClass() const;" \
+- "igstkSetMacro(name,type)= \
+- virtual void Set##name (type _arg);" \
+- "igstkGetMacro(name,type)= \
+- virtual type Get##name ();" \
+- "igstkNewMacro(name)= \
+- static Pointer New(void);" \
+- "itkEventMacro(thisClass,superclass)= \
+- class thisClass : public superclass {};" \
+- "vtkTypeRevisionMacro(thisClass,superclass)= \
+- typedef superclass Superclass; \
+- virtual const char *GetClassName(); \
+- static int IsTypeOf(const char *type); \
+- virtual int IsA(const char *type); \
+- static thisClass* SafeDownCast(vtkObject *o);"\
+- "igstkLogMacro( x, y)=igstkLogMacro( x, y);" \
+- "igstkLogMacroStatic( obj, x, y)=igstkLogMacroStatic( obj, x, y);"\
+- "igstkFriendClassMacro(type)=" \
+- "igstkLoggerMacro()= \
+- protected: \
+- LoggerType* GetLogger() const; \
+- public: \
+- void SetLogger(LoggerType* logger);" \
+- "igstkStateMachineMacro()= \
+- void ExportStateMachineDescription( OutputStreamType & ostr, bool skipLoops=false ) const; "\
+- "FREEVERSION" "ERROR_CHECKING" \
+- "HAS_TIFF" "HAS_JPEG" "HAS_NETLIB" "HAS_PNG" "HAS_ZLIB" \
+- "HAS_GLUT" "HAS_QT" \
+- "VCL_USE_NATIVE_STL=1" "VCL_USE_NATIVE_COMPLEX=1" \
+- "VCL_HAS_BOOL=1" "VXL_BIG_ENDIAN=1" "VXL_LITTLE_ENDIAN=0"\
+- "VNL_DLL_DATA=" "size_t=vcl_size_t"
++#---------------------------------------------------------------------------
++# Project related configuration options
++#---------------------------------------------------------------------------
++DOXYFILE_ENCODING = UTF-8
++PROJECT_NAME = IGSTK
++PROJECT_NUMBER =
++OUTPUT_DIRECTORY = @IGSTK_BINARY_DIR@/Utilities/Doxygen/doc
++CREATE_SUBDIRS = NO
++OUTPUT_LANGUAGE = English
++BRIEF_MEMBER_DESC = YES
++REPEAT_BRIEF = YES
++ABBREVIATE_BRIEF =
++ALWAYS_DETAILED_SEC = NO
++INLINE_INHERITED_MEMB = NO
++FULL_PATH_NAMES = YES
++STRIP_FROM_PATH =
++STRIP_FROM_INC_PATH =
++SHORT_NAMES = NO
++JAVADOC_AUTOBRIEF = YES
++QT_AUTOBRIEF = NO
++MULTILINE_CPP_IS_BRIEF = NO
++INHERIT_DOCS = YES
++SEPARATE_MEMBER_PAGES = NO
++TAB_SIZE = 3
++ALIASES =
++OPTIMIZE_OUTPUT_FOR_C = NO
++OPTIMIZE_OUTPUT_JAVA = NO
++OPTIMIZE_FOR_FORTRAN = NO
++OPTIMIZE_OUTPUT_VHDL = NO
++EXTENSION_MAPPING =
++BUILTIN_STL_SUPPORT = NO
++CPP_CLI_SUPPORT = NO
++SIP_SUPPORT = NO
++IDL_PROPERTY_SUPPORT = YES
++DISTRIBUTE_GROUP_DOC = YES
++SUBGROUPING = YES
++TYPEDEF_HIDES_STRUCT = NO
++SYMBOL_CACHE_SIZE = 0
++#---------------------------------------------------------------------------
++# Build related configuration options
++#---------------------------------------------------------------------------
++EXTRACT_ALL = YES
++EXTRACT_PRIVATE = NO
++EXTRACT_STATIC = YES
++EXTRACT_LOCAL_CLASSES = YES
++EXTRACT_LOCAL_METHODS = NO
++EXTRACT_ANON_NSPACES = NO
++HIDE_UNDOC_MEMBERS = NO
++HIDE_UNDOC_CLASSES = YES
++HIDE_FRIEND_COMPOUNDS = NO
++HIDE_IN_BODY_DOCS = NO
++INTERNAL_DOCS = NO
++CASE_SENSE_NAMES = YES
++HIDE_SCOPE_NAMES = NO
++SHOW_INCLUDE_FILES = YES
++INLINE_INFO = YES
++SORT_MEMBER_DOCS = NO
++SORT_BRIEF_DOCS = NO
++SORT_GROUP_NAMES = NO
++SORT_BY_SCOPE_NAME = NO
++GENERATE_TODOLIST = YES
++GENERATE_TESTLIST = YES
++GENERATE_BUGLIST = YES
++GENERATE_DEPRECATEDLIST= YES
++ENABLED_SECTIONS =
++MAX_INITIALIZER_LINES = 30
++SHOW_USED_FILES = YES
++SHOW_DIRECTORIES = NO
++SHOW_FILES = YES
++SHOW_NAMESPACES = YES
++FILE_VERSION_FILTER =
++LAYOUT_FILE =
++#---------------------------------------------------------------------------
++# configuration options related to warning and progress messages
++#---------------------------------------------------------------------------
++QUIET = NO
++WARNINGS = YES
++WARN_IF_UNDOCUMENTED = NO
++WARN_IF_DOC_ERROR = YES
++WARN_NO_PARAMDOC = NO
++WARN_FORMAT = "$file:$line: $text"
++WARN_LOGFILE =
++#---------------------------------------------------------------------------
++# configuration options related to the input files
++#---------------------------------------------------------------------------
++INPUT = "@IGSTK_SOURCE_DIR@/Source"
++INPUT_ENCODING = UTF-8
++FILE_PATTERNS = *.h \
++ *.hxx
++RECURSIVE = YES
++EXCLUDE =
++EXCLUDE_SYMLINKS = NO
++EXCLUDE_PATTERNS =
++EXCLUDE_SYMBOLS =
++EXAMPLE_PATH =
++EXAMPLE_PATTERNS =
++EXAMPLE_RECURSIVE = NO
++IMAGE_PATH = "@IGSTK_BINARY_DIR@/Testing/Temporary/StateMachineDiagrams"
++INPUT_FILTER =
++FILTER_PATTERNS =
++FILTER_SOURCE_FILES = NO
++#---------------------------------------------------------------------------
++# configuration options related to source browsing
++#---------------------------------------------------------------------------
++SOURCE_BROWSER = YES
++INLINE_SOURCES = NO
++STRIP_CODE_COMMENTS = YES
++REFERENCED_BY_RELATION = NO
++REFERENCES_RELATION = NO
++REFERENCES_LINK_SOURCE = YES
++USE_HTAGS = NO
++VERBATIM_HEADERS = NO
++#---------------------------------------------------------------------------
++# configuration options related to the alphabetical class index
++#---------------------------------------------------------------------------
++ALPHABETICAL_INDEX = YES
++COLS_IN_ALPHA_INDEX = 3
++IGNORE_PREFIX = igstk
++#---------------------------------------------------------------------------
++# configuration options related to the HTML output
++#---------------------------------------------------------------------------
++GENERATE_HTML = YES
++HTML_OUTPUT = html
++HTML_FILE_EXTENSION = .html
++HTML_HEADER =
++HTML_FOOTER =
++HTML_STYLESHEET =
++HTML_ALIGN_MEMBERS = YES
++HTML_DYNAMIC_SECTIONS = NO
++GENERATE_DOCSET = NO
++DOCSET_FEEDNAME = "Doxygen generated docs"
++DOCSET_BUNDLE_ID = org.doxygen.Project
++GENERATE_HTMLHELP = YES
++CHM_FILE =
++HHC_LOCATION =
++GENERATE_CHI = NO
++CHM_INDEX_ENCODING =
++BINARY_TOC = NO
++TOC_EXPAND = NO
++GENERATE_QHP = NO
++QCH_FILE =
++QHP_NAMESPACE =
++QHP_VIRTUAL_FOLDER = doc
++QHP_CUST_FILTER_NAME =
++QHP_CUST_FILTER_ATTRS =
++QHP_SECT_FILTER_ATTRS =
++QHG_LOCATION =
++DISABLE_INDEX = NO
++ENUM_VALUES_PER_LINE = 4
++GENERATE_TREEVIEW = NO
++TREEVIEW_WIDTH = 250
++FORMULA_FONTSIZE = 10
++#---------------------------------------------------------------------------
++# configuration options related to the LaTeX output
++#---------------------------------------------------------------------------
++GENERATE_LATEX = NO
++LATEX_OUTPUT = latex
++LATEX_CMD_NAME = latex
++MAKEINDEX_CMD_NAME = makeindex
++COMPACT_LATEX = NO
++PAPER_TYPE = a4wide
++EXTRA_PACKAGES =
++LATEX_HEADER =
++PDF_HYPERLINKS = NO
++USE_PDFLATEX = NO
++LATEX_BATCHMODE = NO
++LATEX_HIDE_INDICES = NO
++LATEX_SOURCE_CODE = NO
++#---------------------------------------------------------------------------
++# configuration options related to the RTF output
++#---------------------------------------------------------------------------
++GENERATE_RTF = NO
++RTF_OUTPUT = rtf
++COMPACT_RTF = NO
++RTF_HYPERLINKS = NO
++RTF_STYLESHEET_FILE =
++RTF_EXTENSIONS_FILE =
++#---------------------------------------------------------------------------
++# configuration options related to the man page output
++#---------------------------------------------------------------------------
++GENERATE_MAN = NO
++MAN_OUTPUT = man
++MAN_EXTENSION = .3
++MAN_LINKS = NO
++#---------------------------------------------------------------------------
++# configuration options related to the XML output
++#---------------------------------------------------------------------------
++GENERATE_XML = NO
++XML_OUTPUT = xml
++XML_SCHEMA =
++XML_DTD =
++XML_PROGRAMLISTING = YES
++#---------------------------------------------------------------------------
++# configuration options for the AutoGen Definitions output
++#---------------------------------------------------------------------------
++GENERATE_AUTOGEN_DEF = NO
++#---------------------------------------------------------------------------
++# configuration options related to the Perl module output
++#---------------------------------------------------------------------------
++GENERATE_PERLMOD = NO
++PERLMOD_LATEX = NO
++PERLMOD_PRETTY = YES
++PERLMOD_MAKEVAR_PREFIX =
++#---------------------------------------------------------------------------
++# Configuration options related to the preprocessor
++#---------------------------------------------------------------------------
++ENABLE_PREPROCESSING = YES
++MACRO_EXPANSION = YES
++EXPAND_ONLY_PREDEF = YES
++SEARCH_INCLUDES = YES
++INCLUDE_PATH =
++INCLUDE_FILE_PATTERNS =
++PREDEFINED = "igstkNotUsed(x)=" \
++ "igstkTypeMacro(thisClass,superclass)= virtual const char *GetNameOfClass() const;" \
++ "igstkSetMacro(name,type)= virtual void Set##name (type _arg);" \
++ "igstkGetMacro(name,type)= virtual type Get##name ();" \
++ "igstkNewMacro(name)= static Pointer New(void);" \
++ "itkEventMacro(thisClass,superclass)= class thisClass : public superclass {};" \
++ "vtkTypeRevisionMacro(thisClass,superclass)= typedef superclass Superclass; virtual const char *GetClassName(); static int IsTypeOf(const char *type); virtual int IsA(const char *type); static thisClass* SafeDownCast(vtkObject *o);" \
++ "igstkLogMacro( x, y)=igstkLogMacro( x, y);" \
++ "igstkLogMacroStatic( obj, x, y)=igstkLogMacroStatic( obj, x, y);" \
++ "igstkFriendClassMacro(type)=" \
++ "igstkLoggerMacro()= protected: LoggerType* GetLogger() const; public: void SetLogger(LoggerType* logger);" \
++ "igstkStateMachineMacro()= void ExportStateMachineDescription( OutputStreamType & ostr, bool skipLoops=false ) const; " \
++ "FREEVERSION" \
++ "ERROR_CHECKING" \
++ "HAS_TIFF" \
++ "HAS_JPEG" \
++ "HAS_NETLIB" \
++ "HAS_PNG" \
++ "HAS_ZLIB" \
++ "HAS_GLUT" \
++ "HAS_QT" \
++ "VCL_USE_NATIVE_STL=1" \
++ "VCL_USE_NATIVE_COMPLEX=1" \
++ "VCL_HAS_BOOL=1" \
++ "VXL_BIG_ENDIAN=1" \
++ "VXL_LITTLE_ENDIAN=0" \
++ "VNL_DLL_DATA=" \
++ "size_t=vcl_size_t"
++EXPAND_AS_DEFINED =
++SKIP_FUNCTION_MACROS = YES
++#---------------------------------------------------------------------------
++# Configuration::additions related to external references
++#---------------------------------------------------------------------------
++TAGFILES =
++GENERATE_TAGFILE =
++ALLEXTERNALS = NO
++EXTERNAL_GROUPS = YES
++PERL_PATH = /usr/bin/perl
++#---------------------------------------------------------------------------
++# Configuration options related to the dot tool
++#---------------------------------------------------------------------------
++CLASS_DIAGRAMS = YES
++MSCGEN_PATH =
++HIDE_UNDOC_RELATIONS = YES
++HAVE_DOT = YES
++DOT_FONTNAME = FreeSans
++DOT_FONTSIZE = 10
++DOT_FONTPATH =
++CLASS_GRAPH = YES
++COLLABORATION_GRAPH = YES
++GROUP_GRAPHS = YES
++UML_LOOK = NO
++TEMPLATE_RELATIONS = YES
++INCLUDE_GRAPH = YES
++INCLUDED_BY_GRAPH = YES
++CALL_GRAPH = NO
++CALLER_GRAPH = NO
++GRAPHICAL_HIERARCHY = YES
++DIRECTORY_GRAPH = YES
++DOT_IMAGE_FORMAT = jpg
++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
++#---------------------------------------------------------------------------
++# Options related to the search engine
++#---------------------------------------------------------------------------
++SEARCHENGINE = NO
Property changes on: trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/packages/igstk/trunk/debian/patches/12_doxygen.dpatch
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/12_doxygen.dpatch 2009-12-05 23:06:10 UTC (rev 4436)
+++ trunk/packages/igstk/trunk/debian/patches/12_doxygen.dpatch 2009-12-06 17:28:32 UTC (rev 4437)
@@ -1,401 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_doxygen.dpatch by <domibel at t500lenny>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: generate a newer doxygen input file
-
- at DPATCH@
-diff -urNad igstk-4.2.0~cvs20090610~/Utilities/Doxygen/doxyfile.in igstk-4.2.0~cvs20090610/Utilities/Doxygen/doxyfile.in
---- igstk-4.2.0~cvs20090610~/Utilities/Doxygen/doxyfile.in 2009-06-11 20:28:02.000000000 -0400
-+++ igstk-4.2.0~cvs20090610/Utilities/Doxygen/doxyfile.in 2009-06-11 20:28:49.000000000 -0400
-@@ -2,105 +2,289 @@
- # doxyfile for IGSTK
- # modified by S. Barre (Time-stamp: <2003-01-13 20:55:40 barre>
- # -------------------------------------------------------------------------
-+# updated for Debian : doxygen -u -s doxyfile.in
-
--PROJECT_NAME = IGSTK
--
--FULL_PATH_NAMES = YES
--WARN_IF_UNDOCUMENTED = NO
--
--GENERATE_TREEVIEW = NO
--GENERATE_TODOLIST = YES
--GENERATE_BUGLIST = YES
--GENERATE_HTML = YES
--GENERATE_HTMLHELP = YES
--GENERATE_LATEX = NO
--GENERATE_MAN = NO
--GENERATE_RTF = NO
--
--HAVE_DOT = YES
--#HAVE_DOT = NO
--DOT_PATH = "@DOT_PATH@"
--CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
--TEMPLATE_RELATIONS = YES
--INCLUDE_GRAPH = YES
--INCLUDED_BY_GRAPH = YES
--CLASS_DIAGRAMS = YES
--GENERATE_LEGEND = YES
--GRAPHICAL_HIERARCHY = YES
--
--ALLEXTERNALS = NO
--
--IMAGE_PATH = "@IGSTK_BINARY_DIR@/Testing/Temporary/StateMachineDiagrams"
--
--
--OUTPUT_DIRECTORY = "@IGSTK_BINARY_DIR@/Utilities/Doxygen/doc"
--
--INPUT = "@IGSTK_SOURCE_DIR@/Source"
--
--EXTRACT_ALL = YES
--EXTRACT_PRIVATE = NO
--EXTRACT_STATIC = YES
--HIDE_UNDOC_MEMBERS = NO
--HIDE_UNDOC_CLASSES = YES
--ALWAYS_DETAILED_SEC = NO
--SOURCE_BROWSER = YES
--INLINE_SOURCES = NO
--CASE_SENSE_NAMES = YES
--VERBATIM_HEADERS = NO
--SHOW_INCLUDE_FILES = YES
--JAVADOC_AUTOBRIEF = YES
--SORT_MEMBER_DOCS = NO
--DISTRIBUTE_GROUP_DOC = YES
--TAB_SIZE = 3
--
--FILE_PATTERNS = *.h *.hxx
--RECURSIVE = YES
--EXCLUDE_PATTERNS =
--
--HTML_ALIGN_MEMBERS = YES
--ALPHABETICAL_INDEX = YES
--COLS_IN_ALPHA_INDEX = 3
--IGNORE_PREFIX = igstk
--
--ENABLE_PREPROCESSING = YES
--MACRO_EXPANSION = YES
--SEARCH_INCLUDES = YES
--INCLUDE_PATH =
--
--EXPAND_ONLY_PREDEF = YES
--
--
--PREDEFINED = "igstkNotUsed(x)=" \
-- "igstkTypeMacro(thisClass,superclass)= \
-- virtual const char *GetNameOfClass() const;" \
-- "igstkSetMacro(name,type)= \
-- virtual void Set##name (type _arg);" \
-- "igstkGetMacro(name,type)= \
-- virtual type Get##name ();" \
-- "igstkNewMacro(name)= \
-- static Pointer New(void);" \
-- "itkEventMacro(thisClass,superclass)= \
-- class thisClass : public superclass {};" \
-- "vtkTypeRevisionMacro(thisClass,superclass)= \
-- typedef superclass Superclass; \
-- virtual const char *GetClassName(); \
-- static int IsTypeOf(const char *type); \
-- virtual int IsA(const char *type); \
-- static thisClass* SafeDownCast(vtkObject *o);"\
-- "igstkLogMacro( x, y)=igstkLogMacro( x, y);" \
-- "igstkLogMacroStatic( obj, x, y)=igstkLogMacroStatic( obj, x, y);"\
-- "igstkFriendClassMacro(type)=" \
-- "igstkLoggerMacro()= \
-- protected: \
-- LoggerType* GetLogger() const; \
-- public: \
-- void SetLogger(LoggerType* logger);" \
-- "igstkStateMachineMacro()= \
-- void ExportStateMachineDescription( OutputStreamType & ostr, bool skipLoops=false ) const; "\
-- "FREEVERSION" "ERROR_CHECKING" \
-- "HAS_TIFF" "HAS_JPEG" "HAS_NETLIB" "HAS_PNG" "HAS_ZLIB" \
-- "HAS_GLUT" "HAS_QT" \
-- "VCL_USE_NATIVE_STL=1" "VCL_USE_NATIVE_COMPLEX=1" \
-- "VCL_HAS_BOOL=1" "VXL_BIG_ENDIAN=1" "VXL_LITTLE_ENDIAN=0"\
-- "VNL_DLL_DATA=" "size_t=vcl_size_t"
-+#---------------------------------------------------------------------------
-+# Project related configuration options
-+#---------------------------------------------------------------------------
-+DOXYFILE_ENCODING = UTF-8
-+PROJECT_NAME = IGSTK
-+PROJECT_NUMBER =
-+OUTPUT_DIRECTORY = "@IGSTK_BINARY_DIR@/Utilities/Doxygen/doc"
-+CREATE_SUBDIRS = NO
-+OUTPUT_LANGUAGE = English
-+BRIEF_MEMBER_DESC = YES
-+REPEAT_BRIEF = YES
-+ABBREVIATE_BRIEF =
-+ALWAYS_DETAILED_SEC = NO
-+INLINE_INHERITED_MEMB = NO
-+FULL_PATH_NAMES = YES
-+STRIP_FROM_PATH =
-+STRIP_FROM_INC_PATH =
-+SHORT_NAMES = NO
-+JAVADOC_AUTOBRIEF = YES
-+QT_AUTOBRIEF = NO
-+MULTILINE_CPP_IS_BRIEF = NO
-+INHERIT_DOCS = YES
-+SEPARATE_MEMBER_PAGES = NO
-+TAB_SIZE = 3
-+ALIASES =
-+OPTIMIZE_OUTPUT_FOR_C = NO
-+OPTIMIZE_OUTPUT_JAVA = NO
-+OPTIMIZE_FOR_FORTRAN = NO
-+OPTIMIZE_OUTPUT_VHDL = NO
-+EXTENSION_MAPPING =
-+BUILTIN_STL_SUPPORT = NO
-+CPP_CLI_SUPPORT = NO
-+SIP_SUPPORT = NO
-+IDL_PROPERTY_SUPPORT = YES
-+DISTRIBUTE_GROUP_DOC = YES
-+SUBGROUPING = YES
-+TYPEDEF_HIDES_STRUCT = NO
-+SYMBOL_CACHE_SIZE = 0
-+#---------------------------------------------------------------------------
-+# Build related configuration options
-+#---------------------------------------------------------------------------
-+EXTRACT_ALL = YES
-+EXTRACT_PRIVATE = NO
-+EXTRACT_STATIC = YES
-+EXTRACT_LOCAL_CLASSES = YES
-+EXTRACT_LOCAL_METHODS = NO
-+EXTRACT_ANON_NSPACES = NO
-+HIDE_UNDOC_MEMBERS = NO
-+HIDE_UNDOC_CLASSES = YES
-+HIDE_FRIEND_COMPOUNDS = NO
-+HIDE_IN_BODY_DOCS = NO
-+INTERNAL_DOCS = NO
-+CASE_SENSE_NAMES = YES
-+HIDE_SCOPE_NAMES = NO
-+SHOW_INCLUDE_FILES = YES
-+INLINE_INFO = YES
-+SORT_MEMBER_DOCS = NO
-+SORT_BRIEF_DOCS = NO
-+SORT_GROUP_NAMES = NO
-+SORT_BY_SCOPE_NAME = NO
-+GENERATE_TODOLIST = YES
-+GENERATE_TESTLIST = YES
-+GENERATE_BUGLIST = YES
-+GENERATE_DEPRECATEDLIST= YES
-+ENABLED_SECTIONS =
-+MAX_INITIALIZER_LINES = 30
-+SHOW_USED_FILES = YES
-+SHOW_DIRECTORIES = NO
-+SHOW_FILES = YES
-+SHOW_NAMESPACES = YES
-+FILE_VERSION_FILTER =
-+LAYOUT_FILE =
-+#---------------------------------------------------------------------------
-+# configuration options related to warning and progress messages
-+#---------------------------------------------------------------------------
-+QUIET = NO
-+WARNINGS = YES
-+WARN_IF_UNDOCUMENTED = NO
-+WARN_IF_DOC_ERROR = YES
-+WARN_NO_PARAMDOC = NO
-+WARN_FORMAT = "$file:$line: $text"
-+WARN_LOGFILE =
-+#---------------------------------------------------------------------------
-+# configuration options related to the input files
-+#---------------------------------------------------------------------------
-+INPUT = "@IGSTK_SOURCE_DIR@/Source"
-+INPUT_ENCODING = UTF-8
-+FILE_PATTERNS = *.h \
-+ *.hxx
-+RECURSIVE = YES
-+EXCLUDE =
-+EXCLUDE_SYMLINKS = NO
-+EXCLUDE_PATTERNS =
-+EXCLUDE_SYMBOLS =
-+EXAMPLE_PATH =
-+EXAMPLE_PATTERNS =
-+EXAMPLE_RECURSIVE = NO
-+IMAGE_PATH = "@IGSTK_BINARY_DIR@/Testing/Temporary/StateMachineDiagrams"
-+INPUT_FILTER =
-+FILTER_PATTERNS =
-+FILTER_SOURCE_FILES = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to source browsing
-+#---------------------------------------------------------------------------
-+SOURCE_BROWSER = YES
-+INLINE_SOURCES = NO
-+STRIP_CODE_COMMENTS = YES
-+REFERENCED_BY_RELATION = NO
-+REFERENCES_RELATION = NO
-+REFERENCES_LINK_SOURCE = YES
-+USE_HTAGS = NO
-+VERBATIM_HEADERS = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the alphabetical class index
-+#---------------------------------------------------------------------------
-+ALPHABETICAL_INDEX = YES
-+COLS_IN_ALPHA_INDEX = 3
-+IGNORE_PREFIX = igstk
-+#---------------------------------------------------------------------------
-+# configuration options related to the HTML output
-+#---------------------------------------------------------------------------
-+GENERATE_HTML = YES
-+HTML_OUTPUT = html
-+HTML_FILE_EXTENSION = .html
-+HTML_HEADER =
-+HTML_FOOTER =
-+HTML_STYLESHEET =
-+HTML_ALIGN_MEMBERS = YES
-+HTML_DYNAMIC_SECTIONS = NO
-+GENERATE_DOCSET = NO
-+DOCSET_FEEDNAME = "Doxygen generated docs"
-+DOCSET_BUNDLE_ID = org.doxygen.Project
-+GENERATE_HTMLHELP = YES
-+CHM_FILE =
-+HHC_LOCATION =
-+GENERATE_CHI = NO
-+CHM_INDEX_ENCODING =
-+BINARY_TOC = NO
-+TOC_EXPAND = NO
-+GENERATE_QHP = NO
-+QCH_FILE =
-+QHP_NAMESPACE =
-+QHP_VIRTUAL_FOLDER = doc
-+QHP_CUST_FILTER_NAME =
-+QHP_CUST_FILTER_ATTRS =
-+QHP_SECT_FILTER_ATTRS =
-+QHG_LOCATION =
-+DISABLE_INDEX = NO
-+ENUM_VALUES_PER_LINE = 4
-+GENERATE_TREEVIEW = NO
-+TREEVIEW_WIDTH = 250
-+FORMULA_FONTSIZE = 10
-+#---------------------------------------------------------------------------
-+# configuration options related to the LaTeX output
-+#---------------------------------------------------------------------------
-+GENERATE_LATEX = NO
-+LATEX_OUTPUT = latex
-+LATEX_CMD_NAME = latex
-+MAKEINDEX_CMD_NAME = makeindex
-+COMPACT_LATEX = NO
-+PAPER_TYPE = a4wide
-+EXTRA_PACKAGES =
-+LATEX_HEADER =
-+PDF_HYPERLINKS = NO
-+USE_PDFLATEX = NO
-+LATEX_BATCHMODE = NO
-+LATEX_HIDE_INDICES = NO
-+LATEX_SOURCE_CODE = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the RTF output
-+#---------------------------------------------------------------------------
-+GENERATE_RTF = NO
-+RTF_OUTPUT = rtf
-+COMPACT_RTF = NO
-+RTF_HYPERLINKS = NO
-+RTF_STYLESHEET_FILE =
-+RTF_EXTENSIONS_FILE =
-+#---------------------------------------------------------------------------
-+# configuration options related to the man page output
-+#---------------------------------------------------------------------------
-+GENERATE_MAN = NO
-+MAN_OUTPUT = man
-+MAN_EXTENSION = .3
-+MAN_LINKS = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the XML output
-+#---------------------------------------------------------------------------
-+GENERATE_XML = NO
-+XML_OUTPUT = xml
-+XML_SCHEMA =
-+XML_DTD =
-+XML_PROGRAMLISTING = YES
-+#---------------------------------------------------------------------------
-+# configuration options for the AutoGen Definitions output
-+#---------------------------------------------------------------------------
-+GENERATE_AUTOGEN_DEF = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the Perl module output
-+#---------------------------------------------------------------------------
-+GENERATE_PERLMOD = NO
-+PERLMOD_LATEX = NO
-+PERLMOD_PRETTY = YES
-+PERLMOD_MAKEVAR_PREFIX =
-+#---------------------------------------------------------------------------
-+# Configuration options related to the preprocessor
-+#---------------------------------------------------------------------------
-+ENABLE_PREPROCESSING = YES
-+MACRO_EXPANSION = YES
-+EXPAND_ONLY_PREDEF = YES
-+SEARCH_INCLUDES = YES
-+INCLUDE_PATH =
-+INCLUDE_FILE_PATTERNS =
-+PREDEFINED = "igstkNotUsed(x)=" \
-+ "igstkTypeMacro(thisClass,superclass)= virtual const char *GetNameOfClass() const;" \
-+ "igstkSetMacro(name,type)= virtual void Set##name (type _arg);" \
-+ "igstkGetMacro(name,type)= virtual type Get##name ();" \
-+ "igstkNewMacro(name)= static Pointer New(void);" \
-+ "itkEventMacro(thisClass,superclass)= class thisClass : public superclass {};" \
-+ "vtkTypeRevisionMacro(thisClass,superclass)= typedef superclass Superclass; virtual const char *GetClassName(); static int IsTypeOf(const char *type); virtual int IsA(const char *type); static thisClass* SafeDownCast(vtkObject *o);" \
-+ "igstkLogMacro( x, y)=igstkLogMacro( x, y);" \
-+ "igstkLogMacroStatic( obj, x, y)=igstkLogMacroStatic( obj, x, y);" \
-+ "igstkFriendClassMacro(type)=" \
-+ "igstkLoggerMacro()= protected: LoggerType* GetLogger() const; public: void SetLogger(LoggerType* logger);" \
-+ "igstkStateMachineMacro()= void ExportStateMachineDescription( OutputStreamType & ostr, bool skipLoops=false ) const; " \
-+ "FREEVERSION" \
-+ "ERROR_CHECKING" \
-+ "HAS_TIFF" \
-+ "HAS_JPEG" \
-+ "HAS_NETLIB" \
-+ "HAS_PNG" \
-+ "HAS_ZLIB" \
-+ "HAS_GLUT" \
-+ "HAS_QT" \
-+ "VCL_USE_NATIVE_STL=1" \
-+ "VCL_USE_NATIVE_COMPLEX=1" \
-+ "VCL_HAS_BOOL=1" \
-+ "VXL_BIG_ENDIAN=1" \
-+ "VXL_LITTLE_ENDIAN=0" \
-+ "VNL_DLL_DATA=" \
-+ "size_t=vcl_size_t"
-+EXPAND_AS_DEFINED =
-+SKIP_FUNCTION_MACROS = YES
-+#---------------------------------------------------------------------------
-+# Configuration::additions related to external references
-+#---------------------------------------------------------------------------
-+TAGFILES =
-+GENERATE_TAGFILE =
-+ALLEXTERNALS = NO
-+EXTERNAL_GROUPS = YES
-+PERL_PATH = /usr/bin/perl
-+#---------------------------------------------------------------------------
-+# Configuration options related to the dot tool
-+#---------------------------------------------------------------------------
-+CLASS_DIAGRAMS = YES
-+MSCGEN_PATH =
-+HIDE_UNDOC_RELATIONS = YES
-+HAVE_DOT = YES
-+DOT_FONTNAME = FreeSans
-+DOT_FONTSIZE = 10
-+DOT_FONTPATH =
-+CLASS_GRAPH = YES
-+COLLABORATION_GRAPH = YES
-+GROUP_GRAPHS = YES
-+UML_LOOK = NO
-+TEMPLATE_RELATIONS = YES
-+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
-+#---------------------------------------------------------------------------
-+# Options related to the search engine
-+#---------------------------------------------------------------------------
-+SEARCHENGINE = NO
Added: trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff (rev 0)
+++ trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff 2009-12-06 17:28:32 UTC (rev 4437)
@@ -0,0 +1,79 @@
+## 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
+@@ -159,9 +159,9 @@
+ ${IGSTK_DATA_ROOT}/Input/USLiver
+ ${IGSTK_DATA_ROOT}/Input/MRLiver)
+
+- ADD_TEST( igstkMR3DImageToUS3DImageRegistrationTest ${IGSTK_TESTS}
+- igstkMR3DImageToUS3DImageRegistrationTest
+- ${IGSTK_DATA_ROOT}/Input/MRLiver)
++# ADD_TEST( igstkMR3DImageToUS3DImageRegistrationTest ${IGSTK_TESTS}
++# igstkMR3DImageToUS3DImageRegistrationTest
++# ${IGSTK_DATA_ROOT}/Input/MRLiver)
+
+ ADD_TEST( igstkAuroraTrackerSimulatedTest
+ ${IGSTK_TESTS}
+@@ -290,7 +290,7 @@
+
+ #-----------------------------------------------------------------------------
+ # Tests that depend on FLTK
+-IF(${IGSTK_USE_FLTK})
++IF(FALSE)
+ ADD_TEST(igstkCylinderObjectTest ${IGSTK_TESTS} igstkCylinderObjectTest)
+ ADD_TEST(igstkEllipsoidObjectTest ${IGSTK_TESTS} igstkEllipsoidObjectTest)
+ ADD_TEST(igstkFLTKTextBufferLogOutputTest ${IGSTK_TESTS} igstkFLTKTextBufferLogOutputTest)
+@@ -563,7 +563,7 @@
+ ${IGSTK_DATA_ROOT}/Input/E000192
+ ${IGSTK_TEST_OUTPUT_DIR}/igstkCrossHairObjectRepresentationTest.png)
+
+-ENDIF(${IGSTK_USE_FLTK})
++ENDIF(FALSE)
+
+ IF(${IGSTK_USE_MicronTracker})
+ ADD_TEST( igstkMicronTrackerTest
+@@ -577,7 +577,7 @@
+ ${IGSTK_TESTS} igstkMicronTrackerToolTest )
+ ENDIF(${IGSTK_USE_MicronTracker})
+
+-IF(IGSTK_USE_OpenIGTLink)
++IF(${IGSTK_USE_OpenIGTLink})
+
+ ADD_TEST( igstkTrackerToolObserverToOpenIGTLinkRelayTest
+ ${IGSTK_TESTS}
+@@ -609,9 +609,9 @@
+ ${IGSTK_DATA_ROOT}/Input/Markers )
+ ENDIF(IGSTK_USE_MicronTracker)
+
+-ENDIF(IGSTK_USE_OpenIGTLink)
++ENDIF(${IGSTK_USE_OpenIGTLink})
+
+-IF(${IGSTK_USE_Qt})
++IF(FALSE)
+ ADD_TEST( igstkQTWidgetTest
+ ${IGSTK_TESTS}
+ igstkQTWidgetTest)
+@@ -708,9 +708,9 @@
+ ${IGSTK_TEST_OUTPUT_DIR}/igstkMeshResliceObjectRepresentationQtTest.png)
+
+
+-ENDIF(${IGSTK_USE_Qt})
++ENDIF(FALSE)
+
+-IF(IGSTK_USE_VideoImager)
++IF(${IGSTK_USE_VideoImager})
+
+ ADD_TEST( igstkVideoImagerTest
+ ${IGSTK_TESTS}
+@@ -737,7 +737,7 @@
+ igstkVideoFrameRepresentationTest
+ )
+
+-ENDIF(IGSTK_USE_VideoImager)
++ENDIF(${IGSTK_USE_VideoImager})
+
+
+ #-----------------------------------------------------------------------------
Property changes on: trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.dpatch
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.dpatch 2009-12-05 23:06:10 UTC (rev 4436)
+++ trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.dpatch 2009-12-06 17:28:32 UTC (rev 4437)
@@ -1,68 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 34_disable_resource_intensely_tests.dpatch by <domibel at sid1500>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: disable resource intensely tests and tests based on FLTK or QT
-
- at DPATCH@
-diff -urNad igstk-4.2.0~cvs20090616~/Testing/IGSTKTestingMacros.cmake igstk-4.2.0~cvs20090616/Testing/IGSTKTestingMacros.cmake
---- igstk-4.2.0~cvs20090616~/Testing/IGSTKTestingMacros.cmake 2009-06-16 15:04:34.000000000 -0400
-+++ igstk-4.2.0~cvs20090616/Testing/IGSTKTestingMacros.cmake 2009-06-17 15:42:49.000000000 -0400
-@@ -156,9 +156,9 @@
- ADD_TEST( igstkUSImageReaderTest ${IGSTK_TESTS} igstkUSImageReaderTest
- ${IGSTK_DATA_ROOT}/Input/USLiver)
-
-- ADD_TEST( igstkMR3DImageToUS3DImageRegistrationTest ${IGSTK_TESTS}
-- igstkMR3DImageToUS3DImageRegistrationTest
-- ${IGSTK_DATA_ROOT}/Input/MRLiver)
-+# ADD_TEST( igstkMR3DImageToUS3DImageRegistrationTest ${IGSTK_TESTS}
-+# igstkMR3DImageToUS3DImageRegistrationTest
-+# ${IGSTK_DATA_ROOT}/Input/MRLiver)
-
- ADD_TEST( igstkAuroraTrackerSimulatedTest
- ${IGSTK_TESTS}
-@@ -285,7 +285,7 @@
-
- #-----------------------------------------------------------------------------
- # Tests that depend on FLTK
--IF(${IGSTK_USE_FLTK})
-+IF(FALSE)
- ADD_TEST(igstkCylinderObjectTest ${IGSTK_TESTS} igstkCylinderObjectTest)
- ADD_TEST(igstkEllipsoidObjectTest ${IGSTK_TESTS} igstkEllipsoidObjectTest)
- ADD_TEST(igstkFLTKTextBufferLogOutputTest ${IGSTK_TESTS} igstkFLTKTextBufferLogOutputTest)
-@@ -558,7 +558,7 @@
- ${IGSTK_DATA_ROOT}/Input/E000192
- ${IGSTK_TEST_OUTPUT_DIR}/igstkCrossHairObjectRepresentationTest.png)
-
--ENDIF(${IGSTK_USE_FLTK})
-+ENDIF(FALSE)
-
- IF(${IGSTK_USE_MicronTracker})
- ADD_TEST( igstkMicronTrackerTest
-@@ -572,7 +572,7 @@
- ${IGSTK_TESTS} igstkMicronTrackerToolTest )
- ENDIF(${IGSTK_USE_MicronTracker})
-
--IF(IGSTK_USE_OpenIGTLink)
-+IF(${IGSTK_USE_OpenIGTLink})
-
- ADD_TEST( igstkTrackerToolObserverToOpenIGTLinkRelayTest
- ${IGSTK_TESTS}
-@@ -606,7 +606,7 @@
-
- ENDIF(IGSTK_USE_OpenIGTLink)
-
--IF(${IGSTK_USE_Qt})
-+IF(FALSE)
- ADD_TEST( igstkQTWidgetTest
- ${IGSTK_TESTS}
- igstkQTWidgetTest)
-@@ -703,7 +703,7 @@
- ${IGSTK_TEST_OUTPUT_DIR}/igstkMeshResliceObjectRepresentationQtTest.png)
-
-
--ENDIF(${IGSTK_USE_Qt})
-+ENDIF(FALSE)
-
-
- #-----------------------------------------------------------------------------
Added: trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.diff (rev 0)
+++ trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.diff 2009-12-06 17:28:32 UTC (rev 4437)
@@ -0,0 +1,33 @@
+## 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
+
+diff -urNad igstk-4.2.0~/CMakeLists.txt igstk-4.2.0/CMakeLists.txt
+--- igstk-4.2.0~/CMakeLists.txt 2009-08-24 22:11:41.000000000 -0400
++++ igstk-4.2.0/CMakeLists.txt 2009-08-24 22:11:41.000000000 -0400
+@@ -125,10 +125,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 "")
+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 21:55:55.000000000 -0400
++++ igstk-4.2.0/Source/CMakeLists.txt 2009-08-24 22:11:41.000000000 -0400
+@@ -393,7 +393,7 @@
+ ENDIF(IGSTK_USE_SceneGraphVisualization)
+
+ IF(IGSTK_USE_OpenCV)
+- SET(EXTRA_LIBS ${EXTRA_LIBS} cxcore110 cv110 highgui110)
++ SET(EXTRA_LIBS ${EXTRA_LIBS} cxcore cv highgui)
+ ENDIF(IGSTK_USE_OpenCV)
+
+
Property changes on: trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch 2009-12-05 23:06:10 UTC (rev 4436)
+++ trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch 2009-12-06 17:28:32 UTC (rev 4437)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_vtk_use_qvtk.dpatch by <domibel at t500lenny>
-##
-## 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
-
- at DPATCH@
-diff -urNad igstk-4.2.0~cvs20090208~/CMakeLists.txt igstk-4.2.0~cvs20090208/CMakeLists.txt
---- igstk-4.2.0~cvs20090208~/CMakeLists.txt 2009-06-05 17:34:46.000000000 -0400
-+++ igstk-4.2.0~cvs20090208/CMakeLists.txt 2009-06-11 18:28:59.000000000 -0400
-@@ -7,7 +7,7 @@
-
- # version
- SET(IGSTK_VERSION_MAJOR "4")
--SET(IGSTK_VERSION_MINOR "0")
-+SET(IGSTK_VERSION_MINOR "2")
- SET(IGSTK_VERSION_PATCH "0")
-
- SET (LIBRARY_OUTPUT_PATH ${IGSTK_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries." FORCE)
-@@ -113,10 +113,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 "")
Added: trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.diff (rev 0)
+++ trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.diff 2009-12-06 17:28:32 UTC (rev 4437)
@@ -0,0 +1,43 @@
+## 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)
++
Property changes on: trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.dpatch
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.dpatch 2009-12-05 23:06:10 UTC (rev 4436)
+++ trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.dpatch 2009-12-06 17:28:32 UTC (rev 4437)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 89_SceneGraphVisualization.dpatch by <domibel at t500lenny>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: removes cyclic dependeny, adds soname generation
-
- at DPATCH@
-diff -urNad igstk-4.2.0~cvs20090616~/Utilities/SceneGraphVisualization/CMakeLists.txt igstk-4.2.0~cvs20090616/Utilities/SceneGraphVisualization/CMakeLists.txt
---- igstk-4.2.0~cvs20090616~/Utilities/SceneGraphVisualization/CMakeLists.txt 2009-06-05 17:34:46.000000000 -0400
-+++ igstk-4.2.0~cvs20090616/Utilities/SceneGraphVisualization/CMakeLists.txt 2009-06-17 22:22:25.000000000 -0400
-@@ -22,4 +22,8 @@
- )
-
- ADD_LIBRARY(SceneGraphVisualization ${SceneGraphVisualization_SRC} )
--TARGET_LINK_LIBRARIES(SceneGraphVisualization IGSTK)
-+SET_TARGET_PROPERTIES(SceneGraphVisualization PROPERTIES
-+ VERSION ${IGSTK_VERSION_MAJOR}.${IGSTK_VERSION_MINOR}.${IGSTK_VERSION_PATCH}
-+ SOVERSION ${IGSTK_VERSION_MAJOR}
-+)
-+#TARGET_LINK_LIBRARIES(SceneGraphVisualization IGSTK)
Added: trunk/packages/igstk/trunk/debian/patches/90_examples.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/90_examples.diff (rev 0)
+++ trunk/packages/igstk/trunk/debian/patches/90_examples.diff 2009-12-06 17:28:32 UTC (rev 4437)
@@ -0,0 +1,86 @@
+## 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
+@@ -1,3 +1,58 @@
++cmake_minimum_required(VERSION 2.4)
++
++## INCLUDE( /usr/lib/IGSTK/IGSTKConfig.cmake )
++## INCLUDE( /usr/lib/IGSTK/UseIGSTK.cmake )
++
++#
++# Find IGSTK
++#
++FIND_PACKAGE(IGSTK REQUIRED)
++IF(IGSTK_FOUND)
++ INCLUDE(${IGSTK_USE_FILE})
++ENDIF(IGSTK_FOUND)
++# MESSAGE( FATAL_ERROR "This application requires IGSTK. One of these components is missing. Please verify configuration")
++#ENDIF (IGSTK_FOUND)
++
++
++#
++# FIND ITK
++#
++FIND_PACKAGE(ITK REQUIRED)
++IF (ITK_FOUND)
++ INCLUDE (${USE_ITK_FILE})
++ELSE (ITK_FOUND)
++ MESSAGE( FATAL_ERROR "This application requires ITK. One of these components is missing. Please verify configuration")
++ENDIF (ITK_FOUND)
++
++
++#
++# FIND VTK
++#
++FIND_PACKAGE(VTK REQUIRED)
++IF (VTK_FOUND)
++ INCLUDE (${USE_VTK_FILE})
++ELSE (VTK_FOUND)
++ MESSAGE( FATAL_ERROR "This application requires VTK. One of these components is missing. Please verify configuration")
++ENDIF (VTK_FOUND)
++
++
++#
++# FIND FLTK
++#
++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)
++
+ #
+ # Examples that do not require GUI
+ #
+Index: igstk-4.2.0/Testing/IGSTKTestingMacros.cmake
+===================================================================
+--- igstk-4.2.0.orig/Testing/IGSTKTestingMacros.cmake 2009-12-05 15:31:08.000000000 -0500
++++ igstk-4.2.0/Testing/IGSTKTestingMacros.cmake 2009-12-05 15:31:33.000000000 -0500
+@@ -1008,13 +1008,13 @@
+
+ ADD_EXECUTABLE(igstkVersionTest igstkVersionTest.cxx)
+ ADD_TEST(igstkVersionTest ${EXECUTABLE_OUTPUT_PATH}/igstkVersionTest)
+- TARGET_LINK_LIBRARIES(igstkVersionTest vtkCommon)
++ TARGET_LINK_LIBRARIES(igstkVersionTest vtkCommon ITKIO)
+ ADD_EXECUTABLE(igstkStateMachineExportTest igstkStateMachineExportTest.cxx)
+ ADD_TEST(igstkStateMachineExportTest ${EXECUTABLE_OUTPUT_PATH}/igstkStateMachineExportTest ${IGSTK_STATE_MACHINE_DIAGRAMS_OUTPUT_DIR})
+ TARGET_LINK_LIBRARIES(igstkStateMachineExportTest ${LIBRARY_NAME})
+ ENDIF(${SANDBOX_BUILD})
+
+-TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${LIBRARY_NAME} QtGui)
++TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${LIBRARY_NAME} QtGui QtCore)
+
+ #-----------------------------------------------------------------------------
+ # Configure a header needed by igstkSystemInformation.
Property changes on: trunk/packages/igstk/trunk/debian/patches/90_examples.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch 2009-12-05 23:06:10 UTC (rev 4436)
+++ trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch 2009-12-06 17:28:32 UTC (rev 4437)
@@ -1,69 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_cmake_minimum_required.dpatch by <domibel at sid1500>
-##
-## 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
-
- at DPATCH@
-diff -urNad igstk-4.2.0~cvs20090610~/Examples/CMakeLists.txt igstk-4.2.0~cvs20090610/Examples/CMakeLists.txt
---- igstk-4.2.0~cvs20090610~/Examples/CMakeLists.txt 2009-06-08 16:56:31.000000000 -0400
-+++ igstk-4.2.0~cvs20090610/Examples/CMakeLists.txt 2009-06-11 20:47:45.000000000 -0400
-@@ -1,3 +1,58 @@
-+cmake_minimum_required(VERSION 2.4)
-+
-+## INCLUDE( /usr/lib/IGSTK/IGSTKConfig.cmake )
-+## INCLUDE( /usr/lib/IGSTK/UseIGSTK.cmake )
-+
-+#
-+# Find IGSTK
-+#
-+FIND_PACKAGE(IGSTK REQUIRED)
-+IF(IGSTK_FOUND)
-+ INCLUDE(${IGSTK_USE_FILE})
-+ENDIF(IGSTK_FOUND)
-+# MESSAGE( FATAL_ERROR "This application requires IGSTK. One of these components is missing. Please verify configuration")
-+#ENDIF (IGSTK_FOUND)
-+
-+
-+#
-+# FIND ITK
-+#
-+FIND_PACKAGE(ITK REQUIRED)
-+IF (ITK_FOUND)
-+ INCLUDE (${USE_ITK_FILE})
-+ELSE (ITK_FOUND)
-+ MESSAGE( FATAL_ERROR "This application requires ITK. One of these components is missing. Please verify configuration")
-+ENDIF (ITK_FOUND)
-+
-+
-+#
-+# FIND VTK
-+#
-+FIND_PACKAGE(VTK REQUIRED)
-+IF (VTK_FOUND)
-+ INCLUDE (${USE_VTK_FILE})
-+ELSE (VTK_FOUND)
-+ MESSAGE( FATAL_ERROR "This application requires VTK. One of these components is missing. Please verify configuration")
-+ENDIF (VTK_FOUND)
-+
-+
-+#
-+# FIND FLTK
-+#
-+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)
-+
- #
- # Examples that do not require GUI
- #
Added: trunk/packages/igstk/trunk/debian/patches/series
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/series (rev 0)
+++ trunk/packages/igstk/trunk/debian/patches/series 2009-12-06 17:28:32 UTC (rev 4437)
@@ -0,0 +1,6 @@
+05_cvs20090823.diff
+12_doxygen.diff
+34_disable_resource_intensely_tests.diff
+70_vtk_use_qvtk.diff
+89_SceneGraphVisualization.diff
+90_examples.diff
Modified: trunk/packages/igstk/trunk/debian/rules
===================================================================
--- trunk/packages/igstk/trunk/debian/rules 2009-12-05 23:06:10 UTC (rev 4436)
+++ trunk/packages/igstk/trunk/debian/rules 2009-12-06 17:28:32 UTC (rev 4437)
@@ -3,31 +3,32 @@
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=0
-PACKAGE=igstk
+include /usr/share/quilt/quilt.make
-# 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_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
- -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
- -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
+ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed,--no-add-needed" \
+ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed,--no-add-needed" \
-DCMAKE_SKIP_RPATH:BOOL=ON \
+ -DIGSTK_WITH_LIBRARY_VERSION:BOOL=ON \
+ -DIGSTK_DEVELOPMENT_VERSION:BOOL=ON \
-DIGSTK_BUILD_EXAMPLES:BOOL=OFF \
-DIGSTK_BUILD_TESTING:BOOL=ON \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
-DIGSTK_USE_Qt:BOOL=ON \
-DIGSTK_USE_FLTK:BOOL=ON \
- -DIGSTK_USE_OpenIGTLink=ON \
+ -DIGSTK_USE_OpenIGTLink:BOOL=ON \
+ -DIGSTK_USE_OpenCV:BOOL=OFF \
+ -DIGSTK_USE_MicronTracker:BOOL=OFF \
-DQT_MOC_EXECUTABLE:PATH=/usr/bin/moc-qt4 \
-DQT_UIC_EXECUTABLE:PATH=/usr/bin/uic-qt4 \
-DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake
+
-
# if using precompiled static library provided by Claron Tech.:
# -DIGSTK_USE_MicronTracker:BOOL=ON \
# -DMTC_INCLUDE_DIRECTORY:PATH=/tmp/MTC/Dist \
@@ -44,7 +45,7 @@
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
if [ ! -d $(STATIC_BUILD_PATH) ]; then mkdir $(STATIC_BUILD_PATH); fi
@@ -106,6 +107,7 @@
# Add here commands to clean up after the build process.
rm -rf $(STATIC_BUILD_PATH)
rm -rf $(SHARED_BUILD_PATH)
+ rm -rf debian/tmp2
dh_clean
@@ -117,9 +119,12 @@
# install binaries and static libs
cd $(STATIC_BUILD_PATH) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ cd $(SHARED_BUILD_PATH) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp2
+
# install development files
- dh_install -plibigstk4-dev debian/tmp/usr/include/IGSTK/* usr/include/IGSTK/
+ dh_install -plibigstk4-dev debian/tmp/usr/include/IGSTK/* usr/include/IGSTK
+# dh_install -plibigstk4-dev ../../Utilities/SceneGraphVisualization/igstk*.h usr/include/IGSTK
# install libs and *cmake files
dh_install -plibigstk4-dev debian/tmp/usr/lib/IGSTK/*.a usr/lib
More information about the debian-med-commit
mailing list