[med-svn] r5718 - trunk/packages/dcmtk/trunk/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Fri Jan 28 09:13:17 UTC 2011
Author: malat-guest
Date: 2011-01-28 09:13:14 +0000 (Fri, 28 Jan 2011)
New Revision: 5718
Modified:
trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch
Log:
Fix dot path
Modified: trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch 2011-01-28 09:10:25 UTC (rev 5717)
+++ trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch 2011-01-28 09:13:14 UTC (rev 5718)
@@ -1,7 +1,7 @@
Index: dcmtk-3.6.0/doxygen/htmldocs.cfg
===================================================================
--- dcmtk-3.6.0.orig/doxygen/htmldocs.cfg 2010-11-29 13:02:49.000000000 +0100
-+++ dcmtk-3.6.0/doxygen/htmldocs.cfg 2011-01-28 10:03:39.000000000 +0100
++++ dcmtk-3.6.0/doxygen/htmldocs.cfg 2011-01-28 10:12:13.000000000 +0100
@@ -1,4 +1,4 @@
-# Doxyfile 1.5.1
+# Doxyfile 1.7.1
@@ -855,11 +855,11 @@
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
++
++EXCLUDE_SYMBOLS =
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-+EXCLUDE_SYMBOLS =
-+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
# the \include command).
@@ -1112,7 +1112,9 @@
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
-+
+
+-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+-# files or namespaces will be aligned in HTML using tables. If set to
+HTML_COLORSTYLE_SAT = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
@@ -1129,9 +1131,7 @@
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = YES
-
--# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
--# files or namespaces will be aligned in HTML using tables. If set to
++
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
# NO a bullet list will be used.
@@ -1784,388 +1784,21 @@
# instead of the = operator.
PREDEFINED = WITH_OPENSSL \
-@@ -1022,239 +1375,264 @@
- WITH_LIBXML \
- WITH_LIBWRAP
-
--# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
--# this tag can be used to specify a list of macro names that should be expanded.
--# The macro definition that is found in the sources will be used.
-+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-+# this tag can be used to specify a list of macro names that should be expanded.
-+# The macro definition that is found in the sources will be used.
- # Use the PREDEFINED tag if you want to use a different macro definition.
-
--EXPAND_AS_DEFINED =
-+EXPAND_AS_DEFINED =
-
--# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
--# doxygen's preprocessor will remove all function-like macros that are alone
--# on a line, have an all uppercase name, and do not end with a semicolon. Such
--# function macros are typically used for boiler-plate code, and will confuse
-+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-+# doxygen's preprocessor will remove all function-like macros that are alone
-+# on a line, have an all uppercase name, and do not end with a semicolon. Such
-+# function macros are typically used for boiler-plate code, and will confuse
- # the parser if not removed.
-
- SKIP_FUNCTION_MACROS = YES
-
- #---------------------------------------------------------------------------
--# Configuration::additions related to external references
-+# Configuration::additions related to external references
- #---------------------------------------------------------------------------
-
--# The TAGFILES option can be used to specify one or more tagfiles.
--# Optionally an initial location of the external documentation
--# can be added for each tagfile. The format of a tag file without
--# this location is as follows:
--# TAGFILES = file1 file2 ...
--# Adding location for the tag files is done as follows:
--# TAGFILES = file1=loc1 "file2 = loc2" ...
--# where "loc1" and "loc2" can be relative or absolute paths or
--# URLs. If a location is present for each tag, the installdox tool
-+# The TAGFILES option can be used to specify one or more tagfiles.
-+# Optionally an initial location of the external documentation
-+# can be added for each tagfile. The format of a tag file without
-+# this location is as follows:
-+#
-+# TAGFILES = file1 file2 ...
-+# Adding location for the tag files is done as follows:
-+#
-+# TAGFILES = file1=loc1 "file2 = loc2" ...
-+# where "loc1" and "loc2" can be relative or absolute paths or
-+# URLs. If a location is present for each tag, the installdox tool
- # does not have to be run to correct the links.
- # Note that each tag file must have a unique name
- # (where the name does NOT include the path)
--# If a tag file is not located in the directory in which doxygen
-+# If a tag file is not located in the directory in which doxygen
- # is run, you must also specify the path to the tagfile here.
-
--TAGFILES =
-+TAGFILES =
-
--# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
- # a tag file that is based on the input files it reads.
-
--GENERATE_TAGFILE =
-+GENERATE_TAGFILE =
-
--# If the ALLEXTERNALS tag is set to YES all external classes will be listed
--# in the class index. If set to NO only the inherited external classes
-+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-+# in the class index. If set to NO only the inherited external classes
- # will be listed.
-
- ALLEXTERNALS = NO
-
--# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
--# in the modules index. If set to NO, only the current project's groups will
-+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-+# in the modules index. If set to NO, only the current project's groups will
- # be listed.
-
- EXTERNAL_GROUPS = YES
-
--# The PERL_PATH should be the absolute path and name of the perl script
-+# The PERL_PATH should be the absolute path and name of the perl script
- # interpreter (i.e. the result of `which perl').
-
- PERL_PATH = /usr/bin/perl
-
- #---------------------------------------------------------------------------
--# Configuration options related to the dot tool
-+# Configuration options related to the dot tool
- #---------------------------------------------------------------------------
-
--# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
--# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
--# or super classes. Setting the tag to NO turns the diagrams off. Note that
--# this option is superseded by the HAVE_DOT option below. This is only a
--# fallback. It is recommended to install and use dot, since it yields more
-+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-+# or super classes. Setting the tag to NO turns the diagrams off. Note that
-+# this option is superseded by the HAVE_DOT option below. This is only a
-+# fallback. It is recommended to install and use dot, since it yields more
- # powerful graphs.
-
- CLASS_DIAGRAMS = YES
-
--# If set to YES, the inheritance and collaboration graphs will hide
--# inheritance and usage relations if the target is undocumented
-+# You can define message sequence charts within doxygen comments using the \msc
-+# command. Doxygen will then run the mscgen tool (see
-+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-+# the mscgen tool resides. If left empty the tool is assumed to be found in the
-+# default search path.
-+
-+MSCGEN_PATH =
-+
-+# If set to YES, the inheritance and collaboration graphs will hide
-+# inheritance and usage relations if the target is undocumented
- # or is not a class.
-
- HIDE_UNDOC_RELATIONS = YES
-
--# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
--# available from the path. This tool is part of Graphviz, a graph visualization
--# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-+# available from the path. This tool is part of Graphviz, a graph visualization
-+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+@@ -1104,7 +1457,7 @@
+ # toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
--HAVE_DOT = YES
+-HAVE_DOT = NO
+HAVE_DOT = YES
--# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
--# will generate a graph for each documented class showing the direct and
--# indirect inheritance relations. Setting this tag to YES will force the
-+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-+# allowed to run in parallel. When set to 0 (the default) doxygen will
-+# base this on the number of processors available in the system. You can set it
-+# explicitly to a value larger than 0 to get control over the balance
-+# between CPU load and processing speed.
-+
-+DOT_NUM_THREADS = 0
-+
-+# By default doxygen will write a font called FreeSans.ttf to the output
-+# directory and reference it in all dot files that doxygen generates. This
-+# font does not include all possible unicode characters however, so when you need
-+# these (or just want a differently looking font) you can specify the font name
-+# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-+# which can be done by putting it in a standard location or by setting the
-+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-+# containing the font.
-+
-+DOT_FONTNAME = FreeSans
-+
-+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-+# The default size is 10pt.
-+
-+DOT_FONTSIZE = 10
-+
-+# By default doxygen will tell dot to use the output directory to look for the
-+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-+# different font using DOT_FONTNAME you can set the path where dot
-+# can find it using this tag.
-+
-+DOT_FONTPATH =
-+
-+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-+# will generate a graph for each documented class showing the direct and
-+# indirect inheritance relations. Setting this tag to YES will force the
- # the CLASS_DIAGRAMS tag to NO.
-
- CLASS_GRAPH = YES
-
--# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
--# will generate a graph for each documented class showing the direct and
--# indirect implementation dependencies (inheritance, containment, and
-+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-+# will generate a graph for each documented class showing the direct and
-+# indirect implementation dependencies (inheritance, containment, and
- # class references variables) of the class with other documented classes.
-
- COLLABORATION_GRAPH = YES
-
--# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
- # will generate a graph for groups, showing the direct groups dependencies
-
- GROUP_GRAPHS = YES
-
--# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
--# collaboration diagrams in a style similar to the OMG's Unified Modeling
-+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-+# collaboration diagrams in a style similar to the OMG's Unified Modeling
- # Language.
-
- UML_LOOK = NO
-
--# If set to YES, the inheritance and collaboration graphs will show the
-+# If set to YES, the inheritance and collaboration graphs will show the
- # relations between templates and their instances.
-
- TEMPLATE_RELATIONS = YES
-
--# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
--# tags are set to YES then doxygen will generate a graph for each documented
--# file showing the direct and indirect include dependencies of the file with
-+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-+# tags are set to YES then doxygen will generate a graph for each documented
-+# file showing the direct and indirect include dependencies of the file with
- # other documented files.
-
- INCLUDE_GRAPH = YES
-
--# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
--# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
--# documented header file showing the documented files that directly or
-+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-+# documented header file showing the documented files that directly or
- # indirectly include this file.
-
- INCLUDED_BY_GRAPH = YES
-
--# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
--# generate a call dependency graph for every global function or class method.
--# Note that enabling this option will significantly increase the time of a run.
--# So in most cases it will be better to enable call graphs for selected
--# functions only using the \callgraph command.
-+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-+# doxygen will generate a call dependency graph for every global function
-+# or class method. Note that enabling this option will significantly increase
-+# the time of a run. So in most cases it will be better to enable call graphs
-+# for selected functions only using the \callgraph command.
-
- CALL_GRAPH = NO
-
--# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will
--# generate a caller dependency graph for every global function or class method.
--# Note that enabling this option will significantly increase the time of a run.
--# So in most cases it will be better to enable caller graphs for selected
--# functions only using the \callergraph command.
-+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-+# doxygen will generate a caller dependency graph for every global function
-+# or class method. Note that enabling this option will significantly increase
-+# the time of a run. So in most cases it will be better to enable caller
-+# graphs for selected functions only using the \callergraph command.
-
- CALLER_GRAPH = NO
-
--# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
- # will graphical hierarchy of all classes instead of a textual one.
-
- GRAPHICAL_HIERARCHY = YES
-
--# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
--# then doxygen will show the dependencies a directory has on other directories
-+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-+# then doxygen will show the dependencies a directory has on other directories
- # in a graphical way. The dependency relations are determined by the #include
- # relations between the files in the directories.
-
- DIRECTORY_GRAPH = YES
-
--# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
- # generated by dot. Possible values are png, jpg, or gif
- # If left blank png will be used.
-
- DOT_IMAGE_FORMAT = png
-
--# The tag DOT_PATH can be used to specify the path where the dot tool can be
-+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+ # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+ # will generate a graph for each documented class showing the direct and
+@@ -1187,7 +1540,7 @@
+ # The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
-DOT_PATH =
+DOT_PATH = ../debian
--# The DOTFILE_DIRS tag can be used to specify one or more directories that
--# contain dot files that are included in the documentation (see the
-+# The DOTFILE_DIRS tag can be used to specify one or more directories that
-+# contain dot files that are included in the documentation (see the
- # \dotfile command).
-
--DOTFILE_DIRS =
-+DOTFILE_DIRS =
-
--# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
--# (in pixels) of the graphs generated by dot. If a graph becomes larger than
--# this value, doxygen will try to truncate the graph, so that it fits within
--# the specified constraint. Beware that most browsers cannot cope with very
--# large images.
--
--MAX_DOT_GRAPH_WIDTH = 1024
--
--# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
--# (in pixels) of the graphs generated by dot. If a graph becomes larger than
--# this value, doxygen will try to truncate the graph, so that it fits within
--# the specified constraint. Beware that most browsers cannot cope with very
--# large images.
--
--MAX_DOT_GRAPH_HEIGHT = 1024
--
--# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
--# graphs generated by dot. A depth value of 3 means that only nodes reachable
--# from the root by following a path via at most 3 edges will be shown. Nodes
--# that lay further from the root node will be omitted. Note that setting this
--# option to 1 or 2 may greatly reduce the computation time needed for large
--# code bases. Also note that a graph may be further truncated if the graph's
--# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH
--# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default),
--# the graph is not depth-constrained.
-+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-+# nodes that will be shown in the graph. If the number of nodes in a graph
-+# becomes larger than this value, doxygen will truncate the graph, which is
-+# visualized by representing a node as a red box. Note that doxygen if the
-+# number of direct children of the root node in a graph is already larger than
-+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-+
-+DOT_GRAPH_MAX_NODES = 50
-+
-+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-+# graphs generated by dot. A depth value of 3 means that only nodes reachable
-+# from the root by following a path via at most 3 edges will be shown. Nodes
-+# that lay further from the root node will be omitted. Note that setting this
-+# option to 1 or 2 may greatly reduce the computation time needed for large
-+# code bases. Also note that the size of a graph can be further restricted by
-+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
- MAX_DOT_GRAPH_DEPTH = 0
-
--# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
--# background. This is disabled by default, which results in a white background.
--# Warning: Depending on the platform used, enabling this option may lead to
--# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
--# read).
-+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-+# background. This is disabled by default, because dot on Windows does not
-+# seem to support this out of the box. Warning: Depending on the platform used,
-+# enabling this option may lead to badly anti-aliased labels on the edges of
-+# a graph (i.e. they become hard to read).
-
- DOT_TRANSPARENT = NO
-
--# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
--# files in one run (i.e. multiple -o and -T options on the command line). This
--# makes dot run faster, but since only newer versions of dot (>1.8.10)
-+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-+# files in one run (i.e. multiple -o and -T options on the command line). This
-+# makes dot run faster, but since only newer versions of dot (>1.8.10)
- # support this, this feature is disabled by default.
-
- DOT_MULTI_TARGETS = NO
-
--# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
--# generate a legend page explaining the meaning of the various boxes and
-+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-+# generate a legend page explaining the meaning of the various boxes and
- # arrows in the dot generated graphs.
-
- GENERATE_LEGEND = YES
-
--# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
--# remove the intermediate dot files that are used to generate
-+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-+# remove the intermediate dot files that are used to generate
- # the various graphs.
-
- DOT_CLEANUP = YES
--
--#---------------------------------------------------------------------------
--# Configuration::additions related to the search engine
--#---------------------------------------------------------------------------
--
--# The SEARCHENGINE tag specifies whether or not a search engine should be
--# used. If set to NO the values of all tags below this one will be ignored.
--
--SEARCHENGINE = NO
+ # The DOTFILE_DIRS tag can be used to specify one or more directories that
+ # contain dot files that are included in the documentation (see the
More information about the debian-med-commit
mailing list