[med-svn] r9504 - in trunk/packages/activiz.net/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Tue Jan 31 16:55:29 UTC 2012
Author: malat-guest
Date: 2012-01-31 16:55:28 +0000 (Tue, 31 Jan 2012)
New Revision: 9504
Added:
trunk/packages/activiz.net/trunk/debian/patches/buildindephack.patch
Modified:
trunk/packages/activiz.net/trunk/debian/changelog
trunk/packages/activiz.net/trunk/debian/control
trunk/packages/activiz.net/trunk/debian/patches/doxygenversion.patch
trunk/packages/activiz.net/trunk/debian/patches/series
trunk/packages/activiz.net/trunk/debian/rules
Log:
hide doxygen target
Modified: trunk/packages/activiz.net/trunk/debian/changelog
===================================================================
--- trunk/packages/activiz.net/trunk/debian/changelog 2012-01-31 16:34:19 UTC (rev 9503)
+++ trunk/packages/activiz.net/trunk/debian/changelog 2012-01-31 16:55:28 UTC (rev 9504)
@@ -1,3 +1,9 @@
+activiz.net (1:1.0~git20111123-4) unstable; urgency=low
+
+ * Work around bbuild and build-indep, by hidding doxygen target.
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 31 Jan 2012 17:54:55 +0100
+
activiz.net (1:1.0~git20111123-3) unstable; urgency=medium
* Speed up compilation of build-indep target (dot generation)
Modified: trunk/packages/activiz.net/trunk/debian/control
===================================================================
--- trunk/packages/activiz.net/trunk/debian/control 2012-01-31 16:34:19 UTC (rev 9503)
+++ trunk/packages/activiz.net/trunk/debian/control 2012-01-31 16:55:28 UTC (rev 9504)
@@ -7,7 +7,8 @@
Andreas Tille <tille at debian.org>
Build-Depends: debhelper (>= 8), cmake (>= 2.8.3), mummy,
libkitware-mummy-runtime1.0-cil, gccxml, libvtk5-dev (>= 5.6), mono-devel,
- cli-common-dev (>= 0.5.7), doxygen-latex (>= 1.6.2), graphviz
+ cli-common-dev (>= 0.8~)
+Build-Depends-Indep: doxygen-latex (>= 1.6.2), graphviz
Standards-Version: 3.9.2
Homepage: http://www.kitware.com/products/avdownload.php
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/activiz.net/trunk
@@ -43,7 +44,6 @@
Package: activiz.net-examples
Architecture: all
Suggests: vtk-examples
-Section: graphics
Depends: ${misc:Depends}
Description: ActiViz.NET examples
ActiViz provides a powerful interface to the Visualization Toolkit (VTK), an
Added: trunk/packages/activiz.net/trunk/debian/patches/buildindephack.patch
===================================================================
--- trunk/packages/activiz.net/trunk/debian/patches/buildindephack.patch (rev 0)
+++ trunk/packages/activiz.net/trunk/debian/patches/buildindephack.patch 2012-01-31 16:55:28 UTC (rev 9504)
@@ -0,0 +1,20 @@
+Index: activiz.net-1.0~git20111123/CMakeLists.txt
+===================================================================
+--- activiz.net-1.0~git20111123.orig/CMakeLists.txt 2012-01-31 17:48:54.000000000 +0100
++++ activiz.net-1.0~git20111123/CMakeLists.txt 2012-01-31 17:49:39.000000000 +0100
+@@ -1309,6 +1309,7 @@
+ IF(NOT DOXYGEN_EXECUTABLE)
+ FIND_PACKAGE(Doxygen)
+ ENDIF(NOT DOXYGEN_EXECUTABLE)
++ IF(DOXYGEN_EXECUTABLE)
+ IF(NOT DOXYGEN_EXECUTABLE)
+ MESSAGE(FATAL_ERROR "error: doxygen executable not found. doygen_EXECUTABLE = '${DOXYGEN_EXECUTABLE}'")
+ ENDIF(NOT DOXYGEN_EXECUTABLE)
+@@ -1331,6 +1332,7 @@
+ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxygen/Doxyfile
+ )
+ ADD_DEPENDENCIES(AVDN_doxygen Kitware.VTK)
++ ENDIF(DOXYGEN_EXECUTABLE)
+
+ ENDIF(GENERATE_DOXYGEN)
+
Modified: trunk/packages/activiz.net/trunk/debian/patches/doxygenversion.patch
===================================================================
--- trunk/packages/activiz.net/trunk/debian/patches/doxygenversion.patch 2012-01-31 16:34:19 UTC (rev 9503)
+++ trunk/packages/activiz.net/trunk/debian/patches/doxygenversion.patch 2012-01-31 16:55:28 UTC (rev 9504)
@@ -1,17 +1,32 @@
Index: activiz.net-1.0~git20111123/Doxyfile.in
===================================================================
---- activiz.net-1.0~git20111123.orig/Doxyfile.in 2012-01-18 12:29:48.000000000 +0100
-+++ activiz.net-1.0~git20111123/Doxyfile.in 2012-01-18 12:32:58.000000000 +0100
-@@ -5,7 +5,7 @@
+--- activiz.net-1.0~git20111123.orig/Doxyfile.in 2012-01-30 15:34:47.000000000 +0100
++++ activiz.net-1.0~git20111123/Doxyfile.in 2012-01-30 15:35:10.000000000 +0100
+@@ -1,11 +1,13 @@
+-# Doxyfile 1.5.6
++# Doxyfile 1.7.4
+
#---------------------------------------------------------------------------
+ # Project related configuration options
+ #---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "ActiViz .NET"
-PROJECT_NUMBER = 5.2.0
+PROJECT_NUMBER = @VTK_VERSION@
++PROJECT_BRIEF =
++PROJECT_LOGO =
OUTPUT_DIRECTORY = "@CMAKE_CURRENT_BINARY_DIR@/Doxygen"
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
-@@ -32,7 +32,6 @@
+@@ -26,28 +28,30 @@
+ INLINE_INHERITED_MEMB = NO
+ FULL_PATH_NAMES = YES
+ STRIP_FROM_PATH = "@CMAKE_CURRENT_SOURCE_DIR@" \
+- "@CMAKE_CURRENT_BINARY_DIR@" \
+-STRIP_FROM_INC_PATH =
++ "@CMAKE_CURRENT_BINARY_DIR@"
++STRIP_FROM_INC_PATH =
+ SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO
QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
@@ -19,39 +34,264 @@
INHERIT_DOCS = YES
SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 2
-@@ -196,7 +195,7 @@
- LATEX_HEADER =
+-ALIASES =
++ALIASES =
+ OPTIMIZE_OUTPUT_FOR_C = NO
+ OPTIMIZE_OUTPUT_JAVA = YES
+ 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 = NO
+ SUBGROUPING = YES
++INLINE_GROUPED_CLASSES = NO
+ TYPEDEF_HIDES_STRUCT = NO
++SYMBOL_CACHE_SIZE = 0
+ #---------------------------------------------------------------------------
+ # Build related configuration options
+ #---------------------------------------------------------------------------
+@@ -65,22 +69,26 @@
+ CASE_SENSE_NAMES = NO
+ HIDE_SCOPE_NAMES = NO
+ SHOW_INCLUDE_FILES = YES
++FORCE_LOCAL_INCLUDES = NO
+ INLINE_INFO = YES
+ SORT_MEMBER_DOCS = YES
+ SORT_BRIEF_DOCS = NO
++SORT_MEMBERS_CTORS_1ST = NO
+ SORT_GROUP_NAMES = NO
+ SORT_BY_SCOPE_NAME = NO
++STRICT_PROTO_MATCHING = 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 =
++FILE_VERSION_FILTER =
++LAYOUT_FILE =
+ #---------------------------------------------------------------------------
+ # configuration options related to warning and progress messages
+ #---------------------------------------------------------------------------
+@@ -90,7 +98,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
+ #---------------------------------------------------------------------------
+@@ -129,17 +137,18 @@
+ *.vhdl \
+ *.cs
+ RECURSIVE = NO
+-EXCLUDE =
++EXCLUDE =
+ EXCLUDE_SYMLINKS = NO
+-EXCLUDE_PATTERNS =
+-EXCLUDE_SYMBOLS =
+-EXAMPLE_PATH =
++EXCLUDE_PATTERNS =
++EXCLUDE_SYMBOLS =
++EXAMPLE_PATH =
+ EXAMPLE_PATTERNS = *
+ EXAMPLE_RECURSIVE = NO
+-IMAGE_PATH =
+-INPUT_FILTER =
+-FILTER_PATTERNS =
++IMAGE_PATH =
++INPUT_FILTER =
++FILTER_PATTERNS =
+ FILTER_SOURCE_FILES = NO
++FILTER_SOURCE_PATTERNS =
+ #---------------------------------------------------------------------------
+ # configuration options related to source browsing
+ #---------------------------------------------------------------------------
+@@ -156,33 +165,57 @@
+ #---------------------------------------------------------------------------
+ ALPHABETICAL_INDEX = NO
+ COLS_IN_ALPHA_INDEX = 5
+-IGNORE_PREFIX =
++IGNORE_PREFIX =
+ #---------------------------------------------------------------------------
+ # configuration options related to the HTML output
+ #---------------------------------------------------------------------------
+ GENERATE_HTML = YES
+ HTML_OUTPUT = html
+ HTML_FILE_EXTENSION = .html
+-HTML_HEADER =
+-HTML_FOOTER =
+-HTML_STYLESHEET =
++HTML_HEADER =
++HTML_FOOTER =
++HTML_STYLESHEET =
++HTML_EXTRA_FILES =
++HTML_COLORSTYLE_HUE = 220
++HTML_COLORSTYLE_SAT = 100
++HTML_COLORSTYLE_GAMMA = 80
++HTML_TIMESTAMP = YES
+ HTML_ALIGN_MEMBERS = YES
+-GENERATE_HTMLHELP = NO
++HTML_DYNAMIC_SECTIONS = NO
+ GENERATE_DOCSET = NO
+ DOCSET_FEEDNAME = "Doxygen generated docs"
+ DOCSET_BUNDLE_ID = org.doxygen.Project
+-HTML_DYNAMIC_SECTIONS = NO
+-CHM_FILE =
+-HHC_LOCATION =
++DOCSET_PUBLISHER_ID = org.doxygen.Publisher
++DOCSET_PUBLISHER_NAME = Publisher
++GENERATE_HTMLHELP = NO
++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 = org.doxygen.Project
++QHP_VIRTUAL_FOLDER = doc
++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 = NONE
++USE_INLINE_TREES = NO
+ TREEVIEW_WIDTH = 250
++EXT_LINKS_IN_WINDOW = NO
+ FORMULA_FONTSIZE = 10
++FORMULA_TRANSPARENT = YES
++USE_MATHJAX = NO
++MATHJAX_RELPATH = http://www.mathjax.org/mathjax
++SEARCHENGINE = NO
++SERVER_BASED_SEARCH = NO
+ #---------------------------------------------------------------------------
+ # configuration options related to the LaTeX output
+ #---------------------------------------------------------------------------
+@@ -192,12 +225,14 @@
+ MAKEINDEX_CMD_NAME = makeindex
+ COMPACT_LATEX = NO
+ PAPER_TYPE = a4wide
+-EXTRA_PACKAGES =
+-LATEX_HEADER =
++EXTRA_PACKAGES =
++LATEX_HEADER =
++LATEX_FOOTER =
PDF_HYPERLINKS = NO
USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
+LATEX_BATCHMODE = YES
LATEX_HIDE_INDICES = NO
++LATEX_SOURCE_CODE = NO
#---------------------------------------------------------------------------
# configuration options related to the RTF output
-@@ -260,6 +259,7 @@
- MSCGEN_PATH =
+ #---------------------------------------------------------------------------
+@@ -205,8 +240,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
+ #---------------------------------------------------------------------------
+@@ -219,8 +254,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
+@@ -232,36 +267,38 @@
+ 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 = "@CMAKE_CURRENT_BINARY_DIR@/csharp"
+-INCLUDE_FILE_PATTERNS =
+-PREDEFINED =
+-EXPAND_AS_DEFINED =
++INCLUDE_FILE_PATTERNS =
++PREDEFINED =
++EXPAND_AS_DEFINED =
+ SKIP_FUNCTION_MACROS = YES
+ #---------------------------------------------------------------------------
+-# Configuration::additions related to external references
++# Configuration::additions related to external references
+ #---------------------------------------------------------------------------
+-TAGFILES =
+-GENERATE_TAGFILE =
++TAGFILES =
++GENERATE_TAGFILE =
+ ALLEXTERNALS = NO
+ EXTERNAL_GROUPS = YES
+ PERL_PATH = /usr/bin/perl
+ #---------------------------------------------------------------------------
+-# Configuration options related to the dot tool
++# Configuration options related to the dot tool
+ #---------------------------------------------------------------------------
+ CLASS_DIAGRAMS = NO
+-MSCGEN_PATH =
++MSCGEN_PATH =
HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = @HAVE_DOT_YESNO@
-+DOT_NUM_THREADS = 0
++DOT_NUM_THREADS = 1
DOT_FONTNAME = FreeSans
- DOT_FONTPATH =
+-DOT_FONTPATH =
++DOT_FONTSIZE = 10
++DOT_FONTPATH =
CLASS_GRAPH = YES
-@@ -273,15 +273,15 @@
+ COLLABORATION_GRAPH = YES
+ GROUP_GRAPHS = YES
+@@ -273,16 +310,13 @@
CALLER_GRAPH = NO
GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
+-DOT_PATH = "@DOXYGEN_DOT_PATH@"
+-DOTFILE_DIRS =
+DOT_IMAGE_FORMAT = svg
- DOT_PATH = "@DOXYGEN_DOT_PATH@"
- DOTFILE_DIRS =
++DOT_PATH = "@DOXYGEN_DOT_PATH@"
++DOTFILE_DIRS =
++MSCFILE_DIRS =
DOT_GRAPH_MAX_NODES = 1024
MAX_DOT_GRAPH_DEPTH = 1000
DOT_TRANSPARENT = YES
--DOT_MULTI_TARGETS = NO
-+DOT_MULTI_TARGETS = YES
+ DOT_MULTI_TARGETS = NO
GENERATE_LEGEND = YES
--DOT_CLEANUP = YES
-+DOT_CLEANUP = NO
- #---------------------------------------------------------------------------
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
+ DOT_CLEANUP = YES
+-#---------------------------------------------------------------------------
+-# Configuration::additions related to the search engine
+-#---------------------------------------------------------------------------
+-SEARCHENGINE = NO
Modified: trunk/packages/activiz.net/trunk/debian/patches/series
===================================================================
--- trunk/packages/activiz.net/trunk/debian/patches/series 2012-01-31 16:34:19 UTC (rev 9503)
+++ trunk/packages/activiz.net/trunk/debian/patches/series 2012-01-31 16:55:28 UTC (rev 9504)
@@ -6,3 +6,4 @@
doxygenversion.patch
removedoxfromall.patch
removeusersguide.patch
+buildindephack.patch
Modified: trunk/packages/activiz.net/trunk/debian/rules
===================================================================
--- trunk/packages/activiz.net/trunk/debian/rules 2012-01-31 16:34:19 UTC (rev 9503)
+++ trunk/packages/activiz.net/trunk/debian/rules 2012-01-31 16:55:28 UTC (rev 9504)
@@ -3,7 +3,11 @@
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+export LDFLAGS='-Wl,--as-needed'
+# dpkg-shlibdeps needs to know where is libKitware.mummy.Runtime.Unmanaged.so
+export LD_LIBRARY_PATH+=:/usr/lib/cli/Kitware.mummy.Runtime-1.0
+
# http://vtk.org/Bug/view.php?id=11875
CMAKE_FLAGS = \
-DAVDN_INSTALL_PREFIX:PATH=/usr \
@@ -24,10 +28,6 @@
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_FLAGS)
-# dpkg-shlibdeps: error: no dependency information found for /usr/lib/libvtkNetCDF_cxx.so.5.6
-override_dh_shlibdeps:
- dh_shlibdeps -- --ignore-missing-info
-
# Let's be smart with building doc
override_dh_auto_build-indep:
$(MAKE) -C obj-* AVDN_doxygen
More information about the debian-med-commit
mailing list