[med-svn] r13561 - in trunk/packages/dcmtk/branches/experimental/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Wed May 15 08:35:29 UTC 2013
Author: malat
Date: 2013-05-15 08:35:28 +0000 (Wed, 15 May 2013)
New Revision: 13561
Added:
trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch
trunk/packages/dcmtk/branches/experimental/debian/patches/system_charls.patch
Removed:
trunk/packages/dcmtk/branches/experimental/debian/README.source
trunk/packages/dcmtk/branches/experimental/debian/dot
Modified:
trunk/packages/dcmtk/branches/experimental/debian/changelog
trunk/packages/dcmtk/branches/experimental/debian/control
trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
trunk/packages/dcmtk/branches/experimental/debian/patches/series
trunk/packages/dcmtk/branches/experimental/debian/rules
Log:
Work on exp dcmtk
Deleted: trunk/packages/dcmtk/branches/experimental/debian/README.source
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/README.source 2013-05-15 08:11:19 UTC (rev 13560)
+++ trunk/packages/dcmtk/branches/experimental/debian/README.source 2013-05-15 08:35:28 UTC (rev 13561)
@@ -1,4 +0,0 @@
-This packages uses the quilt patch system. Please read
-/usr/share/doc/quilt/README.source for more information.
-
- -- Andreas Tille <tille at debian.org> Wed, 14 Jan 2009 11:44:35 +0100
Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-05-15 08:11:19 UTC (rev 13560)
+++ trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-05-15 08:35:28 UTC (rev 13561)
@@ -4,22 +4,138 @@
* Run w-a-s. Use B-D-I for doxygen
* Switch to cmake build system (allows parallel builds)
- -- Mathieu Malaterre <malat at debian.org> Sat, 26 May 2012 09:57:22 +0200
+ -- Mathieu Malaterre <malat at debian.org> Wed, 15 May 2013 10:34:58 +0200
-dcmtk (3.5.5~20101130-1) experimental; urgency=low
+dcmtk (3.6.0-13) unstable; urgency=low
- * New snapshot (close to 3.6.0 release)
+ * Remove d/README.source, since source-format 3.0
+ * Update dcmtk-www README for install instructions
+ * Remove obsolete DMUA flag
+ * Bump Std-Vers to 3.9.4, no changes needed
+ * Provide a debug package. Closes: #690733
+ * Fix SIGSEGV. Closes: #703716
+
+ -- Mathieu Malaterre <malat at debian.org> Wed, 15 May 2013 10:10:29 +0200
+
+dcmtk (3.6.0-12) unstable; urgency=low
+
+ [ Andrey Rahmatullin ]
+ * Fix underlinked libraries. Closes: #677721
+ - debian/patches/underlink.patch
+
+ -- Mathieu Malaterre <malat at debian.org> Thu, 20 Dec 2012 13:20:45 +0100
+
+dcmtk (3.6.0-11) unstable; urgency=low
+
+ * Fix compilation with gcc 4.7. Closes: #674361
+ - debian/patches/bug674361.patch
+ * Make sure to link against libxml2. Closes: #510120
+ * Fix some underlinking. Closes: #674586
+ - debian/patches/underlink.patch
+
+ -- Mathieu Malaterre <malat at debian.org> Thu, 31 May 2012 11:31:16 +0200
+
+dcmtk (3.6.0-10) unstable; urgency=low
+
+ [ Andreas Tille ]
+ * debian/dcmtk.prerm: when purging dirs in /var/lib need to be
+ removed in advance. Closes: #660346
+
+ [ Mathieu Malaterre ]
+ * Use libpng-dev. Closes: #662296
+ * Use libtiff-dev for transition to tiff5
+ * Bump Std-Vers to 3.9.3. No changes needed
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 06 Mar 2012 23:01:59 +0100
+
+dcmtk (3.6.0-9) unstable; urgency=low
+
+ * Remove dot wrapper, not required anymore.
+ * Generate doc using svg instead of png to save disk space
+ * Fix compilation. Thanks to Bhavani Shankar. Closes: #646316
+ * Fix VCS URLs
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 23 Nov 2011 16:31:18 +0100
+
+dcmtk (3.6.0-8) unstable; urgency=low
+
+ * Adding a storescp daemon
+ * Remove convenient copy of CharLS. Closes: #631100
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 19 Jul 2011 17:08:19 +0200
+
+dcmtk (3.6.0-7) unstable; urgency=low
+
+ * Add a patch (from current git/master) to fix a regression. Closes: #630781
+ * Another fix to remove symlink only if exists
+ * Remove deprecated lintian override
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Fri, 17 Jun 2011 14:43:37 +0200
+
+dcmtk (3.6.0-6) unstable; urgency=low
+
+ * Make sure OFFIS_DCMTK_VERSION_NUMBER is really a number. Closes: #628168
+ * Update Standard Version to 3.9.2. No changes needed
+ * Fix some lintian errors in control file
+ * Fix piuparts reports on remaining dcmtk apache configuration file
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 31 May 2011 23:28:12 +0200
+
+dcmtk (3.6.0-5) unstable; urgency=low
+
+ * Fix invalid dep. to apache with apache2
+ * Remove explicit `invoke-rc.d dcmqrscp stop` since it makes package
+ un-removable. Let dh_installinit handles it
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 28 Mar 2011 15:33:06 +0200
+
+dcmtk (3.6.0-4) unstable; urgency=low
+
+ * new release fixes segfault. Closes: #615977
+ * Update README. Closes: #618686
+ * 3.6.0 is already packaged. Closes: #610855
+ * Update postrm script. Closes: #618688
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Thu, 17 Mar 2011 17:32:48 +0100
+
+dcmtk (3.6.0-3) unstable; urgency=low
+
+ * Properly conflict with dcmtk 3.5.4 and libdcmtk2
+ * Remove reference to issue with UNIX FHS
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 08 Mar 2011 17:14:24 +0100
+
+dcmtk (3.6.0-2) experimental; urgency=low
+
+ * Update copyright to reflects 3.6.0 changes
+ * Update dcmtk.NEWS to reflects 3.6.0 news
+ * Minor update to dcmtk.README.Debian for build instructions
+ * Minor cosmetic changes to the patch series
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 08 Feb 2011 19:20:13 +0100
+
+dcmtk (3.6.0-1) experimental; urgency=low
+
+ [ Mathieu Malaterre ]
+ * New upstream: 3.6.0
+ * Update SONAME to 2.0.0 because of change in log4cplus::Logger::addAppender
* Fix lintian errors on misc:Depends
* Fix lintian errors on init.d script
* Add a patch to link wth png/tiff libraries
* Update perl path patch
* debian/control: Update standards-version to 3.9.1
- * Fix new naming convention for snapshot
+ * Fix new naming convention for this release
* Add get-orig-source target in rules file
* Fix CHANGES numbering into something more flexible for later revs.
+ * Move *.dic file to the libdcmtk2 package
+ * Switch to dpkg-source 3.0 (quilt) format
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Fri, 10 Dec 2010 14:49:56 +0100
+ [ Andreas Tille ]
+ * make sure *.dic file shwo up only in libdcmtk2 package
+ * Add -f to rm statement in clean target
+ -- Andreas Tille <tille at debian.org> Fri, 04 Feb 2011 22:24:40 +0100
+
dcmtk (3.5.4-4) unstable; urgency=low
[Andreas Tille]
Modified: trunk/packages/dcmtk/branches/experimental/debian/control
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/control 2013-05-15 08:11:19 UTC (rev 13560)
+++ trunk/packages/dcmtk/branches/experimental/debian/control 2013-05-15 08:35:28 UTC (rev 13561)
@@ -38,8 +38,6 @@
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: dcmtk (<< 3.6.0), libdcmtk0, libdcmtk2, libdcmtk0c2
-Replaces: libdcmtk0, libdcmtk0c2, libdcmtk2
Description: OFFIS DICOM toolkit runtime libraries
DCMTK includes a collection of libraries and applications for examining,
constructing and converting DICOM image files, handling offline media,
@@ -55,8 +53,9 @@
Section: libdevel
Architecture: any
Depends: libdcmtk3 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libdcmtk0-dev, libdcmtk1-dev
-Replaces: libdcmtk0-dev, libdcmtk1-dev
+Conflicts: libdcmtk2-dev
+Replaces: libdcmtk2-dev
+Provides: libdcmtk-dev
Suggests: dcmtk-doc
Description: OFFIS DICOM toolkit development libraries and headers
DCMTK includes a collection of libraries and applications for examining,
@@ -101,3 +100,16 @@
.
This package contains the on-line documentation for the DCMTK libraries
and utilities in HTML format.
+
+Package: libdcmtk3-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: libdcmtk3 (= ${binary:Version}), ${misc:Depends}
+Description: OFFIS DICOM toolkit library debugging symbols
+ DCMTK includes a collection of libraries and applications 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.
+ .
+ This package contains the debugging symbols for libdcmtk3.
Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install 2013-05-15 08:11:19 UTC (rev 13560)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install 2013-05-15 08:35:28 UTC (rev 13561)
@@ -1,13 +1,14 @@
+#usr/share/man/man1/*.1
+doxygen/manpages/man1/*.1
usr/bin/*
usr/etc/dcmtk/*
-usr/share/doc/dcmtk/*
-usr/share/man/man1/*.1
-usr/share/dcmtk/wlistqry
-usr/share/dcmtk/wlistdb
+usr/share/dcmtk/*.css
+usr/share/dcmtk/*.dump
usr/share/dcmtk/*.lut
usr/share/dcmtk/DCMTKConfig.cmake
usr/share/dcmtk/dcm2xml.dtd
+usr/share/dcmtk/dsr2xml.xsd
usr/share/dcmtk/dumppat.txt
-usr/share/dcmtk/*.dump
-usr/share/dcmtk/dsr2xml.xsd
-usr/share/dcmtk/*.css
+usr/share/dcmtk/wlistdb
+usr/share/dcmtk/wlistqry
+usr/share/doc/dcmtk/*
Deleted: trunk/packages/dcmtk/branches/experimental/debian/dot
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dot 2013-05-15 08:11:19 UTC (rev 13560)
+++ trunk/packages/dcmtk/branches/experimental/debian/dot 2013-05-15 08:35:28 UTC (rev 13561)
@@ -1,12 +0,0 @@
-#!/bin/sh
-# This way you can SVG instead of PNG to enable smooth scaling
-# but you need to tweak HTML pages accordingly.
-# ARGS=`echo $@ | sed -e 's/ -Tpng / -Tsvg /g' -e 's/\(-o .\+\.\)png/\1svg/'`
-#
-# So we just try to render PNGs with GD library
-#
-# To disable this feature or remove the DOT_PATH
-# setting in doxygen/htmldocs.cfg (quilt patch)
-
-ARGS=`echo $@ | sed -e 's/ -Tpng / -Tpng:gd /g'`
-/usr/bin/dot $ARGS
Added: trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch (rev 0)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch 2013-05-15 08:35:28 UTC (rev 13561)
@@ -0,0 +1,560 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ dcmtk (3.6.1~20121102-1) experimental; urgency=low
+ .
+ * Use new dh syntax
+ * Run w-a-s. Use B-D-I for doxygen
+ * Switch to cmake build system (allows parallel builds)
+Author: Mathieu Malaterre <malat at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- dcmtk-3.6.1~20121102.orig/CMake/3rdparty.cmake
++++ dcmtk-3.6.1~20121102/CMake/3rdparty.cmake
+@@ -23,10 +23,11 @@ IF(WIN32)
+ # zlib support: find out whether user has library
+ GET_FILENAME_COMPONENT(ZLIB_DIR "${DCMTK_SOURCE_DIR}/../zlib-1.2.5" ABSOLUTE)
+ FIND_PATH(WITH_ZLIBINC "include/zlib.h" "${ZLIB_DIR}" NO_DEFAULT_PATH)
++ message("toot:${ZLIB_DIR}")
+
+ # sndfile support: find out whether user has library. Needed for module dcmwave (not in public DCMTK yet, marked as advanced)
+ GET_FILENAME_COMPONENT(SNDFILE_DIR "${DCMTK_SOURCE_DIR}/../libsndfile-1.0.17" ABSOLUTE)
+- FIND_PATH(WITH_SNDFILEINC "sndfile.h" "${SNDFILE_DIR}" NO_DEFAULT_PATH)
++ FIND_PATH(WITH_SNDFILEINC "include/sndfile.h" "${SNDFILE_DIR}" NO_DEFAULT_PATH)
+ MARK_AS_ADVANCED(SNDFILE_DIR WITH_SNDFILEINC)
+
+ # libiconv support: find out whether user has library
+--- dcmtk-3.6.1~20121102.orig/dcmsr/docs/dsrdump.man
++++ dcmtk-3.6.1~20121102/dcmsr/docs/dsrdump.man
+@@ -37,138 +37,152 @@ dsrfile-in DICOM SR input filename to b
+
+ \subsection general_options general options
+ \verbatim
+- -h --help
+- print this help text and exit
++ -h --help
++ print this help text and exit
+
+- --version
+- print version information and exit
++ --version
++ print version information and exit
+
+- --arguments
+- print expanded command line arguments
++ --arguments
++ print expanded command line arguments
+
+- -q --quiet
+- quiet mode, print no warnings and errors
++ -q --quiet
++ quiet mode, print no warnings and errors
+
+- -v --verbose
+- verbose mode, print processing details
++ -v --verbose
++ verbose mode, print processing details
+
+- -d --debug
+- debug mode, print debug information
++ -d --debug
++ debug mode, print debug information
+
+- -ll --log-level [l]evel: string constant
+- (fatal, error, warn, info, debug, trace)
+- use level l for the logger
++ -ll --log-level [l]evel: string constant
++ (fatal, error, warn, info, debug, trace)
++ use level l for the logger
+
+- -lc --log-config [f]ilename: string
+- use config file f for the logger
++ -lc --log-config [f]ilename: string
++ use config file f for the logger
+ \endverbatim
+
+ \subsection input_options input options
+ \verbatim
+ input file format:
+
+- +f --read-file
+- read file format or data set (default)
++ +f --read-file
++ read file format or data set (default)
+
+- +fo --read-file-only
+- read file format only
++ +fo --read-file-only
++ read file format only
+
+- -f --read-dataset
+- read data set without file meta information
++ -f --read-dataset
++ read data set without file meta information
+
+ input transfer syntax:
+
+- -t= --read-xfer-auto
+- use TS recognition (default)
++ -t= --read-xfer-auto
++ use TS recognition (default)
+
+- -td --read-xfer-detect
+- ignore TS specified in the file meta header
++ -td --read-xfer-detect
++ ignore TS specified in the file meta header
+
+- -te --read-xfer-little
+- read with explicit VR little endian TS
++ -te --read-xfer-little
++ read with explicit VR little endian TS
+
+- -tb --read-xfer-big
+- read with explicit VR big endian TS
++ -tb --read-xfer-big
++ read with explicit VR big endian TS
+
+- -ti --read-xfer-implicit
+- read with implicit VR little endian TS
++ -ti --read-xfer-implicit
++ read with implicit VR little endian TS
+ \endverbatim
+
+ \subsection processing_options processing options
+ \verbatim
+ additional information:
+
+- -Ip --processing-details
+- show currently processed content item
++ -Ip --processing-details
++ show currently processed content item
+
+ error handling:
+
+- -Er --unknown-relationship
+- accept unknown/missing relationship type
++ -Er --unknown-relationship
++ accept unknown/missing relationship type
+
+- -Ev --invalid-item-value
+- accept invalid content item value
+- (e.g. violation of VR or VM definition)
+-
+- -Ec --ignore-constraints
+- ignore relationship content constraints
+-
+- -Ee --ignore-item-errors
+- do not abort on content item errors, just warn
+- (e.g. missing value type specific attributes)
++ -Ev --invalid-item-value
++ accept invalid content item value
++ (e.g. violation of VR or VM definition)
++
++ -Ec --ignore-constraints
++ ignore relationship content constraints
++
++ -Ee --ignore-item-errors
++ do not abort on content item errors, just warn
++ (e.g. missing value type specific attributes)
+
+- -Ei --skip-invalid-items
+- skip invalid content items (incl. sub-tree)
++ -Ei --skip-invalid-items
++ skip invalid content items (including sub-tree)
+
+ specific character set:
+
+- +U8 --convert-to-utf8
+- convert all element values that are affected
+- by Specific Character Set (0008,0005) to UTF-8
++ +U8 --convert-to-utf8
++ convert all element values that are affected
++ by Specific Character Set (0008,0005) to UTF-8
+
+- # requires support from the libiconv toolkit
++ # requires support from the libiconv toolkit
+ \endverbatim
+
+ \subsection output_options output options
+ \verbatim
+-printing:
++general printing:
+
+- +Pf --print-filename
+- print header with filename for each document
++ +Pf --print-filename
++ print header with filename for each document
+
+- -Ph --no-document-header
+- do not print general document information
++ -Ph --no-document-header
++ do not print general document information
+
+- +Pn --number-nested-items
+- print position string in front of each line
++ +Pn --number-nested-items
++ print position string in front of each line
+
+- -Pn --indent-nested-items
+- indent nested items by spaces (default)
++ -Pn --indent-nested-items
++ indent nested items by spaces (default)
+
+- +Pl --print-long-values
+- print long item values completely
++printing values:
+
+- -Pl --shorten-long-values
+- print long item values shortened (default)
++ +Pl --print-long-values
++ print long item values completely
+
+- +Pu --print-instance-uid
+- print SOP instance UID of referenced objects
++ -Pl --shorten-long-values
++ print long item values shortened (default)
+
+- +Pc --print-all-codes
+- print all codes (incl. concept name codes)
++ +Pu --print-instance-uid
++ print SOP instance UID of referenced objects
+
+- +Pt --print-template-id
+- print template identification information
++ -Ps --print-sopclass-short
++ print short SOP class name of referenced image objects,
++ e.g. "CT image" (default)
+
+- +C --print-color
+- use ANSI escape codes for colored output
++ +Ps --print-sopclass-long
++ print long SOP class name of referenced objects
+
+- # not available on Windows systems
++ +Psu --print-sopclass-uid
++ print SOP class UID of referenced objects
+
+- -C --no-color
+- do not use any ANSI escape codes (default)
++ +Pc --print-all-codes
++ print all codes (including concept name codes)
+
+- # not available on Windows systems
++ +Pt --print-template-id
++ print template identification information
++
++color:
++
++ +C --print-color
++ use ANSI escape codes for colored output
++
++ # not available on Windows systems
++
++ -C --no-color
++ do not use any ANSI escape codes (default)
++
++ # not available on Windows systems
+ \endverbatim
+
+ \section notes NOTES
+@@ -255,6 +269,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2000-2011 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2000-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20121102.orig/dcmsr/apps/dsrdump.cc
++++ dcmtk-3.6.1~20121102/dcmsr/apps/dsrdump.cc
+@@ -1,6 +1,6 @@
+ /*
+ *
+- * Copyright (C) 2000-2012, OFFIS e.V.
++ * Copyright (C) 2000-2013, OFFIS e.V.
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation were developed by
+@@ -121,7 +121,7 @@ static OFCondition dumpFile(STD_NAMESPAC
+ }
+
+
+-#define SHORTCOL 3
++#define SHORTCOL 4
+ #define LONGCOL 22
+
+
+@@ -142,50 +142,55 @@ int main(int argc, char *argv[])
+ cmd.addParam("dsrfile-in", "DICOM SR input filename to be dumped", OFCmdParam::PM_MultiMandatory);
+
+ cmd.addGroup("general options:", LONGCOL, SHORTCOL + 2);
+- cmd.addOption("--help", "-h", "print this help text and exit", OFCommandLine::AF_Exclusive);
+- cmd.addOption("--version", "print version information and exit", OFCommandLine::AF_Exclusive);
++ cmd.addOption("--help", "-h", "print this help text and exit", OFCommandLine::AF_Exclusive);
++ cmd.addOption("--version", "print version information and exit", OFCommandLine::AF_Exclusive);
+ OFLog::addOptions(cmd);
+
+ cmd.addGroup("input options:");
+ cmd.addSubGroup("input file format:");
+- cmd.addOption("--read-file", "+f", "read file format or data set (default)");
+- cmd.addOption("--read-file-only", "+fo", "read file format only");
+- cmd.addOption("--read-dataset", "-f", "read data set without file meta information");
++ cmd.addOption("--read-file", "+f", "read file format or data set (default)");
++ cmd.addOption("--read-file-only", "+fo", "read file format only");
++ cmd.addOption("--read-dataset", "-f", "read data set without file meta information");
+ cmd.addSubGroup("input transfer syntax:");
+- cmd.addOption("--read-xfer-auto", "-t=", "use TS recognition (default)");
+- cmd.addOption("--read-xfer-detect", "-td", "ignore TS specified in the file meta header");
+- cmd.addOption("--read-xfer-little", "-te", "read with explicit VR little endian TS");
+- cmd.addOption("--read-xfer-big", "-tb", "read with explicit VR big endian TS");
+- cmd.addOption("--read-xfer-implicit", "-ti", "read with implicit VR little endian TS");
++ cmd.addOption("--read-xfer-auto", "-t=", "use TS recognition (default)");
++ cmd.addOption("--read-xfer-detect", "-td", "ignore TS specified in the file meta header");
++ cmd.addOption("--read-xfer-little", "-te", "read with explicit VR little endian TS");
++ cmd.addOption("--read-xfer-big", "-tb", "read with explicit VR big endian TS");
++ cmd.addOption("--read-xfer-implicit", "-ti", "read with implicit VR little endian TS");
+
+ cmd.addGroup("processing options:");
+ cmd.addSubGroup("additional information:");
+- cmd.addOption("--processing-details", "-Ip", "show currently processed content item");
++ cmd.addOption("--processing-details", "-Ip", "show currently processed content item");
+ cmd.addSubGroup("error handling:");
+- cmd.addOption("--unknown-relationship", "-Er", "accept unknown/missing relationship type");
+- cmd.addOption("--invalid-item-value", "-Ev", "accept invalid content item value\n(e.g. violation of VR or VM definition)");
+- cmd.addOption("--ignore-constraints", "-Ec", "ignore relationship content constraints");
+- cmd.addOption("--ignore-item-errors", "-Ee", "do not abort on content item errors, just warn\n(e.g. missing value type specific attributes)");
+- cmd.addOption("--skip-invalid-items", "-Ei", "skip invalid content items (incl. sub-tree)");
++ cmd.addOption("--unknown-relationship", "-Er", "accept unknown/missing relationship type");
++ cmd.addOption("--invalid-item-value", "-Ev", "accept invalid content item value\n(e.g. violation of VR or VM definition)");
++ cmd.addOption("--ignore-constraints", "-Ec", "ignore relationship content constraints");
++ cmd.addOption("--ignore-item-errors", "-Ee", "do not abort on content item errors, just warn\n(e.g. missing value type specific attributes)");
++ cmd.addOption("--skip-invalid-items", "-Ei", "skip invalid content items (incl. sub-tree)");
+ #ifdef WITH_LIBICONV
+ cmd.addSubGroup("specific character set:");
+- cmd.addOption("--convert-to-utf8", "+U8", "convert all element values that are affected\nby Specific Character Set (0008,0005) to UTF-8");
++ cmd.addOption("--convert-to-utf8", "+U8", "convert all element values that are affected\nby Specific Character Set (0008,0005) to UTF-8");
+ #endif
+
+ cmd.addGroup("output options:");
+- cmd.addSubGroup("printing:");
+- cmd.addOption("--print-filename", "+Pf", "print header with filename for each document");
+- cmd.addOption("--no-document-header", "-Ph", "do not print general document information");
+- cmd.addOption("--number-nested-items", "+Pn", "print position string in front of each line");
+- cmd.addOption("--indent-nested-items", "-Pn", "indent nested items by spaces (default)");
+- cmd.addOption("--print-long-values", "+Pl", "print long item values completely");
+- cmd.addOption("--shorten-long-values", "-Pl", "print long item values shortened (default)");
+- cmd.addOption("--print-instance-uid", "+Pu", "print SOP instance UID of referenced objects");
+- cmd.addOption("--print-all-codes", "+Pc", "print all codes (incl. concept name codes)");
+- cmd.addOption("--print-template-id", "+Pt", "print template identification information");
++ cmd.addSubGroup("general printing:");
++ cmd.addOption("--print-filename", "+Pf", "print header with filename for each document");
++ cmd.addOption("--no-document-header", "-Ph", "do not print general document information");
++ cmd.addOption("--number-nested-items", "+Pn", "print position string in front of each line");
++ cmd.addOption("--indent-nested-items", "-Pn", "indent nested items by spaces (default)");
++ cmd.addSubGroup("printing values:");
++ cmd.addOption("--print-long-values", "+Pl", "print long item values completely");
++ cmd.addOption("--shorten-long-values", "-Pl", "print long item values shortened (default)");
++ cmd.addOption("--print-instance-uid", "+Pu", "print SOP instance UID of referenced objects");
++ cmd.addOption("--print-sopclass-short", "-Ps", "print short SOP class name of referenced\nimage objects, e.g. \"CT image\" (default)");
++ cmd.addOption("--print-sopclass-long", "+Ps", "print long SOP class name of ref. objects");
++ cmd.addOption("--print-sopclass-uid", "+Psu", "print SOP class UID of referenced objects");
++ cmd.addOption("--print-all-codes", "+Pc", "print all codes (incl. concept name codes)");
++ cmd.addOption("--print-template-id", "+Pt", "print template identification information");
+ #ifdef ANSI_ESCAPE_CODES_AVAILABLE
+- cmd.addOption("--print-color", "+C", "use ANSI escape codes for colored output");
+- cmd.addOption("--no-color", "-C", "do not use any ANSI escape codes (default)");
++ cmd.addSubGroup("color:");
++ cmd.addOption("--print-color", "+C", "use ANSI escape codes for colored output");
++ cmd.addOption("--no-color", "-C", "do not use any ANSI escape codes (default)");
+ #endif
+
+ /* evaluate command line */
+@@ -288,6 +293,16 @@ int main(int argc, char *argv[])
+
+ if (cmd.findOption("--print-instance-uid"))
+ opt_printFlags |= DSRTypes::PF_printSOPInstanceUID;
++
++ cmd.beginOptionBlock();
++ if (cmd.findOption("--print-sopclass-short"))
++ opt_printFlags = (opt_printFlags & ~(DSRTypes::PF_printLongSOPClassName | DSRTypes::PF_printSOPClassUID));
++ if (cmd.findOption("--print-sopclass-long"))
++ opt_printFlags = (opt_printFlags & ~DSRTypes::PF_printSOPClassUID) | DSRTypes::PF_printLongSOPClassName;
++ if (cmd.findOption("--print-sopclass-uid"))
++ opt_printFlags = (opt_printFlags & ~DSRTypes::PF_printLongSOPClassName) | DSRTypes::PF_printSOPClassUID;
++ cmd.endOptionBlock();
++
+ if (cmd.findOption("--print-all-codes"))
+ opt_printFlags |= DSRTypes::PF_printAllCodes;
+ if (cmd.findOption("--print-template-id"))
+--- dcmtk-3.6.1~20121102.orig/dcmsr/include/dcmtk/dcmsr/dsrtypes.h
++++ dcmtk-3.6.1~20121102/dcmsr/include/dcmtk/dcmsr/dsrtypes.h
+@@ -356,6 +356,12 @@ class DCMTK_DCMSR_EXPORT DSRTypes
+ /// use ANSI escape codes for output
+ static const size_t PF_useANSIEscapeCodes;
+
++ /// print long SOP class name of referenced objects (default: short name for images)
++ static const size_t PF_printLongSOPClassName;
++
++ /// print SOP class UID of referenced objects (instead of the name)
++ static const size_t PF_printSOPClassUID;
++
+ /// shortcut: print all codes
+ static const size_t PF_printAllCodes;
+ //@}
+--- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrcomvl.cc
++++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrcomvl.cc
+@@ -1,6 +1,6 @@
+ /*
+ *
+- * Copyright (C) 2000-2012, OFFIS e.V.
++ * Copyright (C) 2000-2013, OFFIS e.V.
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation were developed by
+@@ -90,13 +90,18 @@ OFBool DSRCompositeReferenceValue::isEmp
+ OFCondition DSRCompositeReferenceValue::print(STD_NAMESPACE ostream &stream,
+ const size_t flags) const
+ {
+- const char *className = dcmFindNameOfUID(SOPClassUID.c_str());
+- stream << "(";
+- if (className != NULL)
+- stream << className;
+- else
+- stream << "\"" << SOPClassUID << "\"";
+- stream << ",";
++ /* first, determine SOP class component */
++ OFString sopClassString = "\"" + SOPClassUID + "\"";
++ if (!(flags & DSRTypes::PF_printSOPClassUID))
++ {
++ /* look up name of known SOP classes */
++ const char *className = dcmFindNameOfUID(SOPClassUID.c_str());
++ if (className != NULL)
++ sopClassString = className;
++ }
++ /* and then, print it */
++ stream << "(" << sopClassString << ",";
++ /* print SOP instance component (if desired) */
+ if (flags & DSRTypes::PF_printSOPInstanceUID)
+ stream << "\"" << SOPInstanceUID << "\"";
+ stream << ")";
+--- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrimgvl.cc
++++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrimgvl.cc
+@@ -1,6 +1,6 @@
+ /*
+ *
+- * Copyright (C) 2000-2012, OFFIS e.V.
++ * Copyright (C) 2000-2013, OFFIS e.V.
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation were developed by
+@@ -134,21 +134,36 @@ OFBool DSRImageReferenceValue::isShort(c
+ OFCondition DSRImageReferenceValue::print(STD_NAMESPACE ostream &stream,
+ const size_t flags) const
+ {
+- const char *modality = dcmSOPClassUIDToModality(SOPClassUID.c_str());
+- stream << "(";
+- if (modality != NULL)
+- stream << modality << " image";
+- else
+- stream << "\"" << SOPClassUID << "\"";
+- stream << ",";
++ /* first, determine SOP class component */
++ OFString sopClassString = "\"" + SOPClassUID + "\"";
++ if (!(flags & DSRTypes::PF_printSOPClassUID))
++ {
++ if (flags & DSRTypes::PF_printLongSOPClassName)
++ {
++ /* look up name of known SOP classes */
++ const char *className = dcmFindNameOfUID(SOPClassUID.c_str());
++ if (className != NULL)
++ sopClassString = className;
++ } else {
++ /* create short name for SOP class, e.g. "CT image" */
++ const char *modality = dcmSOPClassUIDToModality(SOPClassUID.c_str());
++ if (modality != NULL)
++ sopClassString = OFString(modality) + " image";
++ }
++ }
++ /* and then, print it */
++ stream << "(" << sopClassString << ",";
++ /* print SOP instance component (if desired) */
+ if (flags & DSRTypes::PF_printSOPInstanceUID)
+ stream << "\"" << SOPInstanceUID << "\"";
++ /* print frame list (if present) */
+ if (!FrameList.isEmpty())
+ {
+ stream << ",";
+ FrameList.print(stream, flags);
+ }
+ stream << ")";
++ /* print information on presentation state (if present) */
+ if (PresentationState.isValid())
+ {
+ const DSRTypes::E_PresentationStateType pstateType = DSRTypes::sopClassUIDToPresentationStateType(PresentationState.getSOPClassUID());
+--- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrtypes.cc
++++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrtypes.cc
+@@ -133,6 +133,9 @@ const size_t DSRTypes::PF_printConceptNa
+ const size_t DSRTypes::PF_printNoDocumentHeader = 1 << 4;
+ const size_t DSRTypes::PF_printTemplateIdentification = 1 << 5;
+ const size_t DSRTypes::PF_useANSIEscapeCodes = 1 << 6;
++const size_t DSRTypes::PF_printLongSOPClassName = 1 << 7;
++const size_t DSRTypes::PF_printSOPClassUID = 1 << 8;
++/* shortcuts */
+ const size_t DSRTypes::PF_printAllCodes = DSRTypes::PF_printConceptNameCodes;
+
+ /* checkByReferenceRelationships modes */
+--- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrwavvl.cc
++++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrwavvl.cc
+@@ -1,6 +1,6 @@
+ /*
+ *
+- * Copyright (C) 2000-2012, OFFIS e.V.
++ * Copyright (C) 2000-2013, OFFIS e.V.
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation were developed by
+@@ -83,15 +83,21 @@ OFBool DSRWaveformReferenceValue::isShor
+ OFCondition DSRWaveformReferenceValue::print(STD_NAMESPACE ostream &stream,
+ const size_t flags) const
+ {
+- const char *className = dcmFindNameOfUID(SOPClassUID.c_str());
+- stream << "(";
+- if (className != NULL)
+- stream << className;
+- else
+- stream << "\"" << SOPClassUID << "\"";
+- stream << ",";
++ /* first, determine SOP class component */
++ OFString sopClassString = "\"" + SOPClassUID + "\"";
++ if (!(flags & DSRTypes::PF_printSOPClassUID))
++ {
++ /* look up name of known SOP classes */
++ const char *className = dcmFindNameOfUID(SOPClassUID.c_str());
++ if (className != NULL)
++ sopClassString = className;
++ }
++ /* and then, print it */
++ stream << "(" << sopClassString << ",";
++ /* print SOP instance component (if desired) */
+ if (flags & DSRTypes::PF_printSOPInstanceUID)
+ stream << "\"" << SOPInstanceUID << "\"";
++ /* print channel list (if present) */
+ if (!ChannelList.isEmpty())
+ {
+ stream << ",";
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/series
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-05-15 08:11:19 UTC (rev 13560)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-05-15 08:35:28 UTC (rev 13561)
@@ -2,3 +2,5 @@
02_dcmtk_3.6.0-1.patch
07_doxygen.patch
prefs.patch
+bug706062.patch
+system_charls.patch
Added: trunk/packages/dcmtk/branches/experimental/debian/patches/system_charls.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/system_charls.patch (rev 0)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/system_charls.patch 2013-05-15 08:35:28 UTC (rev 13561)
@@ -0,0 +1,82 @@
+Description: Remove convenient copy of CharLS
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/705923
+Forwarded: no
+
+Index: dcmtk-3.6.1_20121102/dcmjpls/CMakeLists.txt
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmjpls/CMakeLists.txt 2013-05-15 10:20:34.563697497 +0200
++++ dcmtk-3.6.1_20121102/dcmjpls/CMakeLists.txt 2013-05-15 10:20:37.015697471 +0200
+@@ -2,6 +2,6 @@
+ PROJECT(dcmjpls)
+
+ # recurse into subdirectories
+-FOREACH(SUBDIR libsrc libcharls apps include)
++FOREACH(SUBDIR libsrc apps include)
+ ADD_SUBDIRECTORY(${SUBDIR})
+ ENDFOREACH(SUBDIR)
+Index: dcmtk-3.6.1_20121102/dcmjpls/apps/CMakeLists.txt
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmjpls/apps/CMakeLists.txt 2013-05-15 10:20:27.151697582 +0200
++++ dcmtk-3.6.1_20121102/dcmjpls/apps/CMakeLists.txt 2013-05-15 10:20:37.019697471 +0200
+@@ -11,6 +11,6 @@
+
+ # make sure executables are linked to the corresponding libraries
+ FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
+- DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
++ DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd)
+ DCMTK_TARGET_LINK_LIBRARIES(${PROGRAM} ${LIBTIFF_LIBS} ${LIBPNG_LIBS} ${ZLIB_LIBS} ${LIBICONV_LIBS} ${THREAD_LIBS} ${WIN32_STD_LIBRARIES})
+ ENDFOREACH(PROGRAM)
+Index: dcmtk-3.6.1_20121102/dcmjpls/libsrc/CMakeLists.txt
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmjpls/libsrc/CMakeLists.txt 2013-05-15 10:20:27.251697581 +0200
++++ dcmtk-3.6.1_20121102/dcmjpls/libsrc/CMakeLists.txt 2013-05-15 10:20:37.019697471 +0200
+@@ -1,7 +1,7 @@
+ # declare additional include directories
+-INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR})
++INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${ZLIB_INCDIR})
+
+ # create library from source files
+ DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
+
+-DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls)
++DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage CharLS)
+Index: dcmtk-3.6.1_20121102/dcmjpls/libsrc/djerror.h
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmjpls/libsrc/djerror.h 2013-05-15 10:20:27.267697579 +0200
++++ dcmtk-3.6.1_20121102/dcmjpls/libsrc/djerror.h 2013-05-15 10:20:37.019697471 +0200
+@@ -24,7 +24,7 @@
+
+ #include "dcmtk/config/osconfig.h"
+ #include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */
+-#include "intrface.h" /* CharLS include */
++#include "CharLS/interface.h" /* CharLS include */
+
+ /** Helper class for converting between dcmjpls and CharLS error codes
+ */
+Index: dcmtk-3.6.1_20121102/dcmjpls/libsrc/djcodecd.cc
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmjpls/libsrc/djcodecd.cc 2013-05-15 10:20:27.291697579 +0200
++++ dcmtk-3.6.1_20121102/dcmjpls/libsrc/djcodecd.cc 2013-05-15 10:20:37.019697471 +0200
+@@ -37,7 +37,7 @@
+ #include "djerror.h" /* for private class DJLSError */
+
+ // JPEG-LS library (CharLS) includes
+-#include "intrface.h"
++#include "CharLS/interface.h"
+
+ E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const
+ {
+Index: dcmtk-3.6.1_20121102/dcmjpls/libsrc/djcodece.cc
+===================================================================
+--- dcmtk-3.6.1_20121102.orig/dcmjpls/libsrc/djcodece.cc 2013-05-15 10:20:27.311697580 +0200
++++ dcmtk-3.6.1_20121102/dcmjpls/libsrc/djcodece.cc 2013-05-15 10:20:37.019697471 +0200
+@@ -55,7 +55,7 @@
+ #include "dcmtk/dcmimgle/dcmimage.h" /* for class DicomImage */
+
+ // JPEG-LS library (CharLS) includes
+-#include "intrface.h"
++#include "CharLS/interface.h"
+
+ BEGIN_EXTERN_C
+ #ifdef HAVE_FCNTL_H
Modified: trunk/packages/dcmtk/branches/experimental/debian/rules
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/rules 2013-05-15 08:11:19 UTC (rev 13560)
+++ trunk/packages/dcmtk/branches/experimental/debian/rules 2013-05-15 08:35:28 UTC (rev 13561)
@@ -33,6 +33,9 @@
override_dh_install:
dh_install --list-missing
+override_dh_strip:
+ dh_strip --dbg-package=libdcmtk3-dbg
+
get-orig-source:
uscan --force-download --verbose --rename
More information about the debian-med-commit
mailing list