[med-svn] r9898 - in trunk/packages/dcmtk/branches/experimental/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Tue Mar 6 17:57:39 UTC 2012
Author: malat-guest
Date: 2012-03-06 17:57:38 +0000 (Tue, 06 Mar 2012)
New Revision: 9898
Modified:
trunk/packages/dcmtk/branches/experimental/debian/changelog
trunk/packages/dcmtk/branches/experimental/debian/patches/04_nostrip.patch
trunk/packages/dcmtk/branches/experimental/debian/patches/05_no_www_docs.patch
trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch
Log:
Refresh patch for exp dcmtk
Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/changelog 2012-03-06 11:21:25 UTC (rev 9897)
+++ trunk/packages/dcmtk/branches/experimental/debian/changelog 2012-03-06 17:57:38 UTC (rev 9898)
@@ -1,4 +1,4 @@
-dcmtk (3.6.1~20110225-1) experimental; urgency=low
+dcmtk (3.6.1~20120222-1) experimental; urgency=low
* Use new dh syntax
* Switch to cmake build system (allows parallel builds)
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/04_nostrip.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/04_nostrip.patch 2012-03-06 11:21:25 UTC (rev 9897)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/04_nostrip.patch 2012-03-06 17:57:38 UTC (rev 9898)
@@ -1,9 +1,9 @@
Remove all hardcoded calls to `strip` command
-Index: dcmtk-3.6.1_20110225/config/templates/Makefile.src
+Index: dcmtk-3.6.1_20120222/config/templates/Makefile.src
===================================================================
---- dcmtk-3.6.1_20110225.orig/config/templates/Makefile.src 2009-01-30 10:27:58.000000000 +0100
-+++ dcmtk-3.6.1_20110225/config/templates/Makefile.src 2011-04-03 17:18:06.000000000 +0200
+--- dcmtk-3.6.1_20120222.orig/config/templates/Makefile.src 2011-07-06 16:23:01.000000000 +0200
++++ dcmtk-3.6.1_20120222/config/templates/Makefile.src 2012-03-06 18:56:00.000000000 +0100
@@ -31,7 +31,7 @@
install-bin: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
@@ -13,11 +13,11 @@
done
-Index: dcmtk-3.6.1_20110225/dcmdata/apps/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmdata/apps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmdata/apps/Makefile.in 2009-11-04 10:58:05.000000000 +0100
-+++ dcmtk-3.6.1_20110225/dcmdata/apps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
-@@ -76,7 +76,7 @@
+--- dcmtk-3.6.1_20120222.orig/dcmdata/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
++++ dcmtk-3.6.1_20120222/dcmdata/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
+@@ -77,7 +77,7 @@
install-bin: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
for prog in $(progs); do \
@@ -26,11 +26,11 @@
done
-Index: dcmtk-3.6.1_20110225/dcmimage/apps/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmimage/apps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmimage/apps/Makefile.in 2009-10-13 16:08:33.000000000 +0200
-+++ dcmtk-3.6.1_20110225/dcmimage/apps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
-@@ -42,7 +42,7 @@
+--- dcmtk-3.6.1_20120222.orig/dcmimage/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
++++ dcmtk-3.6.1_20120222/dcmimage/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
+@@ -43,7 +43,7 @@
install: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
for prog in $(progs); do \
@@ -39,10 +39,10 @@
done
-Index: dcmtk-3.6.1_20110225/dcmimgle/apps/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmimgle/apps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmimgle/apps/Makefile.in 2009-10-28 10:53:39.000000000 +0100
-+++ dcmtk-3.6.1_20110225/dcmimgle/apps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
+--- dcmtk-3.6.1_20120222.orig/dcmimgle/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
++++ dcmtk-3.6.1_20120222/dcmimgle/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
@@ -39,7 +39,7 @@
install: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
@@ -52,11 +52,11 @@
done
-Index: dcmtk-3.6.1_20110225/dcmjpeg/apps/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmjpeg/apps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmjpeg/apps/Makefile.in 2009-10-07 14:44:33.000000000 +0200
-+++ dcmtk-3.6.1_20110225/dcmjpeg/apps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
-@@ -72,7 +72,7 @@
+--- dcmtk-3.6.1_20120222.orig/dcmjpeg/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
++++ dcmtk-3.6.1_20120222/dcmjpeg/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
+@@ -73,7 +73,7 @@
install: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
for prog in $(progs); do \
@@ -64,12 +64,12 @@
+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
done
- clean:
-Index: dcmtk-3.6.1_20110225/dcmnet/apps/Makefile.in
+
+Index: dcmtk-3.6.1_20120222/dcmnet/apps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmnet/apps/Makefile.in 2009-11-04 11:24:29.000000000 +0100
-+++ dcmtk-3.6.1_20110225/dcmnet/apps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
-@@ -52,7 +52,7 @@
+--- dcmtk-3.6.1_20120222.orig/dcmnet/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
++++ dcmtk-3.6.1_20120222/dcmnet/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
+@@ -69,7 +69,7 @@
install: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
for prog in $(progs); do \
@@ -78,11 +78,11 @@
done
-Index: dcmtk-3.6.1_20110225/dcmpstat/apps/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmpstat/apps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmpstat/apps/Makefile.in 2009-10-13 16:57:49.000000000 +0200
-+++ dcmtk-3.6.1_20110225/dcmpstat/apps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
-@@ -113,7 +113,7 @@
+--- dcmtk-3.6.1_20120222.orig/dcmpstat/apps/Makefile.in 2012-01-06 12:52:21.000000000 +0100
++++ dcmtk-3.6.1_20120222/dcmpstat/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
+@@ -121,7 +121,7 @@
install: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
for prog in $(progs); do \
@@ -91,10 +91,10 @@
done
-Index: dcmtk-3.6.1_20110225/dcmqrdb/apps/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmqrdb/apps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmqrdb/apps/Makefile.in 2009-11-04 11:24:30.000000000 +0100
-+++ dcmtk-3.6.1_20110225/dcmqrdb/apps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
+--- dcmtk-3.6.1_20120222.orig/dcmqrdb/apps/Makefile.in 2011-10-27 11:58:46.000000000 +0200
++++ dcmtk-3.6.1_20120222/dcmqrdb/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
@@ -57,7 +57,7 @@
install: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
@@ -104,10 +104,10 @@
done
-Index: dcmtk-3.6.1_20110225/dcmsign/apps/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmsign/apps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmsign/apps/Makefile.in 2009-09-04 17:42:31.000000000 +0200
-+++ dcmtk-3.6.1_20110225/dcmsign/apps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
+--- dcmtk-3.6.1_20120222.orig/dcmsign/apps/Makefile.in 2011-10-27 11:58:46.000000000 +0200
++++ dcmtk-3.6.1_20120222/dcmsign/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
@@ -33,7 +33,7 @@
install: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
@@ -117,11 +117,11 @@
done
-Index: dcmtk-3.6.1_20110225/dcmsr/apps/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmsr/apps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmsr/apps/Makefile.in 2009-10-13 16:57:49.000000000 +0200
-+++ dcmtk-3.6.1_20110225/dcmsr/apps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
-@@ -44,7 +44,7 @@
+--- dcmtk-3.6.1_20120222.orig/dcmsr/apps/Makefile.in 2012-01-06 12:52:18.000000000 +0100
++++ dcmtk-3.6.1_20120222/dcmsr/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
+@@ -49,7 +49,7 @@
install-bin: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
for prog in $(progs); do \
@@ -130,11 +130,11 @@
done
-Index: dcmtk-3.6.1_20110225/dcmwlm/apps/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmwlm/apps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmwlm/apps/Makefile.in 2009-11-04 11:24:30.000000000 +0100
-+++ dcmtk-3.6.1_20110225/dcmwlm/apps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
-@@ -49,7 +49,7 @@
+--- dcmtk-3.6.1_20120222.orig/dcmwlm/apps/Makefile.in 2011-10-27 11:58:46.000000000 +0200
++++ dcmtk-3.6.1_20120222/dcmwlm/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
+@@ -51,7 +51,7 @@
install: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
for prog in $(progs); do \
@@ -143,11 +143,11 @@
done
-Index: dcmtk-3.6.1_20110225/dcmwlm/wwwapps/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmwlm/wwwapps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmwlm/wwwapps/Makefile.in 2009-11-04 11:24:30.000000000 +0100
-+++ dcmtk-3.6.1_20110225/dcmwlm/wwwapps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
-@@ -55,7 +55,7 @@
+--- dcmtk-3.6.1_20120222.orig/dcmwlm/wwwapps/Makefile.in 2011-10-27 11:58:46.000000000 +0200
++++ dcmtk-3.6.1_20120222/dcmwlm/wwwapps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
+@@ -54,7 +54,7 @@
install: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
for prog in $(progs); do \
@@ -156,10 +156,10 @@
done
-Index: dcmtk-3.6.1_20110225/dcmjpls/apps/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmjpls/apps/Makefile.in
===================================================================
---- dcmtk-3.6.1_20110225.orig/dcmjpls/apps/Makefile.in 2011-02-01 10:06:18.000000000 +0100
-+++ dcmtk-3.6.1_20110225/dcmjpls/apps/Makefile.in 2011-04-03 17:18:06.000000000 +0200
+--- dcmtk-3.6.1_20120222.orig/dcmjpls/apps/Makefile.in 2011-10-27 11:58:45.000000000 +0200
++++ dcmtk-3.6.1_20120222/dcmjpls/apps/Makefile.in 2012-03-06 18:56:00.000000000 +0100
@@ -70,7 +70,7 @@
install: all
$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/05_no_www_docs.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/05_no_www_docs.patch 2012-03-06 11:21:25 UTC (rev 9897)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/05_no_www_docs.patch 2012-03-06 17:57:38 UTC (rev 9898)
@@ -1,7 +1,7 @@
-Index: dcmtk-3.6.0/dcmwlm/docs/Makefile.in
+Index: dcmtk-3.6.1_20120222/dcmwlm/docs/Makefile.in
===================================================================
---- dcmtk-3.6.0.orig/dcmwlm/docs/Makefile.in 2007-11-23 17:30:50.000000000 +0100
-+++ dcmtk-3.6.0/dcmwlm/docs/Makefile.in 2011-01-28 09:58:14.000000000 +0100
+--- dcmtk-3.6.1_20120222.orig/dcmwlm/docs/Makefile.in 2007-11-23 17:30:50.000000000 +0100
++++ dcmtk-3.6.1_20120222/dcmwlm/docs/Makefile.in 2012-03-06 18:56:07.000000000 +0100
@@ -11,7 +11,8 @@
include $(configdir)/@common_makefile@
@@ -12,11 +12,11 @@
all:
-Index: dcmtk-3.6.0/config/rootconf
+Index: dcmtk-3.6.1_20120222/config/rootconf
===================================================================
---- dcmtk-3.6.0.orig/config/rootconf 2010-11-25 12:09:26.000000000 +0100
-+++ dcmtk-3.6.0/config/rootconf 2011-01-28 09:58:53.000000000 +0100
-@@ -67,7 +67,7 @@
+--- dcmtk-3.6.1_20120222.orig/config/rootconf 2011-10-27 11:28:57.000000000 +0200
++++ dcmtk-3.6.1_20120222/config/rootconf 2012-03-06 18:56:08.000000000 +0100
+@@ -76,7 +76,7 @@
dcmtk-install-doc:
\$(configdir)/mkinstalldirs \$(DESTDIR)\$(docdir)
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch 2012-03-06 11:21:25 UTC (rev 9897)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch 2012-03-06 17:57:38 UTC (rev 9898)
@@ -1,448 +1,13 @@
-Index: dcmtk-3.6.1_20110225/doxygen/htmldocs.cfg
+Index: dcmtk-3.6.1_20120222/doxygen/htmldocs.cfg
===================================================================
---- dcmtk-3.6.1_20110225.orig/doxygen/htmldocs.cfg 2011-02-25 15:29:14.000000000 +0100
-+++ dcmtk-3.6.1_20110225/doxygen/htmldocs.cfg 2011-04-03 17:18:18.000000000 +0200
-@@ -1,4 +1,4 @@
--# Doxyfile 1.5.1
-+# Doxyfile 1.7.1
-
- # This file describes the settings to be used by the documentation system
- # doxygen (www.doxygen.org) for a project
-@@ -454,98 +454,117 @@
- # configuration options related to the input files
- #---------------------------------------------------------------------------
-
--# The INPUT tag can be used to specify the files and/or directories that contain
--# documented source files. You may enter file names like "myfile.cpp" or
--# directories like "/usr/src/myproject". Separate the files or directories
-+# The INPUT tag can be used to specify the files and/or directories that contain
-+# documented source files. You may enter file names like "myfile.cpp" or
-+# directories like "/usr/src/myproject". Separate the files or directories
- # with spaces.
-
- INPUT = @DOXYGEN_INPUT_DIR@
-
--# If the value of the INPUT tag contains directories, you can use the
--# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
--# and *.h) to filter out the source-files in the directories. If left
--# blank the following patterns are tested:
--# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
--# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
-+# This tag can be used to specify the character encoding of the source files
-+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-+# also the default input encoding. Doxygen uses libiconv (or the iconv built
-+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-+# the list of possible encodings.
-+
-+INPUT_ENCODING = UTF-8
-+
-+# If the value of the INPUT tag contains directories, you can use the
-+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-+# and *.h) to filter out the source-files in the directories. If left
-+# blank the following patterns are tested:
-+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
- FILE_PATTERNS = *.h \
- *.man \
- *.dox
-
--# The RECURSIVE tag can be used to turn specify whether or not subdirectories
--# should be searched for input files as well. Possible values are YES and NO.
-+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-+# should be searched for input files as well. Possible values are YES and NO.
- # If left blank NO is used.
-
- RECURSIVE = YES
-
--# The EXCLUDE tag can be used to specify files and/or directories that should
--# excluded from the INPUT source files. This way you can easily exclude a
-+# The EXCLUDE tag can be used to specify files and/or directories that should
-+# excluded from the INPUT source files. This way you can easily exclude a
- # subdirectory from a directory tree whose root is specified with the INPUT tag.
-
- EXCLUDE = @DOXYGEN_INPUT_DIR@/config/include \
- @DOXYGEN_INPUT_DIR@/docs
-
--# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
--# directories that are symbolic links (a Unix filesystem feature) are excluded
-+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-+# directories that are symbolic links (a Unix filesystem feature) are excluded
- # from the input.
-
- EXCLUDE_SYMLINKS = NO
-
--# If the value of the INPUT tag contains directories, you can use the
--# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
--# certain files from those directories. Note that the wildcards are matched
--# against the file with absolute path, so to exclude all test directories
-+# If the value of the INPUT tag contains directories, you can use the
-+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-+# certain files from those directories. Note that the wildcards are matched
-+# against the file with absolute path, so to exclude all test directories
- # for example use the pattern */test/*
-
--EXCLUDE_PATTERNS =
-+EXCLUDE_PATTERNS =
-
--# 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 EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-+# (namespaces, classes, functions, etc.) that should be excluded from the
-+# 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
- # the \include command).
-
- EXAMPLE_PATH = @DOXYGEN_INPUT_DIR@
-
--# If the value of the EXAMPLE_PATH tag contains directories, you can use the
--# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
--# and *.h) to filter out the source-files in the directories. If left
-+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-+# and *.h) to filter out the source-files in the directories. If left
- # blank all files are included.
-
--EXAMPLE_PATTERNS =
-+EXAMPLE_PATTERNS =
-
--# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
--# searched for input files to be used with the \include or \dontinclude
--# commands irrespective of the value of the RECURSIVE tag.
-+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-+# searched for input files to be used with the \include or \dontinclude
-+# commands irrespective of the value of the RECURSIVE tag.
- # Possible values are YES and NO. If left blank NO is used.
-
- EXAMPLE_RECURSIVE = YES
-
--# The IMAGE_PATH tag can be used to specify one or more files or
--# directories that contain image that are included in the documentation (see
-+# The IMAGE_PATH tag can be used to specify one or more files or
-+# directories that contain image that are included in the documentation (see
- # the \image command).
-
--IMAGE_PATH =
-+IMAGE_PATH =
-
--# The INPUT_FILTER tag can be used to specify a program that doxygen should
--# invoke to filter for each input file. Doxygen will invoke the filter program
--# by executing (via popen()) the command <filter> <input-file>, where <filter>
--# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
--# input file. Doxygen will then use the output that the filter program writes
--# to standard output. If FILTER_PATTERNS is specified, this tag will be
-+# The INPUT_FILTER tag can be used to specify a program that doxygen should
-+# invoke to filter for each input file. Doxygen will invoke the filter program
-+# by executing (via popen()) the command <filter> <input-file>, where <filter>
-+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-+# input file. Doxygen will then use the output that the filter program writes
-+# to standard output.
-+# If FILTER_PATTERNS is specified, this tag will be
- # ignored.
-
--INPUT_FILTER =
-+INPUT_FILTER =
-
--# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
--# basis. Doxygen will compare the file name with each pattern and apply the
--# filter if there is a match. The filters are a list of the form:
--# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
--# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-+# basis.
-+# Doxygen will compare the file name with each pattern and apply the
-+# filter if there is a match.
-+# The filters are a list of the form:
-+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
- # is applied to all files.
-
--FILTER_PATTERNS =
-+FILTER_PATTERNS =
-
--# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
--# INPUT_FILTER) will be used to filter the input files when producing source
-+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-+# INPUT_FILTER) will be used to filter the input files when producing source
- # files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
- FILTER_SOURCE_FILES = NO
-@@ -554,32 +573,32 @@
- # configuration options related to source browsing
- #---------------------------------------------------------------------------
-
--# If the SOURCE_BROWSER tag is set to YES then a list of source files will
--# be generated. Documented entities will be cross-referenced with these sources.
--# Note: To get rid of all source code in the generated output, make sure also
-+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-+# be generated. Documented entities will be cross-referenced with these sources.
-+# Note: To get rid of all source code in the generated output, make sure also
- # VERBATIM_HEADERS is set to NO.
-
- SOURCE_BROWSER = YES
-
--# Setting the INLINE_SOURCES tag to YES will include the body
-+# Setting the INLINE_SOURCES tag to YES will include the body
- # of functions and classes directly in the documentation.
-
- INLINE_SOURCES = NO
-
--# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
--# doxygen to hide any special comment blocks from generated source code
-+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-+# doxygen to hide any special comment blocks from generated source code
- # fragments. Normal C and C++ comments will always remain visible.
-
- STRIP_CODE_COMMENTS = YES
-
--# If the REFERENCED_BY_RELATION tag is set to YES (the default)
--# then for each documented function all documented
-+# If the REFERENCED_BY_RELATION tag is set to YES
-+# then for each documented function all documented
- # functions referencing it will be listed.
-
- REFERENCED_BY_RELATION = YES
-
--# If the REFERENCES_RELATION tag is set to YES (the default)
--# then for each documented function all documented entities
-+# If the REFERENCES_RELATION tag is set to YES
-+# then for each documented function all documented entities
- # called/used by that function will be listed.
-
- REFERENCES_RELATION = YES
-@@ -587,20 +606,21 @@
- # If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
- # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
- # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
--# link to the source code. Otherwise they will link to the documentation.
-+# link to the source code.
-+# Otherwise they will link to the documentation.
-
- REFERENCES_LINK_SOURCE = YES
-
--# If the USE_HTAGS tag is set to YES then the references to source code
--# will point to the HTML generated by the htags(1) tool instead of doxygen
--# built-in source browser. The htags tool is part of GNU's global source
--# tagging system (see http://www.gnu.org/software/global/global.html). You
-+# If the USE_HTAGS tag is set to YES then the references to source code
-+# will point to the HTML generated by the htags(1) tool instead of doxygen
-+# built-in source browser. The htags tool is part of GNU's global source
-+# tagging system (see http://www.gnu.org/software/global/global.html). You
- # will need version 4.8.6 or higher.
-
- USE_HTAGS = NO
-
--# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
--# will generate a verbatim copy of the header file for each class for
-+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-+# will generate a verbatim copy of the header file for each class for
- # which an include is specified. Set to NO to disable this.
-
- VERBATIM_HEADERS = YES
-@@ -890,33 +910,33 @@
- # configuration options related to the XML output
- #---------------------------------------------------------------------------
-
--# If the GENERATE_XML tag is set to YES Doxygen will
--# generate an XML file that captures the structure of
-+# If the GENERATE_XML tag is set to YES Doxygen will
-+# generate an XML file that captures the structure of
- # the code including all documentation.
-
- GENERATE_XML = NO
-
--# The XML_OUTPUT tag is used to specify where the XML pages will be put.
--# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
- # put in front of it. If left blank `xml' will be used as the default path.
-
- XML_OUTPUT = xml
-
--# The XML_SCHEMA tag can be used to specify an XML schema,
--# which can be used by a validating XML parser to check the
-+# The XML_SCHEMA tag can be used to specify an XML schema,
-+# which can be used by a validating XML parser to check the
- # syntax of the XML files.
-
--XML_SCHEMA =
-+XML_SCHEMA =
-
--# The XML_DTD tag can be used to specify an XML DTD,
--# which can be used by a validating XML parser to check the
-+# The XML_DTD tag can be used to specify an XML DTD,
-+# which can be used by a validating XML parser to check the
- # syntax of the XML files.
-
--XML_DTD =
-+XML_DTD =
-
--# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
--# dump the program listings (including syntax highlighting
--# and cross-referencing information) to the XML output. Note that
-+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-+# dump the program listings (including syntax highlighting
-+# and cross-referencing information) to the XML output. Note that
- # enabling this will significantly increase the size of the XML output.
-
- XML_PROGRAMLISTING = YES
-@@ -925,10 +945,10 @@
- # configuration options for the AutoGen Definitions output
- #---------------------------------------------------------------------------
-
--# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
--# generate an AutoGen Definitions (see autogen.sf.net) file
--# that captures the structure of the code including all
--# documentation. Note that this feature is still experimental
-+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-+# generate an AutoGen Definitions (see autogen.sf.net) file
-+# that captures the structure of the code including all
-+# documentation. Note that this feature is still experimental
- # and incomplete at the moment.
-
- GENERATE_AUTOGEN_DEF = NO
-@@ -937,82 +957,84 @@
- # configuration options related to the Perl module output
- #---------------------------------------------------------------------------
-
--# If the GENERATE_PERLMOD tag is set to YES Doxygen will
--# generate a Perl module file that captures the structure of
--# the code including all documentation. Note that this
--# feature is still experimental and incomplete at the
-+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-+# generate a Perl module file that captures the structure of
-+# the code including all documentation. Note that this
-+# feature is still experimental and incomplete at the
- # moment.
-
- GENERATE_PERLMOD = NO
-
--# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
--# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
- # to generate PDF and DVI output from the Perl module output.
-
- PERLMOD_LATEX = NO
-
--# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
--# nicely formatted so it can be parsed by a human reader. This is useful
--# if you want to understand what is going on. On the other hand, if this
--# tag is set to NO the size of the Perl module output will be much smaller
-+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-+# nicely formatted so it can be parsed by a human reader.
-+# This is useful
-+# if you want to understand what is going on.
-+# On the other hand, if this
-+# tag is set to NO the size of the Perl module output will be much smaller
- # and Perl will parse it just the same.
-
- PERLMOD_PRETTY = YES
-
--# The names of the make variables in the generated doxyrules.make file
--# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
--# This is useful so different doxyrules.make files included by the same
-+# The names of the make variables in the generated doxyrules.make file
-+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-+# This is useful so different doxyrules.make files included by the same
- # Makefile don't overwrite each other's variables.
-
--PERLMOD_MAKEVAR_PREFIX =
-+PERLMOD_MAKEVAR_PREFIX =
-
- #---------------------------------------------------------------------------
--# Configuration options related to the preprocessor
-+# Configuration options related to the preprocessor
- #---------------------------------------------------------------------------
-
--# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
--# evaluate all C-preprocessor directives found in the sources and include
-+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-+# evaluate all C-preprocessor directives found in the sources and include
- # files.
-
- ENABLE_PREPROCESSING = YES
-
--# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
--# names in the source code. If set to NO (the default) only conditional
--# compilation will be performed. Macro expansion can be done in a controlled
-+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-+# names in the source code. If set to NO (the default) only conditional
-+# compilation will be performed. Macro expansion can be done in a controlled
- # way by setting EXPAND_ONLY_PREDEF to YES.
-
- MACRO_EXPANSION = NO
-
--# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
--# then the macro expansion is limited to the macros specified with the
-+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-+# then the macro expansion is limited to the macros specified with the
- # PREDEFINED and EXPAND_AS_DEFINED tags.
-
- EXPAND_ONLY_PREDEF = NO
-
--# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
- # in the INCLUDE_PATH (see below) will be search if a #include is found.
-
- SEARCH_INCLUDES = YES
-
--# The INCLUDE_PATH tag can be used to specify one or more directories that
--# contain include files that are not input files but should be processed by
-+# The INCLUDE_PATH tag can be used to specify one or more directories that
-+# contain include files that are not input files but should be processed by
- # the preprocessor.
-
--INCLUDE_PATH =
-+INCLUDE_PATH =
-
--# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
--# patterns (like *.h and *.hpp) to filter out the header-files in the
--# directories. If left blank, the patterns specified with FILE_PATTERNS will
-+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-+# patterns (like *.h and *.hpp) to filter out the header-files in the
-+# directories. If left blank, the patterns specified with FILE_PATTERNS will
- # be used.
-
--INCLUDE_FILE_PATTERNS =
-+INCLUDE_FILE_PATTERNS =
-
--# The PREDEFINED tag can be used to specify one or more macro names that
--# are defined before the preprocessor is started (similar to the -D option of
--# gcc). The argument of the tag is a list of macros of the form: name
--# or name=definition (no spaces). If the definition and the = are
--# omitted =1 is assumed. To prevent a macro definition from being
--# undefined via #undef or recursively expanded use the := operator
-+# The PREDEFINED tag can be used to specify one or more macro names that
-+# are defined before the preprocessor is started (similar to the -D option of
-+# gcc). The argument of the tag is a list of macros of the form: name
-+# or name=definition (no spaces). If the definition and the = are
-+# omitted =1 is assumed. To prevent a macro definition from being
-+# undefined via #undef or recursively expanded use the := operator
- # instead of the = operator.
-
- PREDEFINED = WITH_OPENSSL \
-@@ -1104,7 +1126,7 @@
- # toolkit from AT&T and Lucent Bell Labs. The other options in this section
+--- dcmtk-3.6.1_20120222.orig/doxygen/htmldocs.cfg 2012-02-22 14:24:51.000000000 +0100
++++ dcmtk-3.6.1_20120222/doxygen/htmldocs.cfg 2012-03-06 18:56:13.000000000 +0100
+@@ -1582,7 +1582,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 = 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
-@@ -1187,7 +1209,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 DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+ # allowed to run in parallel. When set to 0 (the default) doxygen will
More information about the debian-med-commit
mailing list