[med-svn] r4428 - in trunk/packages/dcmtk/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Wed Dec 2 16:58:54 UTC 2009
Author: tille
Date: 2009-12-02 16:58:54 +0000 (Wed, 02 Dec 2009)
New Revision: 4428
Added:
trunk/packages/dcmtk/trunk/debian/apache.conf
trunk/packages/dcmtk/trunk/debian/dcmtk-www.README.Debian
trunk/packages/dcmtk/trunk/debian/dcmtk-www.dirs
trunk/packages/dcmtk/trunk/debian/dcmtk-www.links
trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst
trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm
trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian
trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch
Removed:
trunk/packages/dcmtk/trunk/debian/README.Debian
Modified:
trunk/packages/dcmtk/trunk/debian/changelog
trunk/packages/dcmtk/trunk/debian/dcmtk-www.install
trunk/packages/dcmtk/trunk/debian/rules
Log:
Added missing doxygen config file patch; Solve issue with file in /var/www; other lintian issues; additional doc
Deleted: trunk/packages/dcmtk/trunk/debian/README.Debian
===================================================================
--- trunk/packages/dcmtk/trunk/debian/README.Debian 2009-12-02 12:46:44 UTC (rev 4427)
+++ trunk/packages/dcmtk/trunk/debian/README.Debian 2009-12-02 16:58:54 UTC (rev 4428)
@@ -1,202 +0,0 @@
-DCMTK - The OFFIS DICOM ToolKit for Debian
-==========================================
-
-General notes:
-
-DCMTK is a collection of libraries and applications implementing large
-parts the DICOM standard. It includes software for examining,
-constructing and converting DICOM image files, handling offline media,
-sending and receiving images over a network connection, as well as
-demonstrative image storage and worklist servers. DCMTK is is written
-in a mixture of ANSI C and C++. It comes in complete source code and
-is made available as "open source" software under BSD like license
-terms. For additional information about DCMTK have a look at the
-OFFIS web page:
-
- http://dicom.offis.de/dcmtk.php.en
-
-DCMTK has been used at numerous DICOM demonstrations to provide
-central, vendor-independent image storage and worklist servers (CTNs -
-Central Test Nodes). It is used by hospitals and companies all over
-the world for a wide variety of purposes ranging from being a tool for
-product testing to being a building block for research projects,
-prototypes and commercial products.
-
-DCMTK optionally supports some of the DICOM security extensions and
-relies on the free OpenSSL toolkit for the underlying cryptographic
-routines and the TLS protocol implementation. The Debian DCMTK package
-has been built with OpenSSL support enabled.
-
-More information about using the DCMTK network applications for secure
-DICOM communication can be found in
-
- /usr/share/docs/dcmtk/ciphers.txt
- /usr/share/docs/dcmtk/randseed.txt
-
-DCMTK optionally supports Wietse Venema's TCP wrappers library
-(libwrap) which is freely available for most Unix platforms and part
-of the default installation of most recent Linux distributions. This
-library allows to enforce host-based access control via the
-"/etc/hosts_deny" and "/etc/hosts_allow" configuration files. The
-Debian DCMTK package has been compiled with TCP wrapper support
-enabled. See hosts_access(5) man page for details.
-
-You can use the dcmnet applications for testing DICOM connectivity. A
-brief description can be found in
-
- /usr/share/docs/dcmtk/testing.txt
-
-
-The DCMTK dcmqrscp application implements a DICOM image
-storage/query/retrieve SCP which has been designed primarily as an
-independent framework for cooperative tests and demonstrations of
-DICOM connectivity by medical imaging vendors. If you want to set up
-dcmqrdb as a DICOM image storage server please read both the dcmqrscp
-manual pages and the supplemental documentation in
-
- /usr/share/doc/dcmtk/dcmqrcnf.txt
- /usr/share/doc/dcmtk/dcmqrset.txt
-
-The dcmqrscp application can be invoked as a daemon process at boot
-time by setting DCMQRSCP_ENABLE=Yes in /etc/defaults/dcmqrscp. You will
-have to adjust the system wide configuration file
-/etc/dcmtk/dcmqrscp.cfg to suit your needs. This configuration file
-provides optional UserName/GroupName keywords in the "Global
-Parameter" section (see note in dcmqrcnf.txt). Running dcmqrscp with
-root privileges is strongly discouraged. A dedicated system
-user/group dcmtk/dcmtk is automatically added during the installation
-of the Debian DCMTK package. It is important to note that dcmqrscp is
-primarily intended to be used as a demonstration server rather than a
-real "PACS replacement". Scalability is quite limited, both in terms
-of number of images/studies and in number of parallel clients. If you
-want to set up a real large database, you might be better off in using
-an SQL based archive (such as the Mallinckrodt CTN).
-
-
-DCMTK supports the Modality Worklist Management SOP Class as a SCP, which
-allows modalities to query and retrieve worklist information from hospital
-information systems. An example worklist database along with a set of
-example queries can be found in
-
- /usr/share/doc/dcmtk/examples/wlistdb
-
-and
-
- /usr/share/doc/dcmtk/examples/wlistqry.
-
-Here is a brief instruction about how to make this work (based on a post
-of Thomas Wilkens in comp.protocols.dicom):
-
-1. Use dump2dcm to convert all "*.dump" files in examples/wlistdb/OFFIS
-to "*.wl" files (DICOM format):
-
- $ for f in *.dump; do dump2dcm "$f" "${f%.dump}".wl; done
-
-Note that these files have to have the extension "*.wl", otherwise wlmscpfs
-will not find these files. These files represent your worklist database.
-2. Use dump2dcm to convert all "*.dump" files in examples/wlistqry to
-"*.dcm" files (DICOM format):
-
- $ for f in *.dump; do dump2dcm "$f" "${f%.dump}".dcm; done
-
-These files represent possible queries that can be used to query the worklist
-database.
-3. In one shell run the following command to start the worklist management SCP:
-
- $ wlmscpfs -v -dfp examples/wlistdb 1234
-
-4. In another shell run the following command to send a certain query to the
-WLM SCP:
-
- $ findscu -v --call OFFIS localhost 1234 examples/wlistqry/wlistqry0.dcm
-
-Step 3 will start the worklist management SCP which will listen on port 1234
-for incoming C-FIND RQ messages. The "-dfp examples/wlistdb" option
-specifies that the worklist database can be found in folder "examples/wlistdb".
-Note that the worklist database can be organized in different storage areas.
-Subfolder "OFFIS" below "examples/wlistdb" is one (the only one in this case)
-storage area. In an incoming C-FIND RQ, an SCU has to tell wlmscpfs which
-storage area shall be queried; this is done by sending a certain "called AE title"
-to wlmscpfs.
-
-Step 4 will send the query in file "examples/wlistqry/wlistqry0.dcm"
-using a C-FIND-RQ message to the wlmscpfs application (which is running on
-"localhost" and listening on port "1234"). Option "--call OFFIS" specifies
-that the called AE title is "OFFIS" which in turn tells the wlmscpfs
-application to query the storage area "OFFIS" in its worklist database.
-
-The two programs should then dump information that shows their internal
-processings (C-FIND RQ - C-FIND RSP). You can also use a different query
-file in folder "examples/wlistqry" for querying the worklist database.
-
-As the wlmscpfs is not a hospital information system, worklist entries
-must be created, updated and deleted manually. The Debian dcmtk-www
-package contains a cgi-based WWW server application which provides an easy
-to use web interface for managing worklist entries from any workstation
-in the network. More information about the DCMTK worklist web interface can
-be found in
-
- /usr/share/doc/dcmtk-www/wwwapp.txt
-
-
-For more information please visit the DCMTK homepage and the user forum at
-
- http://dicom.offis.de/dcmtk.php.en
-
-and
-
- http://forum.dcmtk.org/
-
-
-Debian specific notes:
-
-The upstream sources are not packaging friendly in terms of the Unix Filesystem
-Hierarchy Standard (see e.g. http://www.pathname.com/fhs/). There is currently no
-straightforward way to install DCMTK in compliance with the FHS without kludging
-the build scripts in some way.
-
-Thus, the Debian DCMTK source package includes a number of patches to change the
-semantics of the --libdir and --datadir configure options in order to
-separate read-only architecture-independent data (e.g. the dicom.dic DICOM
-dictionary) from architecture-dependent object libraries.
-For backward compatibility, the original (i.e. violating FSH) behavior is
-preserved in case ./configure is invoked without --prefix option.
-
-The Debian packages have been configured with the following options:
-
-./configure --prefix=/usr \
- --exec-prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --includedir=/usr/include/dcmtk \
- --libdir=/usr/lib \
- --datadir=/usr/share \
- --sysconfdir=/etc/dcmtk \
- --with-private-tags \
- --with-libtiff \
- --with-zlib \
- --with-libpng \
- --with-libxml \
- --with-libwrap \
- --with-openssl
-
-
-There is currently no official support for shared libraries in DCMTK.
-We had to perfom some magic to have the DCMTK end user utilies
-linked dynamically against shared DCMTK library versions without
-forcing the utilities themselves to be compiled with -fPIC (which
-would impose some performance penalty upon them).
-In a first step we adjust config/Makefile.def to build the shared
-libraries with -fPIC. In a second step we build the shared libs
-only (i.e. without utilities). In a third step we restore the
-original state of config/Makefile.def. In a forth step we run
-`make clean' on the source tree. (This leaves the *.so libs
-untouched but forces recompilation in the next step.)
-In the last step we run `make all'. This will build both the
-utilities and the static libraries without -fPIC but links the
-utilities dynamically against the shared library versions.
-
-
- -- Juergen Salk <juergen.salk at gmx.de> Thu, 22 Dec 2005 22:58:03 +0100
-
-
Added: trunk/packages/dcmtk/trunk/debian/apache.conf
===================================================================
--- trunk/packages/dcmtk/trunk/debian/apache.conf (rev 0)
+++ trunk/packages/dcmtk/trunk/debian/apache.conf 2009-12-02 16:58:54 UTC (rev 4428)
@@ -0,0 +1,9 @@
+# dcmtk default Apache configuration
+
+Alias /dcmtk_wlm /usr/share/dcmtk/www/
+ScriptAlias /dcmtk /usr/lib/dcmtk/cgi-bin/
+
+<Directory "/usr/lib/dcmtk/cgi-bin">
+ AllowOverride None
+ Options +ExecCGI
+</Directory>
Modified: trunk/packages/dcmtk/trunk/debian/changelog
===================================================================
--- trunk/packages/dcmtk/trunk/debian/changelog 2009-12-02 12:46:44 UTC (rev 4427)
+++ trunk/packages/dcmtk/trunk/debian/changelog 2009-12-02 16:58:54 UTC (rev 4428)
@@ -30,6 +30,10 @@
one library in this package so the warning is void
* debian/rules: Try to make backups of original files in config
but failed for two remaining files (no idea why)
+ * Move all files of dcmtk-www to /usr/lib/dcmtk/cgi-bin and
+ provide apache configuration which enable easy access via
+ http://localhost/dcmtk_wlm/
+ Closes: #553495
[Mathieu Malaterre]
* debian/rules would not honor DEB_BUILD_OPTIONS=nostrip, since
Added: trunk/packages/dcmtk/trunk/debian/dcmtk-www.README.Debian
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk-www.README.Debian (rev 0)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.README.Debian 2009-12-02 16:58:54 UTC (rev 4428)
@@ -0,0 +1,13 @@
+Web interface for the OFFIS DICOM ToolKit in Debian
+===================================================
+
+Please make sure you read the file wwwapp.txt in this directory.
+
+Hint: Apache is configured in this way that you can either
+ point your browser to
+
+ http://localhost/cgi-bin/dcmtk_wlm/main.pl
+
+ or
+
+ http://localhost/dcmtk_wlm/main.pl
Added: trunk/packages/dcmtk/trunk/debian/dcmtk-www.dirs
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk-www.dirs (rev 0)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.dirs 2009-12-02 16:58:54 UTC (rev 4428)
@@ -0,0 +1 @@
+/etc/apache2/conf.d
Modified: trunk/packages/dcmtk/trunk/debian/dcmtk-www.install
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk-www.install 2009-12-02 12:46:44 UTC (rev 4427)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.install 2009-12-02 16:58:54 UTC (rev 4428)
@@ -1,6 +1,7 @@
-dcmwlm/wwwapps/preplock usr/lib/cgi-bin/dcmtk_wlm
-dcmwlm/wwwapps/readoviw usr/lib/cgi-bin/dcmtk_wlm
-dcmwlm/wwwapps/readwlst usr/lib/cgi-bin/dcmtk_wlm
-dcmwlm/wwwapps/writwlst usr/lib/cgi-bin/dcmtk_wlm
-dcmwlm/perl/* usr/lib/cgi-bin/dcmtk_wlm
-dcmwlm/images/* var/www/dcmtk_wlm
+dcmwlm/wwwapps/preplock usr/lib/dcmtk/cgi-bin
+dcmwlm/wwwapps/readoviw usr/lib/dcmtk/cgi-bin
+dcmwlm/wwwapps/readwlst usr/lib/dcmtk/cgi-bin
+dcmwlm/wwwapps/writwlst usr/lib/dcmtk/cgi-bin
+dcmwlm/perl/* usr/lib/dcmtk/cgi-bin
+dcmwlm/images/* usr/share/dcmtk/www
+debian/apache.conf etc/dcmtk
Added: trunk/packages/dcmtk/trunk/debian/dcmtk-www.links
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk-www.links (rev 0)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.links 2009-12-02 16:58:54 UTC (rev 4428)
@@ -0,0 +1 @@
+usr/lib/dcmtk/cgi-bin usr/lib/cgi-bin/dcmtk_wlm
Added: trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst (rev 0)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst 2009-12-02 16:58:54 UTC (rev 4428)
@@ -0,0 +1,40 @@
+#!/bin/sh -e
+# postinst script for dcmtk-www
+
+pkg=dcmtk
+
+apache_install() {
+ webserver=apache2
+ if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/${pkg} ]; then
+ ln -s ../../${pkg}/apache.conf /etc/$webserver/conf.d/${pkg}
+ # Restart webserver to register configuration for dcmtk if config is considered to be OK
+ if ${webserver}ctl configtest 2>/dev/null; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d $webserver reload 3>/dev/null || true
+ else
+ /etc/init.d/$webserver reload 3>/dev/null || true
+ fi
+ else
+ echo "Your $webserver configuration is broken, so we're not restarting it for you."
+ fi
+
+ fi
+}
+
+case "$1" in
+ configure)
+ apache_install
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm (rev 0)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm 2009-12-02 16:58:54 UTC (rev 4428)
@@ -0,0 +1,31 @@
+#!/bin/sh
+# postrm script for dcmtk-www
+
+set -e
+
+case "$1" in
+ purge|remove|upgrade)
+ # Restart Apache to register configuration for dcmtk
+ if apache2ctl configtest 2>/dev/null; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d apache2 reload 3>/dev/null || true
+ else
+ /etc/init.d/apache2 reload 3>/dev/null || true
+ fi
+ else
+ echo "Your apache2 configuration is broken, so we're not restarting it for you."
+ fi
+ ;;
+
+ failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian (rev 0)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian 2009-12-02 16:58:54 UTC (rev 4428)
@@ -0,0 +1,202 @@
+DCMTK - The OFFIS DICOM ToolKit for Debian
+==========================================
+
+General notes:
+
+DCMTK is a collection of libraries and applications implementing large
+parts the DICOM standard. It includes software for examining,
+constructing and converting DICOM image files, handling offline media,
+sending and receiving images over a network connection, as well as
+demonstrative image storage and worklist servers. DCMTK is is written
+in a mixture of ANSI C and C++. It comes in complete source code and
+is made available as "open source" software under BSD like license
+terms. For additional information about DCMTK have a look at the
+OFFIS web page:
+
+ http://dicom.offis.de/dcmtk.php.en
+
+DCMTK has been used at numerous DICOM demonstrations to provide
+central, vendor-independent image storage and worklist servers (CTNs -
+Central Test Nodes). It is used by hospitals and companies all over
+the world for a wide variety of purposes ranging from being a tool for
+product testing to being a building block for research projects,
+prototypes and commercial products.
+
+DCMTK optionally supports some of the DICOM security extensions and
+relies on the free OpenSSL toolkit for the underlying cryptographic
+routines and the TLS protocol implementation. The Debian DCMTK package
+has been built with OpenSSL support enabled.
+
+More information about using the DCMTK network applications for secure
+DICOM communication can be found in
+
+ /usr/share/docs/dcmtk/ciphers.txt
+ /usr/share/docs/dcmtk/randseed.txt
+
+DCMTK optionally supports Wietse Venema's TCP wrappers library
+(libwrap) which is freely available for most Unix platforms and part
+of the default installation of most recent Linux distributions. This
+library allows to enforce host-based access control via the
+"/etc/hosts_deny" and "/etc/hosts_allow" configuration files. The
+Debian DCMTK package has been compiled with TCP wrapper support
+enabled. See hosts_access(5) man page for details.
+
+You can use the dcmnet applications for testing DICOM connectivity. A
+brief description can be found in
+
+ /usr/share/docs/dcmtk/testing.txt
+
+
+The DCMTK dcmqrscp application implements a DICOM image
+storage/query/retrieve SCP which has been designed primarily as an
+independent framework for cooperative tests and demonstrations of
+DICOM connectivity by medical imaging vendors. If you want to set up
+dcmqrdb as a DICOM image storage server please read both the dcmqrscp
+manual pages and the supplemental documentation in
+
+ /usr/share/doc/dcmtk/dcmqrcnf.txt
+ /usr/share/doc/dcmtk/dcmqrset.txt
+
+The dcmqrscp application can be invoked as a daemon process at boot
+time by setting DCMQRSCP_ENABLE=Yes in /etc/defaults/dcmqrscp. You will
+have to adjust the system wide configuration file
+/etc/dcmtk/dcmqrscp.cfg to suit your needs. This configuration file
+provides optional UserName/GroupName keywords in the "Global
+Parameter" section (see note in dcmqrcnf.txt). Running dcmqrscp with
+root privileges is strongly discouraged. A dedicated system
+user/group dcmtk/dcmtk is automatically added during the installation
+of the Debian DCMTK package. It is important to note that dcmqrscp is
+primarily intended to be used as a demonstration server rather than a
+real "PACS replacement". Scalability is quite limited, both in terms
+of number of images/studies and in number of parallel clients. If you
+want to set up a real large database, you might be better off in using
+an SQL based archive (such as the Mallinckrodt CTN).
+
+
+DCMTK supports the Modality Worklist Management SOP Class as a SCP, which
+allows modalities to query and retrieve worklist information from hospital
+information systems. An example worklist database along with a set of
+example queries can be found in
+
+ /usr/share/doc/dcmtk/examples/wlistdb
+
+and
+
+ /usr/share/doc/dcmtk/examples/wlistqry.
+
+Here is a brief instruction about how to make this work (based on a post
+of Thomas Wilkens in comp.protocols.dicom):
+
+1. Use dump2dcm to convert all "*.dump" files in examples/wlistdb/OFFIS
+to "*.wl" files (DICOM format):
+
+ $ for f in *.dump; do dump2dcm "$f" "${f%.dump}".wl; done
+
+Note that these files have to have the extension "*.wl", otherwise wlmscpfs
+will not find these files. These files represent your worklist database.
+2. Use dump2dcm to convert all "*.dump" files in examples/wlistqry to
+"*.dcm" files (DICOM format):
+
+ $ for f in *.dump; do dump2dcm "$f" "${f%.dump}".dcm; done
+
+These files represent possible queries that can be used to query the worklist
+database.
+3. In one shell run the following command to start the worklist management SCP:
+
+ $ wlmscpfs -v -dfp examples/wlistdb 1234
+
+4. In another shell run the following command to send a certain query to the
+WLM SCP:
+
+ $ findscu -v --call OFFIS localhost 1234 examples/wlistqry/wlistqry0.dcm
+
+Step 3 will start the worklist management SCP which will listen on port 1234
+for incoming C-FIND RQ messages. The "-dfp examples/wlistdb" option
+specifies that the worklist database can be found in folder "examples/wlistdb".
+Note that the worklist database can be organized in different storage areas.
+Subfolder "OFFIS" below "examples/wlistdb" is one (the only one in this case)
+storage area. In an incoming C-FIND RQ, an SCU has to tell wlmscpfs which
+storage area shall be queried; this is done by sending a certain "called AE title"
+to wlmscpfs.
+
+Step 4 will send the query in file "examples/wlistqry/wlistqry0.dcm"
+using a C-FIND-RQ message to the wlmscpfs application (which is running on
+"localhost" and listening on port "1234"). Option "--call OFFIS" specifies
+that the called AE title is "OFFIS" which in turn tells the wlmscpfs
+application to query the storage area "OFFIS" in its worklist database.
+
+The two programs should then dump information that shows their internal
+processings (C-FIND RQ - C-FIND RSP). You can also use a different query
+file in folder "examples/wlistqry" for querying the worklist database.
+
+As the wlmscpfs is not a hospital information system, worklist entries
+must be created, updated and deleted manually. The Debian dcmtk-www
+package contains a cgi-based WWW server application which provides an easy
+to use web interface for managing worklist entries from any workstation
+in the network. More information about the DCMTK worklist web interface can
+be found in
+
+ /usr/share/doc/dcmtk-www/wwwapp.txt
+
+
+For more information please visit the DCMTK homepage and the user forum at
+
+ http://dicom.offis.de/dcmtk.php.en
+
+and
+
+ http://forum.dcmtk.org/
+
+
+Debian specific notes:
+
+The upstream sources are not packaging friendly in terms of the Unix Filesystem
+Hierarchy Standard (see e.g. http://www.pathname.com/fhs/). There is currently no
+straightforward way to install DCMTK in compliance with the FHS without kludging
+the build scripts in some way.
+
+Thus, the Debian DCMTK source package includes a number of patches to change the
+semantics of the --libdir and --datadir configure options in order to
+separate read-only architecture-independent data (e.g. the dicom.dic DICOM
+dictionary) from architecture-dependent object libraries.
+For backward compatibility, the original (i.e. violating FSH) behavior is
+preserved in case ./configure is invoked without --prefix option.
+
+The Debian packages have been configured with the following options:
+
+./configure --prefix=/usr \
+ --exec-prefix=/usr \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --includedir=/usr/include/dcmtk \
+ --libdir=/usr/lib \
+ --datadir=/usr/share \
+ --sysconfdir=/etc/dcmtk \
+ --with-private-tags \
+ --with-libtiff \
+ --with-zlib \
+ --with-libpng \
+ --with-libxml \
+ --with-libwrap \
+ --with-openssl
+
+
+There is currently no official support for shared libraries in DCMTK.
+We had to perfom some magic to have the DCMTK end user utilies
+linked dynamically against shared DCMTK library versions without
+forcing the utilities themselves to be compiled with -fPIC (which
+would impose some performance penalty upon them).
+In a first step we adjust config/Makefile.def to build the shared
+libraries with -fPIC. In a second step we build the shared libs
+only (i.e. without utilities). In a third step we restore the
+original state of config/Makefile.def. In a forth step we run
+`make clean' on the source tree. (This leaves the *.so libs
+untouched but forces recompilation in the next step.)
+In the last step we run `make all'. This will build both the
+utilities and the static libraries without -fPIC but links the
+utilities dynamically against the shared library versions.
+
+
+ -- Juergen Salk <juergen.salk at gmx.de> Thu, 22 Dec 2005 22:58:03 +0100
+
+
Added: trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch (rev 0)
+++ trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch 2009-12-02 16:58:54 UTC (rev 4428)
@@ -0,0 +1,913 @@
+--- dcmtk-3.5.4.orig/doxygen/htmldocs.cfg
++++ dcmtk-3.5.4/doxygen/htmldocs.cfg
+@@ -1,4 +1,4 @@
+-# Doxyfile 1.3.8
++# Doxyfile 1.6.1
+
+ # This file describes the settings to be used by the documentation system
+ # doxygen (www.doxygen.org) for a project
+@@ -14,6 +14,14 @@
+ # Project related configuration options
+ #---------------------------------------------------------------------------
+
++# This tag specifies the encoding used for all characters in the config file
++# that follow. The default is UTF-8 which is also the encoding used for all
++# text before the first occurrence of this tag. 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.
++
++DOXYFILE_ENCODING = UTF-8
++
+ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+ # by quotes) that should identify the project.
+
+@@ -35,9 +43,9 @@
+ # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+ # 4096 sub-directories (in 2 levels) under the output directory of each output
+ # format and will distribute the generated files over these directories.
+-# Enabling this option can be useful when feeding doxygen a huge amount of source
+-# files, where putting all generated files in the same directory would otherwise
+-# cause performance problems for the file system.
++# Enabling this option can be useful when feeding doxygen a huge amount of
++# source files, where putting all generated files in the same directory would
++# otherwise cause performance problems for the file system.
+
+ CREATE_SUBDIRS = NO
+
+@@ -45,24 +53,15 @@
+ # documentation generated by doxygen is written. Doxygen will use this
+ # information to generate all constant output in the proper language.
+ # The default language is English, other supported languages are:
+-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
+-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
+-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
+-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
+-# Swedish, and Ukrainian.
++# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
++# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
++# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
++# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
++# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
++# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+ OUTPUT_LANGUAGE = English
+
+-# This tag can be used to specify the encoding used in the generated output.
+-# The encoding is not always determined by the language that is chosen,
+-# but also whether or not the output is meant for Windows or non-Windows users.
+-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
+-# forces the Windows encoding (this is the default for the Windows binary),
+-# whereas setting the tag to NO uses a Unix-style encoding (the default for
+-# all platforms other than Windows).
+-
+-USE_WINDOWS_ENCODING = NO
+-
+ # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+ # include brief member descriptions after the members that are listed in
+ # the file and class documentation (similar to JavaDoc).
+@@ -80,11 +79,12 @@
+ # This tag implements a quasi-intelligent brief description abbreviator
+ # that is used to form the text in various listings. Each string
+ # in this list, if found as the leading text of the brief description, will be
+-# stripped from the text and the result after processing the whole list, is used
+-# as the annotated text. Otherwise, the brief description is used as-is. If left
+-# blank, the following values are used ("$name" is automatically replaced with the
+-# name of the entity): "The $name class" "The $name widget" "The $name file"
+-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
++# stripped from the text and the result after processing the whole list, is
++# used as the annotated text. Otherwise, the brief description is used as-is.
++# If left blank, the following values are used ("$name" is automatically
++# replaced with the name of the entity): "The $name class" "The $name widget"
++# "The $name file" "is" "provides" "specifies" "contains"
++# "represents" "a" "an" "the"
+
+ ABBREVIATE_BRIEF =
+
+@@ -94,10 +94,10 @@
+
+ ALWAYS_DETAILED_SEC = NO
+
+-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
+-# members of a class in the documentation of that class as if those members were
+-# ordinary class members. Constructors, destructors and assignment operators of
+-# the base classes will not be shown.
++# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
++# inherited members of a class in the documentation of that class as if those
++# members were ordinary class members. Constructors, destructors and assignment
++# operators of the base classes will not be shown.
+
+ INLINE_INHERITED_MEMB = NO
+
+@@ -134,11 +134,19 @@
+ # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+ # will interpret the first line (until the first dot) of a JavaDoc-style
+ # comment as the brief description. If set to NO, the JavaDoc
+-# comments will behave just like the Qt-style comments (thus requiring an
+-# explicit @brief command for a brief description.
++# comments will behave just like regular Qt-style comments
++# (thus requiring an explicit @brief command for a brief description.)
+
+ JAVADOC_AUTOBRIEF = YES
+
++# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
++# interpret the first line (until the first dot) of a Qt-style
++# comment as the brief description. If set to NO, the comments
++# will behave just like regular Qt-style comments (thus requiring
++# an explicit \brief command for a brief description.)
++
++QT_AUTOBRIEF = NO
++
+ # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+ # treat a multi-line C++ special comment block (i.e. a block of //! or ///
+ # comments) as a brief description. This used to be the default behaviour.
+@@ -147,25 +155,17 @@
+
+ MULTILINE_CPP_IS_BRIEF = NO
+
+-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+-# will output the detailed description near the top, like JavaDoc.
+-# If set to NO, the detailed description appears after the member
+-# documentation.
+-
+-DETAILS_AT_TOP = NO
+-
+ # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+ # member inherits the documentation from any documented member that it
+ # re-implements.
+
+ INHERIT_DOCS = NO
+
+-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+-# tag is set to YES, then doxygen will reuse the documentation of the first
+-# member in the group (if any) for the other members of the group. By default
+-# all members of a group must be documented explicitly.
++# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
++# a new page for each member. If set to NO, the documentation of a member will
++# be part of the file/class/namespace that contains it.
+
+-DISTRIBUTE_GROUP_DOC = NO
++SEPARATE_MEMBER_PAGES = NO
+
+ # The TAB_SIZE tag can be used to set the number of spaces in a tab.
+ # Doxygen uses this value to replace tabs by spaces in code fragments.
+@@ -181,20 +181,79 @@
+
+ ALIASES =
+
+-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+-# only. Doxygen will then generate output that is more tailored for C.
++# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
++# sources only. Doxygen will then generate output that is more tailored for C.
+ # For instance, some of the names that are used will be different. The list
+ # of all members will be omitted, etc.
+
+ OPTIMIZE_OUTPUT_FOR_C = NO
+
+-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
+-# only. Doxygen will then generate output that is more tailored for Java.
+-# For instance, namespaces will be presented as packages, qualified scopes
+-# will look different, etc.
++# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
++# sources only. Doxygen will then generate output that is more tailored for
++# Java. For instance, namespaces will be presented as packages, qualified
++# scopes will look different, etc.
+
+ OPTIMIZE_OUTPUT_JAVA = NO
+
++# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
++# sources only. Doxygen will then generate output that is more tailored for
++# Fortran.
++
++OPTIMIZE_FOR_FORTRAN = NO
++
++# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
++# sources. Doxygen will then generate output that is tailored for
++# VHDL.
++
++OPTIMIZE_OUTPUT_VHDL = NO
++
++# Doxygen selects the parser to use depending on the extension of the files it parses.
++# With this tag you can assign which parser to use for a given extension.
++# Doxygen has a built-in mapping, but you can override or extend it using this tag.
++# The format is ext=language, where ext is a file extension, and language is one of
++# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
++# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
++# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
++# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
++
++EXTENSION_MAPPING =
++
++# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
++# to include (a tag file for) the STL sources as input, then you should
++# set this tag to YES in order to let doxygen match functions declarations and
++# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
++# func(std::string) {}). This also make the inheritance and collaboration
++# diagrams that involve STL classes more complete and accurate.
++
++BUILTIN_STL_SUPPORT = NO
++
++# If you use Microsoft's C++/CLI language, you should set this option to YES to
++# enable parsing support.
++
++CPP_CLI_SUPPORT = NO
++
++# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
++# Doxygen will parse them like normal C++ but will assume all classes use public
++# instead of private inheritance when no explicit protection keyword is present.
++
++SIP_SUPPORT = NO
++
++# For Microsoft's IDL there are propget and propput attributes to indicate getter
++# and setter methods for a property. Setting this option to YES (the default)
++# will make doxygen to replace the get and set methods by a property in the
++# documentation. This will only work if the methods are indeed getting or
++# setting a simple type. If this is not the case, or you want to show the
++# methods anyway, you should set this option to NO.
++
++IDL_PROPERTY_SUPPORT = YES
++
++# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
++# tag is set to YES, then doxygen will reuse the documentation of the first
++# member in the group (if any) for the other members of the group. By default
++# all members of a group must be documented explicitly.
++
++DISTRIBUTE_GROUP_DOC = NO
++
+ # Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+ # the same type (for instance a group of public functions) to be put as a
+ # subgroup of that type (e.g. under the Public Functions section). Set it to
+@@ -203,6 +262,32 @@
+
+ SUBGROUPING = YES
+
++# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
++# is documented as struct, union, or enum with the name of the typedef. So
++# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
++# with name TypeT. When disabled the typedef will appear as a member of a file,
++# namespace, or class. And the struct will be named TypeS. This can typically
++# be useful for C code in case the coding convention dictates that all compound
++# types are typedef'ed and only the typedef is referenced, never the tag name.
++
++TYPEDEF_HIDES_STRUCT = NO
++
++# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
++# determine which symbols to keep in memory and which to flush to disk.
++# When the cache is full, less often used symbols will be written to disk.
++# For small to medium size projects (<1000 input files) the default value is
++# probably good enough. For larger projects a too small cache size can cause
++# doxygen to be busy swapping symbols to and from disk most of the time
++# causing a significant performance penality.
++# If the system has enough physical memory increasing the cache will improve the
++# performance by keeping more symbols in memory. Note that the value works on
++# a logarithmic scale so increasing the size by one will rougly double the
++# memory usage. The cache size is given by this formula:
++# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
++# corresponding to a cache size of 2^16 = 65536 symbols
++
++SYMBOL_CACHE_SIZE = 0
++
+ #---------------------------------------------------------------------------
+ # Build related configuration options
+ #---------------------------------------------------------------------------
+@@ -237,6 +322,14 @@
+
+ EXTRACT_LOCAL_METHODS = NO
+
++# If this flag is set to YES, the members of anonymous namespaces will be
++# extracted and appear in the documentation as a namespace called
++# 'anonymous_namespace{file}', where file will be replaced with the base
++# name of the file that contains the anonymous namespace. By default
++# anonymous namespace are hidden.
++
++EXTRACT_ANON_NSPACES = NO
++
+ # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+ # undocumented members of documented classes, files or namespaces.
+ # If set to NO (the default) these members will be included in the
+@@ -312,6 +405,16 @@
+
+ SORT_BRIEF_DOCS = NO
+
++# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
++
++SORT_MEMBERS_CTORS_1ST = NO
++
++# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
++# hierarchy of group names into alphabetical order. If set to NO (the default)
++# the group names will appear in their defined order.
++
++SORT_GROUP_NAMES = NO
++
+ # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+ # sorted by fully-qualified names, including namespaces. If set to
+ # NO (the default), the class list will be sorted only by class name,
+@@ -367,6 +470,44 @@
+
+ SHOW_USED_FILES = YES
+
++# If the sources in your project are distributed over multiple directories
++# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
++# in the documentation. The default is NO.
++
++SHOW_DIRECTORIES = NO
++
++# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
++# This will remove the Files entry from the Quick Index and from the
++# Folder Tree View (if specified). The default is YES.
++
++SHOW_FILES = YES
++
++# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
++# Namespaces page.
++# This will remove the Namespaces entry from the Quick Index
++# and from the Folder Tree View (if specified). The default is YES.
++
++SHOW_NAMESPACES = YES
++
++# The FILE_VERSION_FILTER tag can be used to specify a program or script that
++# doxygen should invoke to get the current version for each file (typically from
++# the version control system). Doxygen will invoke the program by executing (via
++# popen()) the command <command> <input-file>, where <command> is the value of
++# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
++# provided by doxygen. Whatever the program writes to standard output
++# is used as the file version. See the manual for examples.
++
++FILE_VERSION_FILTER =
++
++# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
++# doxygen. The layout file controls the global structure of the generated output files
++# in an output format independent way. The create the layout file that represents
++# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
++# file name after the option, if omitted DoxygenLayout.xml will be used as the name
++# of the layout file.
++
++LAYOUT_FILE =
++
+ #---------------------------------------------------------------------------
+ # configuration options related to warning and progress messages
+ #---------------------------------------------------------------------------
+@@ -395,10 +536,20 @@
+
+ WARN_IF_DOC_ERROR = YES
+
++# This WARN_NO_PARAMDOC option can be abled to get warnings for
++# functions that are documented, but have no documentation for their parameters
++# or return value. If set to NO (the default) doxygen will only warn about
++# wrong or incomplete parameter documentation, but not about the absence of
++# documentation.
++
++WARN_NO_PARAMDOC = NO
++
+ # The WARN_FORMAT tag determines the format of the warning messages that
+ # doxygen can produce. The string should contain the $file, $line, and $text
+ # tags, which will be replaced by the file and line number from which the
+-# warning originated and the warning text.
++# warning originated and the warning text. Optionally the format may contain
++# $version, which will be replaced by the version of the file (if it could
++# be obtained via FILE_VERSION_FILTER)
+
+ WARN_FORMAT = "$file:$line: $text"
+
+@@ -419,12 +570,20 @@
+
+ INPUT = ..
+
++# 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
++# *.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 \
+@@ -443,17 +602,28 @@
+ EXCLUDE = ../config/include \
+ ../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 from the input.
++# 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.
++# 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 =
+
++# 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).
+@@ -485,14 +655,17 @@
+ # 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
++# to standard output.
++# If FILTER_PATTERNS is specified, this tag will be
+ # ignored.
+
+ 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:
++# 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.
+@@ -527,18 +700,34 @@
+
+ STRIP_CODE_COMMENTS = YES
+
+-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
++# 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)
++# 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
+
++# 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.
++
++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
++# 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
+ # which an include is specified. Set to NO to disable this.
+@@ -616,9 +805,43 @@
+
+ HTML_ALIGN_MEMBERS = YES
+
++# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
++# documentation will contain sections that can be hidden and shown after the
++# page has loaded. For this to work a browser that supports
++# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
++# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
++
++HTML_DYNAMIC_SECTIONS = NO
++
++# If the GENERATE_DOCSET tag is set to YES, additional index files
++# will be generated that can be used as input for Apple's Xcode 3
++# integrated development environment, introduced with OSX 10.5 (Leopard).
++# To create a documentation set, doxygen will generate a Makefile in the
++# HTML output directory. Running make will produce the docset in that
++# directory and running "make install" will install the docset in
++# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
++# it at startup.
++# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
++
++GENERATE_DOCSET = NO
++
++# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
++# feed. A documentation feed provides an umbrella under which multiple
++# documentation sets from a single provider (such as a company or product suite)
++# can be grouped.
++
++DOCSET_FEEDNAME = "Doxygen generated docs"
++
++# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
++# should uniquely identify the documentation set bundle. This should be a
++# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
++# will append .docset to the name.
++
++DOCSET_BUNDLE_ID = org.doxygen.Project
++
+ # If the GENERATE_HTMLHELP tag is set to YES, additional index files
+ # will be generated that can be used as input for tools like the
+-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
++# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+ # of the generated HTML documentation.
+
+ GENERATE_HTMLHELP = NO
+@@ -643,6 +866,12 @@
+
+ GENERATE_CHI = NO
+
++# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
++# is used to encode HtmlHelp index (hhk), content (hhc) and project file
++# content.
++
++CHM_INDEX_ENCODING =
++
+ # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+ # controls whether a binary table of contents is generated (YES) or a
+ # normal table of contents (NO) in the .chm file.
+@@ -654,6 +883,55 @@
+
+ TOC_EXPAND = YES
+
++# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
++# are set, an additional index file will be generated that can be used as input for
++# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
++# HTML documentation.
++
++GENERATE_QHP = NO
++
++# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
++# be used to specify the file name of the resulting .qch file.
++# The path specified is relative to the HTML output folder.
++
++QCH_FILE =
++
++# The QHP_NAMESPACE tag specifies the namespace to use when generating
++# Qt Help Project output. For more information please see
++# http://doc.trolltech.com/qthelpproject.html#namespace
++
++QHP_NAMESPACE =
++
++# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
++# Qt Help Project output. For more information please see
++# http://doc.trolltech.com/qthelpproject.html#virtual-folders
++
++QHP_VIRTUAL_FOLDER = doc
++
++# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
++# For more information please see
++# http://doc.trolltech.com/qthelpproject.html#custom-filters
++
++QHP_CUST_FILTER_NAME =
++
++# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
++# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
++
++QHP_CUST_FILTER_ATTRS =
++
++# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
++# filter section matches.
++# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
++
++QHP_SECT_FILTER_ATTRS =
++
++# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
++# be used to specify the location of Qt's qhelpgenerator.
++# If non-empty doxygen will try to run qhelpgenerator on the generated
++# .qhp file.
++
++QHG_LOCATION =
++
+ # The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+ # top of each HTML page. The value NO (the default) enables the index and
+ # the value YES disables it.
+@@ -665,21 +943,42 @@
+
+ ENUM_VALUES_PER_LINE = 4
+
+-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+-# generated containing a tree-like index structure (just like the one that
++# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
++# structure should be generated to display hierarchical information.
++# If the tag value is set to YES, a side panel will be generated
++# containing a tree-like index structure (just like the one that
+ # is generated for HTML Help). For this to work a browser that supports
+-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+-# probably better off using the HTML help feature.
++# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
++# Windows users are probably better off using the HTML help feature.
+
+ GENERATE_TREEVIEW = NO
+
++# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
++# and Class Hierarchy pages using a tree view instead of an ordered list.
++
++USE_INLINE_TREES = NO
++
+ # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+ # used to set the initial width (in pixels) of the frame in which the tree
+ # is shown.
+
+ TREEVIEW_WIDTH = 250
+
++# Use this tag to change the font size of Latex formulas included
++# as images in the HTML documentation. The default is 10. Note that
++# when you change the font size after a successful doxygen run you need
++# to manually remove any form_*.png images from the HTML output directory
++# to force them to be regenerated.
++
++FORMULA_FONTSIZE = 10
++
++# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
++# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
++# there is already a search function so this one should typically
++# be disabled.
++
++SEARCHENGINE = NO
++
+ #---------------------------------------------------------------------------
+ # configuration options related to the LaTeX output
+ #---------------------------------------------------------------------------
+@@ -756,6 +1055,10 @@
+
+ LATEX_HIDE_INDICES = NO
+
++# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
++
++LATEX_SOURCE_CODE = NO
++
+ #---------------------------------------------------------------------------
+ # configuration options related to the RTF output
+ #---------------------------------------------------------------------------
+@@ -892,8 +1195,10 @@
+ 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
++# 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.
+
+@@ -925,7 +1230,7 @@
+
+ # 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_PREDEFINED tags.
++# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+ EXPAND_ONLY_PREDEF = NO
+
+@@ -951,7 +1256,9 @@
+ # 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.
++# 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 \
+ WITH_ZLIB \
+@@ -969,8 +1276,8 @@
+ # 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.
++# function macros are typically used for boiler-plate code, and will confuse
++# the parser if not removed.
+
+ SKIP_FUNCTION_MACROS = YES
+
+@@ -982,9 +1289,11 @@
+ # 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 ...
++#
++# TAGFILES = file1 file2 ...
+ # Adding location for the tag files is done as follows:
+-# TAGFILES = file1=loc1 "file2 = loc2" ...
++#
++# 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.
+@@ -1022,13 +1331,23 @@
+ #---------------------------------------------------------------------------
+
+ # 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.
++# 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
+
++# 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.
+@@ -1040,7 +1359,30 @@
+ # 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
++
++# 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
+@@ -1056,6 +1398,11 @@
+
+ COLLABORATION_GRAPH = YES
+
++# 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
+ # Language.
+@@ -1081,19 +1428,34 @@
+
+ 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.
++
++CALLER_GRAPH = NO
++
+ # 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
++# 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
+ # generated by dot. Possible values are png, jpg, or gif
+ # If left blank png will be used.
+@@ -1101,9 +1463,9 @@
+ DOT_IMAGE_FORMAT = png
+
+ # 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 on the path.
++# 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
+@@ -1111,33 +1473,41 @@
+
+ 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.
++# 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.
+
+-MAX_DOT_GRAPH_HEIGHT = 1024
++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 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.
++# 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, 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)
++# support this, this feature is disabled by default.
++
++DOT_MULTI_TARGETS = YES
++
+ # 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.
+@@ -1149,12 +1519,3 @@
+ # 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
Modified: trunk/packages/dcmtk/trunk/debian/rules
===================================================================
--- trunk/packages/dcmtk/trunk/debian/rules 2009-12-02 12:46:44 UTC (rev 4427)
+++ trunk/packages/dcmtk/trunk/debian/rules 2009-12-02 16:58:54 UTC (rev 4428)
@@ -18,11 +18,12 @@
ARCH=""
# Package installation directories
-PKGDIR_DCMTK=$(CURDIR)/debian/dcmtk
+pkg=dcmtk
+PKGDIR_DCMTK=$(CURDIR)/debian/$(pkg)
PKGDIR_DCMTK_LIB=$(CURDIR)/debian/libdcmtk1
PKGDIR_DCMTK_DEV=$(CURDIR)/debian/libdcmtk1-dev
-PKGDIR_DCMTK_DOC=$(CURDIR)/debian/dcmtk-doc
-PKGDIR_DCMTK_WWW=$(CURDIR)/debian/dcmtk-www
+PKGDIR_DCMTK_DOC=$(CURDIR)/debian/$(pkg)-doc
+PKGDIR_DCMTK_WWW=$(CURDIR)/debian/$(pkg)-www
# Library version
LIB_VERSION=1.0.0
@@ -51,7 +52,7 @@
--includedir=\$${prefix}/include \
--libdir=\$${prefix}/lib \
--datadir=\$${prefix}/share \
- --sysconfdir=/etc/dcmtk \
+ --sysconfdir=/etc/$(pkg) \
--with-private-tags \
--with-libxml \
--with-libtiff \
@@ -159,8 +160,8 @@
$(PKGDIR_DCMTK_DEV)/usr/lib/`basename $$i` && \
ln -sf `basename \$$i.1.0.0` $$i.1; \
done
+ # cp -a debian/apache.conf $(PKGDIR_DCMTK_WWW)/etc/apache2/conf.d/$(pkg)
-
# Build architecture-independent files here.
binary-indep: build-indep install-indep
dh_testdir -i
@@ -171,6 +172,7 @@
dh_installman -i
dh_install -i
dh_link -i
+ dh_lintian -i
dh_strip -i
dh_compress -i
dh_fixperms -i
@@ -189,8 +191,9 @@
dh_installinit -a --name=dcmqrscp
dh_installman -a
dh_install -a
- chmod 755 $(PKGDIR_DCMTK_WWW)/usr/lib/cgi-bin/dcmtk_wlm/*.p[lh]
+ chmod 755 $(PKGDIR_DCMTK_WWW)/usr/lib/dcmtk/cgi-bin/*.p[lh]
dh_link -a
+ dh_lintian -a
dh_strip -a
dh_compress -a
dh_fixperms -a
More information about the debian-med-commit
mailing list