[med-svn] r3496 - in trunk/packages/igstk/trunk/debian: . patches
Dominique Belhachemi
domibel-guest at alioth.debian.org
Thu Jun 18 02:56:54 UTC 2009
Author: domibel-guest
Date: 2009-06-18 02:56:54 +0000 (Thu, 18 Jun 2009)
New Revision: 3496
Added:
trunk/packages/igstk/trunk/debian/patches/12_doxygen.dpatch
trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.dpatch
Modified:
trunk/packages/igstk/trunk/debian/Notes
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/patches/00list
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/90_examples.dpatch
trunk/packages/igstk/trunk/debian/rules
Log:
new upstream snapshot 4.2.0~cvs
Modified: trunk/packages/igstk/trunk/debian/Notes
===================================================================
--- trunk/packages/igstk/trunk/debian/Notes 2009-06-17 14:01:16 UTC (rev 3495)
+++ trunk/packages/igstk/trunk/debian/Notes 2009-06-18 02:56:54 UTC (rev 3496)
@@ -4,7 +4,6 @@
dpkg-gensymbols -v4.0.0 -plibigstk4 -Pdebian/libigstk4 -Odebian/libigstk4.symbols
-
packages.symbols.common
package.symbols.i386
....
@@ -13,27 +12,3 @@
Arch:
[alpha] [amd64] [arm] [armel] [hppa] [hurd-i386] [i386] [ia64] [kfreebsd-i386] [kfreebsd-amd64] [m68k] [mips] [mipsel]
[powerpc] [s390] [sparc]
-
-
-
-2)
-igstkSystemInformation.h
-./Examples/TrackerConfiguration/igstkTrackerController.h:#include "igstkSystemInformation.h"
-./Examples/NeedleBiopsy/igstkTrackerInitializer.h:#include "igstkSystemInformation.h"
-./Testing/IGSTKTestingMacros.cmake:CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/igstkSystemInformation.h.in"
-./Testing/IGSTKTestingMacros.cmake: "${CMAKE_CURRENT_BINARY_DIR}/igstkSystemInformation.h"
-
-Conclusion: Examples compile only if IGSTK_BUILD_TESTING:BOOL=ON ???
-
-
-3)
-igstkPrecomputedTransformData.h
-cp /usr/share/doc/igstk-examples/examples/TransformReaders/igstkPrecomputedTransformData.h
-/usr/share/doc/igstk-examples/examples/TrackerConfiguration/ ???
-
-Conclusion: TrackerConfiguration needs some work, because it is based on examples/TransformReaders
-
-
-
-4)
-most of the other examples fail to build
Modified: trunk/packages/igstk/trunk/debian/changelog
===================================================================
--- trunk/packages/igstk/trunk/debian/changelog 2009-06-17 14:01:16 UTC (rev 3495)
+++ trunk/packages/igstk/trunk/debian/changelog 2009-06-18 02:56:54 UTC (rev 3496)
@@ -1,10 +1,10 @@
-igstk (4.0.0-1) UNRELEASED; urgency=low
+igstk (4.2.0~cvs20090616-1) experimental; urgency=low
- * new upstream release
- * disabled fltk & qt tests
- * debian/copyright: removed ambiguity
+ * new upstream snapshot
+ * soname bump
+ * OpenIGTLink support enabled
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Thu, 07 Feb 2009 18:37:40 -0500
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Thu, 11 Jun 2009 19:24:49 -0400
igstk (3.0.0~cvs20090203-1) experimental; urgency=low
Modified: trunk/packages/igstk/trunk/debian/control
===================================================================
--- trunk/packages/igstk/trunk/debian/control 2009-06-17 14:01:16 UTC (rev 3495)
+++ trunk/packages/igstk/trunk/debian/control 2009-06-18 02:56:54 UTC (rev 3496)
@@ -5,9 +5,10 @@
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,
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
+ libexpat1-dev, libqt4-dev, libvtk5-qt4-dev, libfltk1.1-dev, fluid, uuid-dev,
+ libxss-dev, libxft-dev, libopenigtlink1-dev
Build-Depends-Indep: doxygen, graphviz
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
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
Modified: trunk/packages/igstk/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/igstk/trunk/debian/get-orig-source 2009-06-17 14:01:16 UTC (rev 3495)
+++ trunk/packages/igstk/trunk/debian/get-orig-source 2009-06-18 02:56:54 UTC (rev 3496)
@@ -3,20 +3,20 @@
#################### 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/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
################## DEVELOPMENT ####################
#VERSION=4.0.0
-VERSION=4.0.0~cvs20090208
-CVSDATE="2009-02-08 23:59:59"
+VERSION=4.2.0~cvs20090616
+CVSDATE="2009-06-16 23:59:59"
FOLDER=$PACKAGE-$VERSION
TARFILE=igstk_$VERSION.orig.tar.gz
@@ -24,14 +24,13 @@
echo "ENTER PASSWORD : igstk"
cvs -d$CVSHOME login
-cvs -d$CVSHOME co -D "$CVSDATE" IGSTK
+cvs -d$CVSHOME export -D "$CVSDATE" IGSTK
-
# Remove all CVS directories
-echo "Removing all CVS directories"
-for REMOVE_CVS in `find IGSTK -name CVS`; do
- rm -rf "$REMOVE_CVS"
-done
+#echo "Removing all CVS directories"
+#for REMOVE_CVS in `find IGSTK -name CVS`; do
+# rm -rf "$REMOVE_CVS"
+#done
mv IGSTK/ igstk-$VERSION
Modified: trunk/packages/igstk/trunk/debian/patches/00list
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/00list 2009-06-17 14:01:16 UTC (rev 3495)
+++ trunk/packages/igstk/trunk/debian/patches/00list 2009-06-18 02:56:54 UTC (rev 3496)
@@ -1,3 +1,5 @@
+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/12_doxygen.dpatch
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/12_doxygen.dpatch (rev 0)
+++ trunk/packages/igstk/trunk/debian/patches/12_doxygen.dpatch 2009-06-18 02:56:54 UTC (rev 3496)
@@ -0,0 +1,401 @@
+#! /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
Property changes on: trunk/packages/igstk/trunk/debian/patches/12_doxygen.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: 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-06-17 14:01:16 UTC (rev 3495)
+++ trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.dpatch 2009-06-18 02:56:54 UTC (rev 3496)
@@ -5,10 +5,10 @@
## DP: disable resource intensely tests and tests based on FLTK or QT
@DPATCH@
-diff -urNad igstk-4.0.0~/Testing/IGSTKTestingMacros.cmake igstk-4.0.0/Testing/IGSTKTestingMacros.cmake
---- igstk-4.0.0~/Testing/IGSTKTestingMacros.cmake 2009-02-05 17:29:12.000000000 -0500
-+++ igstk-4.0.0/Testing/IGSTKTestingMacros.cmake 2009-02-07 19:42:01.000000000 -0500
-@@ -154,9 +154,9 @@
+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)
@@ -21,7 +21,7 @@
ADD_TEST( igstkAuroraTrackerSimulatedTest
${IGSTK_TESTS}
-@@ -283,7 +283,7 @@
+@@ -285,7 +285,7 @@
#-----------------------------------------------------------------------------
# Tests that depend on FLTK
@@ -30,25 +30,34 @@
ADD_TEST(igstkCylinderObjectTest ${IGSTK_TESTS} igstkCylinderObjectTest)
ADD_TEST(igstkEllipsoidObjectTest ${IGSTK_TESTS} igstkEllipsoidObjectTest)
ADD_TEST(igstkFLTKTextBufferLogOutputTest ${IGSTK_TESTS} igstkFLTKTextBufferLogOutputTest)
-@@ -541,7 +541,7 @@
- ${IGSTK_TEST_OUTPUT_DIR}/igstkCrossHairSpatialObjectTest.png)
-
-
+@@ -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
-@@ -561,7 +561,7 @@
-
+@@ -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)
-@@ -658,7 +658,7 @@
+@@ -703,7 +703,7 @@
${IGSTK_TEST_OUTPUT_DIR}/igstkMeshResliceObjectRepresentationQtTest.png)
Modified: trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch 2009-06-17 14:01:16 UTC (rev 3495)
+++ trunk/packages/igstk/trunk/debian/patches/70_vtk_use_qvtk.dpatch 2009-06-18 02:56:54 UTC (rev 3496)
@@ -1,22 +1,22 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_vtk_use_qvtk.dpatch by <domibel at sid1500>
+## 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
@DPATCH@
-diff -urNad igstk-4.0.0~/CMakeLists.txt igstk-4.0.0/CMakeLists.txt
---- igstk-4.0.0~/CMakeLists.txt 2009-02-07 19:45:54.000000000 -0500
-+++ igstk-4.0.0/CMakeLists.txt 2009-02-07 19:46:15.000000000 -0500
-@@ -6,7 +6,7 @@
- PROJECT( IGSTK )
+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 "3")
-+SET(IGSTK_VERSION_MAJOR "4")
- SET(IGSTK_VERSION_MINOR "0")
+ 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 )
Added: trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.dpatch
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.dpatch (rev 0)
+++ trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.dpatch 2009-06-18 02:56:54 UTC (rev 3496)
@@ -0,0 +1,20 @@
+#! /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)
Property changes on: trunk/packages/igstk/trunk/debian/patches/89_SceneGraphVisualization.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch 2009-06-17 14:01:16 UTC (rev 3495)
+++ trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch 2009-06-18 02:56:54 UTC (rev 3496)
@@ -5,10 +5,10 @@
## DP: Makes the example cmake 2.6 ready, The example can now be built from outside the source directory
@DPATCH@
-diff -urNad igstk-4.0.0~/Examples/CMakeLists.txt igstk-4.0.0/Examples/CMakeLists.txt
---- igstk-4.0.0~/Examples/CMakeLists.txt 2009-02-08 08:19:46.000000000 +0000
-+++ igstk-4.0.0/Examples/CMakeLists.txt 2009-02-08 08:20:18.000000000 +0000
-@@ -1,10 +1,65 @@
+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 )
@@ -67,11 +67,3 @@
#
# Examples that do not require GUI
#
-
- SUBDIRS(
- TransformReaders
-- TrackerConfiguration
-+# TrackerConfiguration
- )
-
-
Modified: trunk/packages/igstk/trunk/debian/rules
===================================================================
--- trunk/packages/igstk/trunk/debian/rules 2009-06-17 14:01:16 UTC (rev 3495)
+++ trunk/packages/igstk/trunk/debian/rules 2009-06-18 02:56:54 UTC (rev 3496)
@@ -18,11 +18,11 @@
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
-DCMAKE_SKIP_RPATH:BOOL=ON \
- -DBUILD_DOCUMENTATION:BOOL=ON \
-DIGSTK_BUILD_EXAMPLES:BOOL=OFF \
-DIGSTK_BUILD_TESTING:BOOL=ON \
-DIGSTK_USE_Qt:BOOL=ON \
-DIGSTK_USE_FLTK:BOOL=ON \
+ -DIGSTK_USE_OpenIGTLink=ON \
-DQT_MOC_EXECUTABLE:PATH=/usr/bin/moc-qt4 \
-DQT_UIC_EXECUTABLE:PATH=/usr/bin/uic-qt4 \
-DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake
@@ -34,27 +34,30 @@
# -DMTC_LIBRARY:PATH=/tmp/MTC/Dist \
# TODO: /usr/bin/ld: cannot find -lMTC \
+# set the number of build jobs
+#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+# JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+#endif
get-orig-source:
- . debian/get-orig-source
+ /bin/sh $(CURDIR)/debian/get-orig-source
configure: configure-stamp
-
configure-stamp: patch-stamp
dh_testdir
if [ ! -d $(STATIC_BUILD_PATH) ]; then mkdir $(STATIC_BUILD_PATH); fi
cd $(STATIC_BUILD_PATH) \
- && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=OFF
+ && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_DOCUMENTATION:BOOL=ON
if [ ! -d $(SHARED_BUILD_PATH) ]; then mkdir $(SHARED_BUILD_PATH); fi
cd $(SHARED_BUILD_PATH) \
&& cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON
- touch $@
+ touch configure-stamp
build: build-arch
@@ -62,6 +65,7 @@
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
dh_testdir
+ dh_prep
# Add here commands to compile the package.
@@ -72,8 +76,9 @@
$(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH)
# perform tests ('-' ignores return values)
+# cd $(STATIC_BUILD_PATH) && ctest -S ../debian/ctest_config.cmake -VV
# - cd $(STATIC_BUILD_PATH) && ctest -D Nightly -VV
- - cd $(STATIC_BUILD_PATH) && ctest -V
+ - cd $(STATIC_BUILD_PATH) && ctest
touch $@
@@ -82,10 +87,11 @@
dh_testdir
# build documentation
- $(MAKE) $(JOBS) Documentation -C $(SHARED_BUILD_PATH)
+ mkdir -p $(STATIC_BUILD_PATH)/Utilities/Doxygen/doc/html
+ $(MAKE) $(JOBS) Documentation -C $(STATIC_BUILD_PATH)
# remove zero byte files
- find $(SHARED_BUILD_PATH)/Utilities/Doxygen/doc/ -depth -empty | xargs rm -rf
+ find $(STATIC_BUILD_PATH)/Utilities/Doxygen/doc/ -depth -empty | xargs rm -rf
touch $@
@@ -95,7 +101,7 @@
clean-patched:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-stamp configure-stamp build-arch-stamp
# Add here commands to clean up after the build process.
rm -rf $(STATIC_BUILD_PATH)
@@ -103,19 +109,17 @@
dh_clean
-install: install-indep install-arch
install-arch: build-arch
dh_testdir
dh_testroot
- dh_prep
dh_installdirs
# install binaries and static libs
cd $(STATIC_BUILD_PATH) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# 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/
# install libs and *cmake files
dh_install -plibigstk4-dev debian/tmp/usr/lib/IGSTK/*.a usr/lib
@@ -126,7 +130,7 @@
install-indep: build-indep
- dh_install -pigstk-doc $(SHARED_BUILD_PATH)/Utilities/Doxygen/doc/html usr/share/doc/igstk-doc
+ dh_install -pigstk-doc $(STATIC_BUILD_PATH)/Utilities/Doxygen/doc/html usr/share/doc/igstk-doc
dh_installexamples -pigstk-examples Examples/*
# remove executable file mode bit
@@ -135,12 +139,12 @@
# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
+binary-indep: install-indep
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
+binary-arch: install-arch
$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
More information about the debian-med-commit
mailing list