[med-svn] r6801 - in trunk/packages/igstk/trunk/debian: . patches
Dominique Belhachemi
domibel-guest at alioth.debian.org
Tue May 10 00:36:23 UTC 2011
Author: domibel-guest
Date: 2011-05-10 00:36:21 +0000 (Tue, 10 May 2011)
New Revision: 6801
Modified:
trunk/packages/igstk/trunk/debian/changelog
trunk/packages/igstk/trunk/debian/compat
trunk/packages/igstk/trunk/debian/control
trunk/packages/igstk/trunk/debian/get-orig-source
trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff
trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff
trunk/packages/igstk/trunk/debian/patches/50_kfreebsd.diff
trunk/packages/igstk/trunk/debian/patches/90_examples.diff
trunk/packages/igstk/trunk/debian/patches/series
trunk/packages/igstk/trunk/debian/rules
Log:
* new upstream release
* debian/rules remove redundant "--no-add-needed" option
* remove static libraries
* add cdbs dependency
* compat 8
Modified: trunk/packages/igstk/trunk/debian/changelog
===================================================================
--- trunk/packages/igstk/trunk/debian/changelog 2011-05-09 22:45:27 UTC (rev 6800)
+++ trunk/packages/igstk/trunk/debian/changelog 2011-05-10 00:36:21 UTC (rev 6801)
@@ -1,3 +1,13 @@
+igstk (4.4.0-1) experimental; urgency=low
+
+ * new upstream release
+ * debian/rules remove redundant "--no-add-needed" option
+ * remove static libraries
+ * add cdbs dependency
+ * compat 8
+
+ -- Dominique Belhachemi <domibel at debian.org> Mon, 09 May 2011 12:28:32 -0400
+
igstk (4.2.0-5) unstable; urgency=low
* fixed a FTBFS on Debian GNU/kfreebsd
@@ -25,7 +35,7 @@
* Add build deps: libavcodec-dev, libavformat-dev, and libswscale-dev.
* Remove FindOpenCV.cmake.
* Tweak patches 90_examples.diff and 05_cvs20090823.diff.
-
+
[ Steve M. Robbins ]
* Add missing build dependencies for libgl2ps-dev, mpi-default-dev, and
libmysqlclient-dev (Closes: #562299).
Modified: trunk/packages/igstk/trunk/debian/compat
===================================================================
--- trunk/packages/igstk/trunk/debian/compat 2011-05-09 22:45:27 UTC (rev 6800)
+++ trunk/packages/igstk/trunk/debian/compat 2011-05-10 00:36:21 UTC (rev 6801)
@@ -1 +1 @@
-7
+8
Modified: trunk/packages/igstk/trunk/debian/control
===================================================================
--- trunk/packages/igstk/trunk/debian/control 2011-05-09 22:45:27 UTC (rev 6800)
+++ trunk/packages/igstk/trunk/debian/control 2011-05-10 00:36:21 UTC (rev 6801)
@@ -4,11 +4,12 @@
DM-Upload-Allowed: yes
Uploaders: Dominique Belhachemi <domibel at debian.org>, Steve M. Robbins <smr at debian.org>,
Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), quilt, cmake, libinsighttoolkit3-dev (>= 3.16), libvtk5-dev,
+Build-Depends: debhelper (>= 8), 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, libgdcm2-dev, libssl-dev, libopenjpeg-dev,
- libavcodec-dev, libavformat-dev, libswscale-dev, libgl2ps-dev, mpi-default-dev, libmysqlclient-dev
+ libavcodec-dev, libavformat-dev, libswscale-dev, libgl2ps-dev, mpi-default-dev,
+ libmysqlclient-dev, xvfb, xauth, cdbs
Build-Depends-Indep: doxygen, graphviz
Standards-Version: 3.9.1
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/igstk/trunk/?rev=0&sc=0
@@ -76,7 +77,40 @@
these points. Robust common internal software services for logging,
exception-handling and problem resolution.
+Package: libigstk4-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends:
+ libigstk4 (= ${binary:Version}),
+ ${misc:Depends}
+Description: debugging symbols for libigstk4
+ The Image-Guided Surgery Toolkit (IGstk: pronounced IGStick) is a
+ high-level component-based framework providing common functionality
+ for image-guided surgery applications.
+ .
+ This software framework consists of a set of high-level components
+ integrated with other low-level open source software libraries and
+ application programming interfaces (API) from hardware vendors.
+ .
+ The cornerstone of IGstk is robustness. IGstk provides the following
+ high-level functionality:
+ Ability to read and display medical images including CT and MRI in
+ DICOM format.
+ .
+ An interface to common tracking hardware (e.g. AURORA from
+ Northern Digital Inc.). A graphical user interface and visualization
+ capability including a four-quadrant view (axial, sagittal, coronal,
+ and 3D) as well as a multi-slice axial view (from 1 by 1 to many by
+ many such as 10 by 10).
+ .
+ Registration: point based registration and a means for selecting
+ these points. Robust common internal software services for logging,
+ exception-handling and problem resolution.
+ .
+ This package contains the debugging symbols for libigstk4.
+
Package: igstk-doc
Section: doc
Architecture: all
Modified: trunk/packages/igstk/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/igstk/trunk/debian/get-orig-source 2011-05-09 22:45:27 UTC (rev 6800)
+++ trunk/packages/igstk/trunk/debian/get-orig-source 2011-05-10 00:36:21 UTC (rev 6801)
@@ -1,14 +1,14 @@
PACKAGE=igstk
#################### RELEASE ######################
-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
+wget -c http://public.kitware.com/IGSTKWIKI/images/e/e2/IGSTK-4-4.tar.gz
+tar -xzf IGSTK-4-4.tar.gz
+mv IGSTK-4.4 igstk-4.4.0
echo "Creating orig tarball."
-tar -czf igstk_4.2.0.orig.tar.gz igstk-4.2.0/
+tar -czf igstk_4.4.0.orig.tar.gz igstk-4.4.0/
echo "Removing extracted directory."
-rm -rf igstk-4.2.0/
-rm IGSTK-4-2.tar.gz
+rm -rf igstk-4.4.0/
+rm IGSTK-4-4.tar.gz
exit
################## DEVELOPMENT ####################
Modified: trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff 2011-05-09 22:45:27 UTC (rev 6800)
+++ trunk/packages/igstk/trunk/debian/patches/12_doxygen.diff 2011-05-10 00:36:21 UTC (rev 6801)
@@ -23,7 +23,8 @@
-# doxyfile for IGSTK
-# modified by S. Barre (Time-stamp: <2003-01-13 20:55:40 barre>
-# -------------------------------------------------------------------------
--
++# Doxyfile 1.7.1
+
-PROJECT_NAME = IGSTK
-
-FULL_PATH_NAMES = YES
@@ -91,8 +92,7 @@
-
-EXPAND_ONLY_PREDEF = YES
-
-+# Doxyfile 1.5.9
-
+-
-PREDEFINED = "igstkNotUsed(x)=" \
- "igstkTypeMacro(thisClass,superclass)= \
- virtual const char *GetNameOfClass() const;" \
@@ -131,18 +131,18 @@
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING = UTF-8
+PROJECT_NAME = IGSTK
-+PROJECT_NUMBER =
-+OUTPUT_DIRECTORY = @IGSTK_BINARY_DIR@/Utilities/Doxygen/doc
++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 =
++ABBREVIATE_BRIEF =
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = YES
-+STRIP_FROM_PATH =
-+STRIP_FROM_INC_PATH =
++STRIP_FROM_PATH =
++STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = YES
+QT_AUTOBRIEF = NO
@@ -150,12 +150,12 @@
+INHERIT_DOCS = YES
+SEPARATE_MEMBER_PAGES = NO
+TAB_SIZE = 3
-+ALIASES =
++ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = NO
+OPTIMIZE_OUTPUT_JAVA = NO
+OPTIMIZE_FOR_FORTRAN = NO
+OPTIMIZE_OUTPUT_VHDL = NO
-+EXTENSION_MAPPING =
++EXTENSION_MAPPING =
+BUILTIN_STL_SUPPORT = NO
+CPP_CLI_SUPPORT = NO
+SIP_SUPPORT = NO
@@ -181,23 +181,25 @@
+CASE_SENSE_NAMES = YES
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
++FORCE_LOCAL_INCLUDES = NO
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = NO
+SORT_BRIEF_DOCS = NO
++SORT_MEMBERS_CTORS_1ST = NO
+SORT_GROUP_NAMES = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
-+ENABLED_SECTIONS =
++ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = NO
+SHOW_FILES = YES
+SHOW_NAMESPACES = YES
-+FILE_VERSION_FILTER =
-+LAYOUT_FILE =
++FILE_VERSION_FILTER =
++LAYOUT_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
@@ -207,7 +209,7 @@
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text"
-+WARN_LOGFILE =
++WARN_LOGFILE =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
@@ -216,16 +218,16 @@
+FILE_PATTERNS = *.h \
+ *.hxx
+RECURSIVE = YES
-+EXCLUDE =
++EXCLUDE =
+EXCLUDE_SYMLINKS = NO
-+EXCLUDE_PATTERNS =
-+EXCLUDE_SYMBOLS =
-+EXAMPLE_PATH =
-+EXAMPLE_PATTERNS =
++EXCLUDE_PATTERNS =
++EXCLUDE_SYMBOLS =
++EXAMPLE_PATH =
++EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH = "@IGSTK_BINARY_DIR@/Testing/Temporary/StateMachineDiagrams"
-+INPUT_FILTER =
-+FILTER_PATTERNS =
++INPUT_FILTER =
++FILTER_PATTERNS =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
@@ -250,34 +252,47 @@
+GENERATE_HTML = YES
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
-+HTML_HEADER =
-+HTML_FOOTER =
-+HTML_STYLESHEET =
++HTML_HEADER =
++HTML_FOOTER =
++HTML_STYLESHEET =
++HTML_COLORSTYLE_HUE = 220
++HTML_COLORSTYLE_SAT = 100
++HTML_COLORSTYLE_GAMMA = 80
++HTML_TIMESTAMP = YES
+HTML_ALIGN_MEMBERS = YES
+HTML_DYNAMIC_SECTIONS = NO
+GENERATE_DOCSET = NO
+DOCSET_FEEDNAME = "Doxygen generated docs"
+DOCSET_BUNDLE_ID = org.doxygen.Project
++DOCSET_PUBLISHER_ID = org.doxygen.Publisher
++DOCSET_PUBLISHER_NAME = Publisher
+GENERATE_HTMLHELP = YES
-+CHM_FILE =
-+HHC_LOCATION =
++CHM_FILE =
++HHC_LOCATION =
+GENERATE_CHI = NO
-+CHM_INDEX_ENCODING =
++CHM_INDEX_ENCODING =
+BINARY_TOC = NO
+TOC_EXPAND = NO
+GENERATE_QHP = NO
-+QCH_FILE =
-+QHP_NAMESPACE =
++QCH_FILE =
++QHP_NAMESPACE = org.doxygen.Project
+QHP_VIRTUAL_FOLDER = doc
-+QHP_CUST_FILTER_NAME =
-+QHP_CUST_FILTER_ATTRS =
-+QHP_SECT_FILTER_ATTRS =
-+QHG_LOCATION =
++QHP_CUST_FILTER_NAME =
++QHP_CUST_FILTER_ATTRS =
++QHP_SECT_FILTER_ATTRS =
++QHG_LOCATION =
++GENERATE_ECLIPSEHELP = NO
++ECLIPSE_DOC_ID = org.doxygen.Project
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = NO
++USE_INLINE_TREES = NO
+TREEVIEW_WIDTH = 250
++EXT_LINKS_IN_WINDOW = NO
+FORMULA_FONTSIZE = 10
++FORMULA_TRANSPARENT = YES
++SEARCHENGINE = YES
++SERVER_BASED_SEARCH = NO
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
@@ -287,8 +302,8 @@
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
-+EXTRA_PACKAGES =
-+LATEX_HEADER =
++EXTRA_PACKAGES =
++LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = NO
+LATEX_BATCHMODE = NO
@@ -301,8 +316,8 @@
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
-+RTF_STYLESHEET_FILE =
-+RTF_EXTENSIONS_FILE =
++RTF_STYLESHEET_FILE =
++RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
@@ -315,8 +330,8 @@
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
-+XML_SCHEMA =
-+XML_DTD =
++XML_SCHEMA =
++XML_DTD =
+XML_PROGRAMLISTING = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
@@ -328,16 +343,16 @@
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
-+PERLMOD_MAKEVAR_PREFIX =
++PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
-+# Configuration options related to the preprocessor
++# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = YES
+EXPAND_ONLY_PREDEF = YES
+SEARCH_INCLUDES = YES
-+INCLUDE_PATH =
-+INCLUDE_FILE_PATTERNS =
++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);" \
@@ -366,10 +381,10 @@
+ "VXL_LITTLE_ENDIAN=0" \
+ "VNL_DLL_DATA=" \
+ "size_t=vcl_size_t"
-+EXPAND_AS_DEFINED =
++EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
-+# Configuration::additions related to external references
++# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
@@ -377,15 +392,16 @@
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
-+# Configuration options related to the dot tool
++# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
-+MSCGEN_PATH =
++MSCGEN_PATH =
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = YES
-+DOT_FONTNAME = FreeSans
++DOT_NUM_THREADS = 0
++DOT_FONTNAME = FreeSans.ttf
+DOT_FONTSIZE = 10
-+DOT_FONTPATH =
++DOT_FONTPATH =
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
@@ -397,16 +413,12 @@
+CALLER_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
-+DOT_IMAGE_FORMAT = jpg
-+DOT_PATH = @DOT_PATH@
-+DOTFILE_DIRS =
++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
Modified: trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff 2011-05-09 22:45:27 UTC (rev 6800)
+++ trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.diff 2011-05-10 00:36:21 UTC (rev 6801)
@@ -4,20 +4,20 @@
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
+@@ -170,9 +170,9 @@ IF (IGSTK_DATA_ROOT)
${IGSTK_DATA_ROOT}/Input/MRLiver)
-
+
+ IF (ITK_PRE4_VERSION)
- ADD_TEST( igstkMR3DImageToUS3DImageRegistrationTest ${IGSTK_TESTS}
- igstkMR3DImageToUS3DImageRegistrationTest
- ${IGSTK_DATA_ROOT}/Input/MRLiver)
+# ADD_TEST( igstkMR3DImageToUS3DImageRegistrationTest ${IGSTK_TESTS}
+# igstkMR3DImageToUS3DImageRegistrationTest
+# ${IGSTK_DATA_ROOT}/Input/MRLiver)
+ ENDIF(ITK_PRE4_VERSION)
ADD_TEST( igstkAuroraTrackerSimulatedTest
- ${IGSTK_TESTS}
-@@ -290,7 +290,7 @@
+@@ -309,7 +309,7 @@ ENDIF(${IGSTK_TEST_FLOCKOFBIRD_ATTACHED}
#-----------------------------------------------------------------------------
# Tests that depend on FLTK
@@ -26,54 +26,30 @@
ADD_TEST(igstkCylinderObjectTest ${IGSTK_TESTS} igstkCylinderObjectTest)
ADD_TEST(igstkEllipsoidObjectTest ${IGSTK_TESTS} igstkEllipsoidObjectTest)
ADD_TEST(igstkFLTKTextBufferLogOutputTest ${IGSTK_TESTS} igstkFLTKTextBufferLogOutputTest)
-@@ -563,7 +563,7 @@
+@@ -582,7 +582,7 @@ ADD_TEST( igstkImageResliceObjectReprese
${IGSTK_DATA_ROOT}/Input/E000192
${IGSTK_TEST_OUTPUT_DIR}/igstkCrossHairObjectRepresentationTest.png)
-ENDIF(${IGSTK_USE_FLTK})
+ENDIF(FALSE)
- IF(${IGSTK_USE_MicronTracker})
+ IF(${IGSTK_TEST_MicronTracker_ATTACHED})
ADD_TEST( igstkMicronTrackerTest
-@@ -577,7 +577,7 @@
- ${IGSTK_TESTS} igstkMicronTrackerToolTest )
- ENDIF(${IGSTK_USE_MicronTracker})
+@@ -642,7 +642,7 @@ IF(${IGSTK_USE_OpenIGTLink})
--IF(IGSTK_USE_OpenIGTLink)
-+IF(${IGSTK_USE_OpenIGTLink})
+ ENDIF(${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 @@
+@@ -739,7 +739,7 @@ IF(${IGSTK_USE_Qt})
${IGSTK_TEST_OUTPUT_DIR}/igstkMeshResliceObjectRepresentationQtTest.png)
-ENDIF(${IGSTK_USE_Qt})
+ENDIF(FALSE)
--IF(IGSTK_USE_VideoImager)
-+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})
-
-
- #-----------------------------------------------------------------------------
Modified: trunk/packages/igstk/trunk/debian/patches/50_kfreebsd.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/50_kfreebsd.diff 2011-05-09 22:45:27 UTC (rev 6800)
+++ trunk/packages/igstk/trunk/debian/patches/50_kfreebsd.diff 2011-05-10 00:36:21 UTC (rev 6801)
@@ -1,13 +1,18 @@
-Index: igstk-4.2.0/Source/igstkSerialCommunicationForPosix.cxx
+Index: igstk-4.4.0/Source/igstkSerialCommunicationForPosix.cxx
===================================================================
---- igstk-4.2.0.orig/Source/igstkSerialCommunicationForPosix.cxx 2011-03-20 18:30:09.000000000 -0400
-+++ igstk-4.2.0/Source/igstkSerialCommunicationForPosix.cxx 2011-03-20 18:31:52.000000000 -0400
-@@ -171,7 +171,7 @@
+--- igstk-4.4.0.orig/Source/igstkSerialCommunicationForPosix.cxx 2011-03-21 23:17:50.000000000 -0400
++++ igstk-4.4.0/Source/igstkSerialCommunicationForPosix.cxx 2011-03-21 23:18:15.000000000 -0400
+@@ -171,12 +171,9 @@
// set baud rate
#if defined(sgi) && defined(__NEW_MAX_BAUD)
t.c_ospeed = newbaud;
-#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__FreeBSD_kernel__)
++#else
cfsetispeed(&t, newbaud);
cfsetospeed(&t, newbaud);
- #else
+-#else
+- t.c_cflag &= ~CBAUD;
+- t.c_cflag |= newbaud; // set baud rate
+ #endif
+
+ // set data bits
Modified: trunk/packages/igstk/trunk/debian/patches/90_examples.diff
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/90_examples.diff 2011-05-09 22:45:27 UTC (rev 6800)
+++ trunk/packages/igstk/trunk/debian/patches/90_examples.diff 2011-05-10 00:36:21 UTC (rev 6801)
@@ -64,23 +64,3 @@
#
# 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.
Modified: trunk/packages/igstk/trunk/debian/patches/series
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/series 2011-05-09 22:45:27 UTC (rev 6800)
+++ trunk/packages/igstk/trunk/debian/patches/series 2011-05-10 00:36:21 UTC (rev 6801)
@@ -1,8 +1,7 @@
-05_cvs20090823.diff
12_doxygen.diff
34_disable_resource_intensely_tests.diff
-70_vtk_use_qvtk.diff
-89_SceneGraphVisualization.diff
+#70_vtk_use_qvtk.diff
+#89_SceneGraphVisualization.diff
90_examples.diff
gcc-4.5.diff
50_kfreebsd.diff
Modified: trunk/packages/igstk/trunk/debian/rules
===================================================================
--- trunk/packages/igstk/trunk/debian/rules 2011-05-09 22:45:27 UTC (rev 6800)
+++ trunk/packages/igstk/trunk/debian/rules 2011-05-10 00:36:21 UTC (rev 6801)
@@ -1,18 +1,25 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
+# Set this value to 0/1 to turn off/on verbose mode.
export DH_VERBOSE=0
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-STATIC_BUILD_PATH = DEB_build_static
-SHARED_BUILD_PATH = DEB_build_shared
+ABI_VERSION := 4
-CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+DEB_DH_STRIP_ARGS := --dbg-package=libigstk${ABI_VERSION}-dbg
+
+DEB_BUILD_PARALLEL := true
+
+DEB_CMAKE_EXTRA_FLAGS = \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_CXX_FLAGS="-Wno-deprecated" \
-DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
- -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed,--no-add-needed" \
- -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed,--no-add-needed" \
+ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
+ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DIGSTK_WITH_LIBRARY_VERSION:BOOL=ON \
-DIGSTK_DEVELOPMENT_VERSION:BOOL=ON \
@@ -24,6 +31,8 @@
-DIGSTK_USE_OpenIGTLink:BOOL=ON \
-DIGSTK_USE_OpenCV:BOOL=OFF \
-DIGSTK_USE_MicronTracker:BOOL=OFF \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DBUILD_DOCUMENTATION:BOOL=ON \
-DQT_MOC_EXECUTABLE:PATH=/usr/bin/moc-qt4 \
-DQT_UIC_EXECUTABLE:PATH=/usr/bin/uic-qt4 \
-DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake
@@ -35,107 +44,35 @@
# -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:
- /bin/sh $(CURDIR)/debian/get-orig-source
+build/igstk-doc::
+ # debug - this should not show up on buildd's
+ echo build igstk-doc
+install/libigstk${ABI_VERSION}-dev::
+ dh_install -plibigstk${ABI_VERSION}-dev debian/tmp/usr/include/IGSTK/* usr/include/IGSTK
+# dh_install -plibigstk${ABI_VERSION}-dev ../../Utilities/SceneGraphVisualization/igstk*.h usr/include/IGSTK
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
- dh_testdir
+ # install libs and *cmake files
+ dh_install -plibigstk${ABI_VERSION}-dev debian/tmp/usr/lib/IGSTK/*.so usr/lib
+ dh_install -plibigstk${ABI_VERSION}-dev debian/tmp/usr/lib/IGSTK/*.cmake usr/lib/IGSTK
- if [ ! -d $(STATIC_BUILD_PATH) ]; then mkdir $(STATIC_BUILD_PATH); fi
+install/libigstk${ABI_VERSION}::
+ dh_install -plibigstk${ABI_VERSION} debian/tmp/usr/lib/IGSTK/*.so.* usr/lib
- cd $(STATIC_BUILD_PATH) \
- && 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 configure-stamp
-
-
-build: build-arch
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
- dh_testdir
- dh_prep
-
- # Add here commands to compile the package.
-
- # build static libs
- $(MAKE) $(JOBS) -C $(STATIC_BUILD_PATH)
-
- # build shared libs
- $(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
+ - cd $(DEB_BUILDDIR) && LD_LIBRARY_PATH=`pwd`/bin:$$LD_LIBRARY_PATH /usr/bin/xvfb-run -a /usr/bin/ctest -VV
- touch $@
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
- dh_testdir
+install/igstk-doc::
+ mkdir -p $(DEB_BUILDDIR)/Utilities/Doxygen/doc/html
+ $(MAKE) $(JOBS) Documentation -C $(DEB_BUILDDIR)
- # build documentation
- mkdir -p $(STATIC_BUILD_PATH)/Utilities/Doxygen/doc/html
- $(MAKE) $(JOBS) Documentation -C $(STATIC_BUILD_PATH)
+ # remove zero byte files
+ find $(DEB_BUILDDIR)/Utilities/Doxygen/doc/ -depth -empty | xargs rm -rf
- # remove zero byte files
- find $(STATIC_BUILD_PATH)/Utilities/Doxygen/doc/ -depth -empty | xargs rm -rf
- touch $@
-
-
-clean: clean-patched unpatch
-
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp build-arch-stamp
-
- # 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
-
-
-install-arch: build-arch
- dh_testdir
- dh_testroot
- dh_installdirs
-
- # 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 ../../Utilities/SceneGraphVisualization/igstk*.h usr/include/IGSTK
-
- # install libs and *cmake files
- dh_install -plibigstk4-dev debian/tmp/usr/lib/IGSTK/*.a usr/lib
- dh_install -plibigstk4-dev $(SHARED_BUILD_PATH)/bin/*.so usr/lib
- dh_install -plibigstk4-dev debian/tmp/usr/lib/IGSTK/*.cmake usr/lib/IGSTK
-
- dh_install -plibigstk4 $(SHARED_BUILD_PATH)/bin/*.so.* usr/lib
-
-
-install-indep: build-indep
- dh_install -pigstk-doc $(STATIC_BUILD_PATH)/Utilities/Doxygen/doc/html usr/share/doc/igstk-doc
+ dh_install -pigstk-doc $(DEB_BUILDDIR)/Utilities/Doxygen/doc/html usr/share/doc/igstk-doc
dh_installexamples -pigstk-examples Examples/*
# remove executable file mode bit
@@ -143,34 +80,8 @@
-type f -print0 | xargs -0 chmod 644
-# Build architecture independant packages using the common target.
-binary-indep: install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+# dh_compress -X"igstk-examples/examples"
-# Build architecture dependant packages using the common target.
-binary-arch: install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-
-# Build architecture-dependent files here.
-binary-common:
- dh_testdir
- dh_testroot
- dh_install
- dh_installchangelogs
- dh_installdocs
- dh_installman
- dh_link
- dh_strip
- dh_compress -X"igstk-examples/examples"
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+get-orig-source:
+ /bin/sh $(CURDIR)/debian/get-orig-source
More information about the debian-med-commit
mailing list