[med-svn] r15573 - in trunk/packages/dcmtk/branches/experimental/debian: . patches
Mathieu Malaterre
malat at moszumanska.debian.org
Thu Dec 19 16:36:29 UTC 2013
Author: malat
Date: 2013-12-19 16:36:29 +0000 (Thu, 19 Dec 2013)
New Revision: 15573
Added:
trunk/packages/dcmtk/branches/experimental/debian/patches/import_git.patch
Modified:
trunk/packages/dcmtk/branches/experimental/debian/changelog
trunk/packages/dcmtk/branches/experimental/debian/patches/series
Log:
Prepare next uplaod
Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-12-19 12:11:41 UTC (rev 15572)
+++ trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-12-19 16:36:29 UTC (rev 15573)
@@ -1,3 +1,9 @@
+dcmtk (3.6.1~20131114-4) experimental; urgency=low
+
+ * Import patch from git (upstream)
+
+ -- Mathieu Malaterre <malat at debian.org> Thu, 19 Dec 2013 17:33:18 +0100
+
dcmtk (3.6.1~20131114-3) experimental; urgency=low
* Another round of compilation fixes. Closes: #731434
Added: trunk/packages/dcmtk/branches/experimental/debian/patches/import_git.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/import_git.patch (rev 0)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/import_git.patch 2013-12-19 16:36:29 UTC (rev 15573)
@@ -0,0 +1,5198 @@
+Description: Pull latest git
+Author: Mathieu Malaterre <malat at debian.org>
+
+--- dcmtk-3.6.1~20131114.orig/VERSION
++++ dcmtk-3.6.1~20131114/VERSION
+@@ -1 +1 @@
+-3.6.1_20131114
++3.6.1_CVS
+--- dcmtk-3.6.1~20131114.orig/INSTALL
++++ dcmtk-3.6.1~20131114/INSTALL
+@@ -673,6 +673,22 @@ Please note that support for shared libr
+ thus not that mature.
+
+
++Default value for CMAKE_BUILD_TYPE
++----------------------------------
++
++CMAKE_BUILD_TYPE is set to value "Release" if none is specified by the
++selected build file generator. For those generators that support multiple
++configuration types (e.g. Debug, Release), CMAKE_CONFIGURATION_TYPES holds
++possible values. For other generators this value is empty, and for those
++generators the build type is controlled at CMake time by CMAKE_BUILD_TYPE.
++
++To disable the CMAKE_BUILD_TYPE default value, set CMAKE_BUILD_TYPE to value
++"None" during CMake configuration, e.g. use "-DCMAKE_BUILD_TYPE:STRING=None"
++on the command line. This may be useful if the compiler flags should be
++controlled manually (e.g. as defined in environment variables like CXXFLAGS)
++and no CMake defaults related to the selected configuration type kick in.
++
++
+ HTML DOCUMENTATION AND MAN PAGES
+ ================================
+
+@@ -741,4 +757,4 @@ Have fun.
+ Marco Eichelberg, Joerg Riesmeier, Michael Onken, Uli Schlachter
+ OFFIS DICOM Team, Oldenburg, Germany.
+
+-Last revised: 2013-08-05 (Riesmeier)
++Last revised: 2013-12-05 (Onken)
+--- dcmtk-3.6.1~20131114.orig/CHANGES.361
++++ dcmtk-3.6.1~20131114/CHANGES.361
+@@ -1,7 +1,220 @@
+
+ Changes between releases are documented here.
+
++**** Changes from 2013.12.11 (riesmeier)
++
++- Replaced deprecated DcmSCU::closeAssociation():
++ Replaced call to DcmSCU::closeAssociation(DCMSCU_RELEASE_ASSOCIATION) by
++ DcmSCU::releaseAssociation() since the former is deprecated.
++ Affects: dcmnet/tests/tpool.cc
++
++- Fixed typos, comments and coding style.
++ Affects: dcmnet/tests/tpool.cc
++
++**** Changes from 2013.12.10 (riesmeier)
++
++- Second try to fix the issue with "ofstd_markup_6":
++ The error in test "ofstd_markup_6" still occurred on various systems.
++ Thanks to Mathieu Malaterre <malat at debian.org> for pointing this out.
++ Affects: ofstd/tests/tmarkup.cc
++
++**** Changes from 2013.12.10 (onken)
++
++- Fixed some inconsistencies in documentation.
++ Affects: INSTALL
++
++**** Changes from 2013.12.05 (onken)
++
++- Fixed typo.
++ Affects: dcmtls/include/dcmtk/dcmtls/tlslayer.h
++
++- Documentation for CMAKE_BUILD_TYPE default value.
++ Thanks to Mathieu Malaterre <malat at debian.org> for pointing to the fact that
++ having no default value in some situations is important and Jean-Christophe
++ Fillion-Robin <jchris.fillionr at kitware.com> for giving a solution.
++ Affects: CMake/dcmtkPrepare.cmake
++ INSTALL
++
++**** Changes from 2013.11.29 (riesmeier)
++
++- Completed support for <InlineBinary> XML element:
++ Completed support for the <InlineBinary> XML element used by the Native DICOM
++ Model format. Now, also data elements with a VR of OD and OF can be encoded
++ as base64. Closes DCMTK Feature #549.
++ Affects: dcmdata/docs/dcm2xml.man
++ dcmdata/libsrc/Makefile.dep
++ dcmdata/libsrc/dcvrod.cc
++ dcmdata/libsrc/dcvrof.cc
++
++**** Changes from 2013.11.28 (riesmeier)
++
++- Do not check valueLoaded() for Native DICOM Model:
++ Do not check whether a value has actually been loaded when writing an element
++ value to XML output in the Native DICOM Model. This is because this concept
++ is only known to the DCMTK-specific output format.
++ Affects: dcmdata/libsrc/dcelem.cc
++
++- Fixed output of AT values in Native DICOM Model:
++ Fixed wrong output format for Attribute Tag (AT) values in the Native DICOM
++ Model. Supplement 166 (QIDO-RS) clarifies that the format is "GGGGEEEE", and
++ not "(gggg,eeee)" as it was before (which is DCMTK's default string output
++ format for AT values). Closes DCMTK Bug #551.
++ Affects: dcmdata/include/dcmtk/dcmdata/dcvrat.h
++ dcmdata/libsrc/dcvrat.cc
++
++- Fixed various typos in man pages.
++ Thanks to Mathieu Malaterre <malat at debian.org> for the original report.
++ Affects: dcmdata/docs/dcm2pdf.man
++ dcmdata/docs/dcm2xml.man
++ dcmdata/docs/dcmconv.man
++ dcmdata/docs/dcmcrle.man
++ dcmdata/docs/dcmdrle.man
++ dcmdata/docs/dcmdump.man
++ dcmdata/docs/dcmftest.man
++ dcmdata/docs/dcmgpdir.man
++ dcmdata/docs/dcmodify.man
++ dcmdata/docs/dump2dcm.man
++ dcmdata/docs/img2dcm.man
++ dcmdata/docs/pdf2dcm.man
++ dcmdata/docs/xml2dcm.man
++ dcmimage/docs/dcm2pnm.man
++ dcmimage/docs/dcmquant.man
++ dcmimage/docs/dcmscale.man
++ dcmimgle/docs/dcmdspfn.man
++ dcmimgle/docs/dcod2lum.man
++ dcmimgle/docs/dconvlum.man
++ dcmjpeg/docs/dcmcjpeg.man
++ dcmjpeg/docs/dcmdjpeg.man
++ dcmjpeg/docs/dcmj2pnm.man
++ dcmjpeg/docs/dcmmkdir.man
++ dcmjpls/docs/dcmcjpls.man
++ dcmjpls/docs/dcmdjpls.man
++ dcmjpls/docs/dcml2pnm.man
++ dcmnet/docs/dcmrecv.man
++ dcmnet/docs/dcmsend.man
++ dcmnet/docs/echoscu.man
++ dcmnet/docs/findscu.man
++ dcmnet/docs/getscu.man
++ dcmnet/docs/movescu.man
++ dcmnet/docs/storescp.man
++ dcmnet/docs/storescu.man
++ dcmnet/docs/termscu.man
++ dcmpstat/docs/dcmmkcrv.man
++ dcmpstat/docs/dcmmklut.man
++ dcmpstat/docs/dcmp2pgm.man
++ dcmpstat/docs/dcmprscp.man
++ dcmpstat/docs/dcmprscu.man
++ dcmpstat/docs/dcmpschk.man
++ dcmpstat/docs/dcmpsmk.man
++ dcmpstat/docs/dcmpsprt.man
++ dcmpstat/docs/dcmpsrcv.man
++ dcmpstat/docs/dcmpssnd.man
++ dcmqrdb/docs/dcmqridx.man
++ dcmqrdb/docs/dcmqrscp.man
++ dcmqrdb/docs/dcmqrti.man
++ dcmrt/docs/drtdump.man
++ dcmsign/docs/dcmsign.man
++ dcmsr/docs/dsr2html.man
++ dcmsr/docs/dsr2xml.man
++ dcmsr/docs/dsrdump.man
++ dcmsr/docs/xml2dsr.man
++ dcmwlm/docs/wlmscpfs.man
++
++**** Changes from 2013.11.26 (riesmeier)
++
++- Fixed issue with test "ofstd_markup_6" (Win32):
++ Fixed issue with test "ofstd_markup_6" not running successfully on Windows
++ systems (due to an incorrect length of the input string value).
++ Thanks to forum user "ghleclerc" for the report.
++ Affects: ofstd/tests/tmarkup.cc
++
++- Fixed minor Doxygen-related issue in documentation:
++ Doxygen requires three slashes "///" for documenting entities, e.g. members
++ of an enumeration type. One slash was missing for CS_UTF8 in E_CharacterSet.
++ Also fixed various typos in comments.
++ Affects: dcmsr/include/dcmtk/dcmsr/dsrtypes.h
++
++**** Changes from 2013.11.25 (riesmeier)
++
++- Fixed name of PN component in Native DICOM Model:
++ Fixed name of first PersonName (PN) component in Native DICOM Model.
++ According to Supplement 166 (QIDO-RS) the XML element name is "Alphabetic"
++ (and not "SingleByte" as it was before).
++ Affects: dcmdata/libsrc/dcvrpn.cc
++
++**** Changes from 2013.11.21 (riesmeier)
++
++- Fixed minor Doxygen-related issue in documentation:
++ Doxygen, the tool that is used for generating the HTML documentation from
++ source code, requires that a "." is escaped under certain conditions, e.g.
++ if this character does not define the end of a sentence as used for short
++ class descriptions.
++ Affects: ofstd/include/dcmtk/ofstd/offile.h
++
++**** Changes from 2013.11.19 (riesmeier)
++
++- Added new option for disabling the VR checker:
++ Added new command line option that allows for disabling the VR checker by
++ setting the recently introduced global "dcmdata" flag accordingly.
++ Affects: dcmsr/apps/dsr2html.cc
++ dcmsr/apps/dsr2xml.cc
++ dcmsr/apps/dsrdump.cc
++ dcmsr/docs/dsr2html.man
++ dcmsr/docs/dsr2xml.man
++ dcmsr/docs/dsrdump.man
++
++- Added global flag for disabling the VR checker:
++ Added global flag that allows for disabling the VR checker used by the
++ various checkStringValue() methods. Since this checker is currently limited
++ to ASCII and Latin-1, and the detection of the character set might fail for
++ incorrectly encoded DICOM datasets, this check can be disabled globally.
++ Affects: dcmdata/include/dcmtk/dcmdata/dcbytstr.h
++ dcmdata/include/dcmtk/dcmdata/dcvrpn.h
++ dcmdata/libsrc/dcbytstr.cc
++ dcmdata/libsrc/dcvrda.cc
++ dcmdata/libsrc/dcvrdt.cc
++ dcmdata/libsrc/dcvrpn.cc
++ dcmdata/libsrc/dcvrtm.cc
++
++**** Changes from 2013.11.18 (riesmeier)
++
++- Removed redundant and outdated Word document:
++ Removed redundant and outdated Word document "wwwapp.doc", which used to
++ contain the same information as "wwwapp.txt". Closes DCMTK Feature #556.
++ Removed: dcmwlm/docs/wwwapp.doc
++
++- Added missing break statements to switch cases:
++ Added missing break statements to switch cases, which previously resulted in
++ a wrong return value of the CheckMatchingKey() method. Thanks to Peter Klotz
++ <Peter.Klotz at ith-icoserve.com> for the bug report and patch.
++ Affects: dcmwlm/libsrc/wlds.cc
++
++**** Changes from 2013.11.17 (schlachter)
++
++- Don't set the defines for thread local storage support incorrectly:
++ If DCMTK_LOG4CPLUS_HAVE_TLS_SUPPORT is defined, the code uses it to mark
++ variables as thread-local and expects the compiler to implement this.
++ Otherwise, calls into the thread library are used. So defining it to an
++ empty value makes oflog thread-unsafe. Thanks to Peter Klotz
++ <Peter.Klotz at ith-icoserve.com> for the report and a test case.
++ Affects: oflog/include/dcmtk/oflog/config/defines.h
++
++**** Changes from 2013.11.15 (riesmeier)
++
++- Avoid CMake warning on non-installable files.
++ Affects: dcmdata/libsrc/CMakeLists.txt
++
++- Fixed build issue with shared libraries (Win32):
++ Fixed link errors on Windows systems when building with BUILD_SHARED_LIB set
++ to "ON". This caused the executables "mkdictbi" and "mkdeftag" to fail.
++ Thanks to forum user "lars_matthaeus" for the original report.
++ Affects: dcmdata/libsrc/CMakeLists.txt
++
++- Removed trailing white spaces from man pages files.
++ Affects: doxygen/manpages/man1/*
++
+ **** Changes from 2013.11.14 (thiel)
++
+ - Updated man pages for new development snapshot.
+ Affects: doxygen/manpages/man1/*
+
+@@ -14,6 +227,8 @@ Changes between releases are documented
+ same time. Thus a parameter was added in order to disable the
+ initialization code if desired. Thanks to Peter Klotz
+ <Peter.Klotz at ith-icoserve.com> for the report and suggested patch.
++ Affects: dcmtls/include/dcmtk/dcmtls/tlslayer.h
++ dcmtls/libsrc/tlslayer.cc
+
+ **** Changes from 2013.11.13 (riesmeier)
+
+--- dcmtk-3.6.1~20131114.orig/dcmsign/docs/dcmsign.man
++++ dcmtk-3.6.1~20131114/dcmsign/docs/dcmsign.man
+@@ -224,8 +224,8 @@ although only RSA keys are defines in th
+ standard.
+
+ Private Keys are expected in PEM or DER encoding. PEM is recommended (and
+-default) because this allows to keep private keys in encrypted form. Command
+-line options control the behaviour of \b dcmsign when an encrypted PEM key is
++default) because this allows one to keep private keys in encrypted form. Command
++line options control the behavior of \b dcmsign when an encrypted PEM key is
+ opened (see above). In general it is not recommended to specify the encryption
+ password in the command line because the command line may be visible to other
+ processes in the system, e.g. "ps -ef".
+@@ -297,7 +297,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -306,7 +306,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -318,7 +318,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -328,6 +328,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2000-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2000-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+\ No newline at end of file
+--- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmj2pnm.man
++++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmj2pnm.man
+@@ -500,7 +500,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -509,7 +509,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -521,7 +521,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -542,6 +542,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2001-2011 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2001-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmmkdir.man
++++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmmkdir.man
+@@ -55,7 +55,7 @@ Currently the following profiles are sup
+ \li Hemodynamic Waveform Interchange on Diskette (STD-WVFM-HD-FD)
+
+ This tool extends \b dcmgpdir which can only create General Purpose \e DICOMDIR
+-files. The default behaviour of \b dcmmkdir (with \e --general-purpose) is
++files. The default behavior of \b dcmmkdir (with \e --general-purpose) is
+ equivalent to that of \b dcmgpdir.
+
+ \section parameters PARAMETERS
+@@ -351,18 +351,18 @@ length encoding in sequences and items:
+
+ \section notes NOTES
+
+-All files specified on the command line (or discovered by recursivly examining
++All files specified on the command line (or discovered by recursively examining
+ the contents of directories with the \e +r option) are first evaluated for
+ their compatibility with the specified Media Storage Application Profile (Part
+ 11). Only appropriate files encoded using one of the allowed Transfer Syntaxes
+ will be accepted. Files having invalid filenames will be rejected (the rules
+ can be relaxed via the \e +m option). Files missing required attributes will
+-be rejected (the \e +I option can relax this behaviour).
++be rejected (the \e +I option can relax this behavior).
+
+ A \e DICOMDIR file will only be constructed if all files have passed initial
+ tests.
+
+-The \b dcmmkdir utility also allows to append new entries to and to update
++The \b dcmmkdir utility also allows one to append new entries to and to update
+ existing entries in a \e DICOMDIR file. Using option \e +A new entries are
+ only appended to the DICOMDIR, i.e. existing records like the ones for PATIENT
+ information are not updated. Using option \e +U also existing records are
+@@ -418,7 +418,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -427,7 +427,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -439,7 +439,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -453,6 +453,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2001-2011 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2001-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmdjpeg.man
++++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmdjpeg.man
+@@ -70,7 +70,7 @@ input file format:
+ -f --read-dataset
+ read data set without file meta information
+
+- # This option allows to decompress JPEG compressed DICOM objects that
++ # This option allows one to decompress JPEG compressed DICOM objects that
+ # have been stored as dataset without meta-header. Such a thing should
+ # not exist since the transfer syntax cannot be reliably determined,
+ # without meta-header but unfortunately it does.
+@@ -288,7 +288,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -297,7 +297,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -309,7 +309,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -323,6 +323,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2001-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2001-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmcjpeg.man
++++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmcjpeg.man
+@@ -546,7 +546,7 @@ A few examples:
+
+ The user is responsible for making sure that the compressed images he creates
+ are compliant with the DICOM standard. If in question, the \b dcmcjpeg utility
+-allows to convert an image to secondary capture - this SOP class does not pose
++allows one to convert an image to secondary capture - this SOP class does not pose
+ restrictions as the ones mentioned above.
+
+ With version DCMTK 3.5.4 a new encoder for truely lossless JPEG compression was
+@@ -633,7 +633,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -642,7 +642,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -654,7 +654,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -668,6 +668,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2001-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2001-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/config/Makefile.def.in
++++ dcmtk-3.6.1~20131114/config/Makefile.def.in
+@@ -52,7 +52,8 @@ DEBUG = @DEBUG@
+ #
+
+ # We want the old behavior of OFString(NULL) for now, no crashes.
+-GLOBALDEFS = @DEFS@ -DDCMTK_BUILD_DATE=\"2013-11-14\" -DUSE_NULL_SAFE_OFSTRING -DDCMTK_BUILD_IN_PROGRESS
++GLOBALDEFS = @DEFS@ -DUSE_NULL_SAFE_OFSTRING -DDCMTK_BUILD_IN_PROGRESS
++# -DDCMTK_BUILD_DATE=\"YYYY-MM-DD\"
+
+ #
+ # ARCH defines special machine archtecture compiler settings
+--- dcmtk-3.6.1~20131114.orig/ofstd/include/dcmtk/ofstd/offile.h
++++ dcmtk-3.6.1~20131114/ofstd/include/dcmtk/ofstd/offile.h
+@@ -1,6 +1,6 @@
+ /*
+ *
+- * Copyright (C) 2006-2012, OFFIS e.V.
++ * Copyright (C) 2006-2013, OFFIS e.V.
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation were developed by
+@@ -96,7 +96,7 @@ typedef int offile_errno_t;
+
+
+ /** class for managing filenames consisting either of conventional (8-bit) or
+- * wide (e.g. 16-bit) characters. The wide character support is currently
++ * wide (e.g.\ 16-bit) characters. The wide character support is currently
+ * Windows-specific because most other operating systems use UTF-8, which is
+ * compatible with conventional 8-bit character strings.
+ */
+@@ -397,7 +397,8 @@ public:
+ * associated with a standard text stream (stderr, stdin, or stdout).
+ * @param filename path to file
+ * @param modes "r", "w" or "a" with possible modifiers "+", "b"
+- * @return true if stream was successfully created, false otherwise, in which case the error code is set.
++ * @return true if stream was successfully created, false otherwise, in
++ * which case the error code is set.
+ */
+ OFBool freopen(const char *filename, const char *modes)
+ {
+@@ -414,7 +415,8 @@ public:
+ /** generates a unique temporary filename. The temporary file is then opened
+ * in binary read/write (w+b) mode. The file will be automatically deleted
+ * when it is closed or the program terminates normally.
+- * @return true if stream was successfully created, false otherwise, in which case the error code is set.
++ * @return true if stream was successfully created, false otherwise, in
++ * which case the error code is set.
+ */
+ OFBool tmpfile()
+ {
+@@ -463,7 +465,8 @@ public:
+ /** waits for the associated process (created with popen) to terminate and
+ * returns the exit status of the command as returned by wait4.
+ * In this implementation, fclose and pclose can be used synonymously.
+- * @return process ID of the child which exited, or -1 on error, in which case the error code is set
++ * @return process ID of the child which exited, or -1 on error, in which
++ * case the error code is set
+ */
+ int pclose() { return fclose(); }
+
+--- dcmtk-3.6.1~20131114.orig/ofstd/tests/tmarkup.cc
++++ dcmtk-3.6.1~20131114/ofstd/tests/tmarkup.cc
+@@ -114,7 +114,7 @@ OFTEST(ofstd_markup_5)
+ OFTEST(ofstd_markup_6)
+ {
+ OFString resultStr;
+- const size_t sourceLen = 37;
++ const size_t sourceLen = 34;
+ // XML: source string contains a NULL byte!
+ const OFString sourceStr(("This is a test\0, with a NULL byte."), sourceLen);
+ const OFString markupStr = "This is a test, with a NULL byte.";
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages.cfg
++++ dcmtk-3.6.1~20131114/doxygen/manpages.cfg
+@@ -32,7 +32,7 @@ PROJECT_NAME = "OFFIS DCMTK"
+ # This could be handy for archiving the generated documentation or
+ # if some version control system is used.
+
+-PROJECT_NUMBER = "@DCMTK_VERSION@ 20131114"
++PROJECT_NUMBER = "@DCMTK_VERSION@"
+
+ # Using the PROJECT_BRIEF tag one can provide an optional one line description
+ # for a project that appears at the top of each page and should give viewer
+--- dcmtk-3.6.1~20131114.orig/doxygen/htmldocs.cfg
++++ dcmtk-3.6.1~20131114/doxygen/htmldocs.cfg
+@@ -32,7 +32,7 @@ PROJECT_NAME = DCMTK
+ # This could be handy for archiving the generated documentation or
+ # if some version control system is used.
+
+-PROJECT_NUMBER = "Version @DCMTK_VERSION@ 20131114"
++PROJECT_NUMBER = "Version @DCMTK_VERSION@"
+
+ # Using the PROJECT_BRIEF tag one can provide an optional one line description
+ # for a project that appears at the top of each page and should give viewer
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmcjpls.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmcjpls.1
+@@ -1,7 +1,7 @@
+ .TH "dcmcjpls" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmcjpls \- Encode DICOM file to JPEG-LS transfer syntax
++dcmcjpls \- Encode DICOM file to JPEG-LS transfer syntax
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -329,4 +329,4 @@ The default behaviour should be preferre
+ \fBdcmdjpls\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2009-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2009-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmftest.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmftest.1
+@@ -1,7 +1,7 @@
+ .TH "dcmftest" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmftest \- Test if file uses DICOM part 10 format
++dcmftest \- Test if file uses DICOM part 10 format
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -27,4 +27,4 @@ All files specified on the command line
+ \fBdcmgpdir\fP(1), \fBdcmmkdir\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1997-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1997-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmpssnd.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmpssnd.1
+@@ -1,7 +1,7 @@
+ .TH "dcmpssnd" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmpssnd \- Network send for presentation state viewer
++dcmpssnd \- Network send for presentation state viewer
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -83,4 +83,4 @@ The default behaviour should be preferre
+ \fBdcmpsrcv\fP(1), \fBstorescu\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1998-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1998-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmgpdir.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmgpdir.1
+@@ -1,7 +1,7 @@
+ .TH "dcmgpdir" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmgpdir \- Create a general purpose DICOMDIR
++dcmgpdir \- Create a general purpose DICOMDIR
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -17,7 +17,7 @@ Currently, the following profiles are su
+ .PP
+ .PD 0
+ .IP "\(bu" 2
+-General Purpose CD-R Interchange (STD-GEN-CD)
++General Purpose CD-R Interchange (STD-GEN-CD)
+ .IP "\(bu" 2
+ General Purpose Interchange on DVD-RAM Media (STD-GEN-DVD-RAM)
+ .PP
+@@ -221,4 +221,4 @@ The default behaviour should be preferre
+ \fBdcmmkdir\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1996-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1996-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmpsprt.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmpsprt.1
+@@ -1,7 +1,7 @@
+ .TH "dcmpsprt" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmpsprt \- Read DICOM images and presentation states and render print job
++dcmpsprt \- Read DICOM images and presentation states and render print job
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -273,4 +273,4 @@ The default behaviour should be preferre
+ \fBdcmprscu\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1999-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1999-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmpschk.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmpschk.1
+@@ -1,7 +1,7 @@
+ .TH "dcmpschk" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmpschk \- Checking tool for presentation states
++dcmpschk \- Checking tool for presentation states
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -82,4 +82,4 @@ The \fBdcmpschk\fP utility will attempt
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2000-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2000-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmquant.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmquant.1
+@@ -1,7 +1,7 @@
+ .TH "dcmquant" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmquant \- Convert DICOM color images to palette color
++dcmquant \- Convert DICOM color images to palette color
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -237,4 +237,4 @@ The \fBdcmquant\fP utility will attempt
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2001-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2001-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmconv.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmconv.1
+@@ -1,7 +1,7 @@
+ .TH "dcmconv" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmconv \- Convert DICOM file encoding
++dcmconv \- Convert DICOM file encoding
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -317,4 +317,4 @@ The default behaviour should be preferre
+ \fBdcmdump\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1994-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1994-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmmklut.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmmklut.1
+@@ -1,7 +1,7 @@
+ .TH "dcmmklut" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmmklut \- Create DICOM look-up tables
++dcmmklut \- Create DICOM look-up tables
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -188,4 +188,4 @@ The default behaviour should be preferre
+ \fI<datadir>/philips\&.lut\fP - sample LUT in text format
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1998-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1998-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmdrle.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmdrle.1
+@@ -1,7 +1,7 @@
+ .TH "dcmdrle" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmdrle \- Decode RLE-compressed DICOM file
++dcmdrle \- Decode RLE-compressed DICOM file
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -205,4 +205,4 @@ The default behaviour should be preferre
+ \fBdcmcrle\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2002-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany
++Copyright (C) 2002-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dump2dcm.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dump2dcm.1
+@@ -1,7 +1,7 @@
+ .TH "dump2dcm" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dump2dcm \- Convert ASCII dump to DICOM file
++dump2dcm \- Convert ASCII dump to DICOM file
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -262,4 +262,4 @@ The default behaviour should be preferre
+ \fBdcmdump\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1996-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1996-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/wlmscpfs.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/wlmscpfs.1
+@@ -1,7 +1,7 @@
+ .TH "wlmscpfs" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-wlmscpfs \- DICOM Basic Worklist Management SCP (based on data files)
++wlmscpfs \- DICOM Basic Worklist Management SCP (based on data files)
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -240,7 +240,7 @@ Currently, the \fBwlmscpfs\fP applicatio
+ .fi
+ .PP
+ .PP
+-As return keys the following attributes are currently supported by \fBwlmscpfs:\fP
++As return keys the following attributes are currently supported by \fBwlmscpfs:\fP
+ .PP
+ .PP
+ .nf
+@@ -357,4 +357,4 @@ The \fBwlmscpfs\fP utility will attempt
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1996-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1996-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dsr2html.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dsr2html.1
+@@ -1,7 +1,7 @@
+ .TH "dsr2html" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dsr2html \- Render DICOM SR file and data set to HTML/XHTML
++dsr2html \- Render DICOM SR file and data set to HTML/XHTML
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -281,4 +281,4 @@ The default behaviour should be preferre
+ \fBdcmconv\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2000-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2000-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmsign.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmsign.1
+@@ -1,7 +1,7 @@
+ .TH "dcmsign" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmsign \- Sign and Verify DICOM Files
++dcmsign \- Sign and Verify DICOM Files
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -17,13 +17,13 @@ Five digital signature operations are su
+ .PP
+ .PD 0
+ .IP "\(bu" 2
+-verification of all signatures in the DICOM file
++verification of all signatures in the DICOM file
+ .IP "\(bu" 2
+-creation of a new digital signature located in the main dataset,
++creation of a new digital signature located in the main dataset,
+ .IP "\(bu" 2
+-creation of a new digital signature in an item of a sequence embedded within the dataset,
++creation of a new digital signature in an item of a sequence embedded within the dataset,
+ .IP "\(bu" 2
+-removal of a single digital signature from the DICOM file, and
++removal of a single digital signature from the DICOM file, and
+ .IP "\(bu" 2
+ removal of all digital signatures from the DICOM file\&.
+ .PP
+@@ -277,4 +277,4 @@ The \fBdcmsign\fP utility will attempt t
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2000-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2000-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmdump.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmdump.1
+@@ -1,7 +1,7 @@
+ .TH "dcmdump" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmdump \- Dump DICOM file and data set
++dcmdump \- Dump DICOM file and data set
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -332,4 +332,4 @@ The default behaviour should be preferre
+ \fBdump2dcm\fP(1), \fBdcmconv\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1994-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1994-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmprscu.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmprscu.1
+@@ -1,7 +1,7 @@
+ .TH "dcmprscu" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmprscu \- Print spooler for presentation state viewer
++dcmprscu \- Print spooler for presentation state viewer
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -146,4 +146,4 @@ The default behaviour should be preferre
+ \fBdcmprscp\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1999-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1999-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmdspfn.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmdspfn.1
+@@ -1,7 +1,7 @@
+ .TH "dcmdspfn" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmdspfn \- Export standard display curves to a text file
++dcmdspfn \- Export standard display curves to a text file
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -130,11 +130,11 @@ Command line options are distinguished f
+ In addition, one or more command files can be specified using an '@' sign as a prefix to the filename (e\&.g\&. \fI at command\&.txt\fP)\&. Such a command argument is replaced by the content of the corresponding text file (multiple whitespaces are treated as a single separator unless they appear between two quotation marks) prior to any further evaluation\&. Please note that a command file cannot contain another command file\&. This simple but effective approach allows to summarize common combinations of options/parameters and avoids longish and confusing command lines (an example is provided in file \fI<datadir>/dumppat\&.txt\fP)\&.
+ .SH "FILES"
+ .PP
+-\fI<datadir>/camera\&.lut\fP - sample characteristics file of a camera
++\fI<datadir>/camera\&.lut\fP - sample characteristics file of a camera
+ .br
+-\fI<datadir>/monitor\&.lut\fP - sample characteristics file of a monitor
++\fI<datadir>/monitor\&.lut\fP - sample characteristics file of a monitor
+ .br
+-\fI<datadir>/printer\&.lut\fP - sample characteristics file of a printer
++\fI<datadir>/printer\&.lut\fP - sample characteristics file of a printer
+ .br
+ \fI<datadir>/scanner\&.lut\fP - sample characteristics file of a scanner
+ .SH "SEE ALSO"
+@@ -142,4 +142,4 @@ In addition, one or more command files c
+ \fBdconvlum\fP(1), \fBdcod2lum\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1999-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1999-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/getscu.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/getscu.1
+@@ -1,7 +1,7 @@
+ .TH "getscu" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-getscu \- DICOM retrieve (C-GET) SCU
++getscu \- DICOM retrieve (C-GET) SCU
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -452,4 +452,4 @@ The default behaviour should be preferre
+ \fBfindscu\fP(1), \fBmovescu\fP(1), \fBdump2dcm\fP(1), \fBdcmodify\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2011-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2011-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmp2pgm.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmp2pgm.1
+@@ -1,7 +1,7 @@
+ .TH "dcmp2pgm" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmp2pgm \- Read DICOM image and presentation state and render bitmap
++dcmp2pgm \- Read DICOM image and presentation state and render bitmap
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -104,4 +104,4 @@ The default behaviour should be preferre
+ \fI<etcdir>/dcmpstat\&.cfg\fP - sample configuration file
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1998-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1998-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dconvlum.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dconvlum.1
+@@ -1,7 +1,7 @@
+ .TH "dconvlum" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dconvlum \- Convert VeriLUM files to DCMTK display files
++dconvlum \- Convert VeriLUM files to DCMTK display files
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -33,4 +33,4 @@ See DICOM standard part 14 for more deta
+ \fBdcmdspfn\fP(1), \fBdcm2pnm\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1999-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1999-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmqrti.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmqrti.1
+@@ -1,7 +1,7 @@
+ .TH "dcmqrti" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmqrti \- The Terminal Initiator Telnet Client Program
++dcmqrti \- The Terminal Initiator Telnet Client Program
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -245,7 +245,7 @@ The "send" command exists in three forms
+ .PP
+ The 'study' keyword means send all images in the current study\&. When invoked with an argument index, the specified study in the current database will be stored\&. The 'series' keyword means send all images in the current series\&. When invoked with an argument index, the specified series in the current study will be stored\&. The 'image' keyword means send the current image\&. When invoked with an argument index, the specified image in the current series will be stored\&.
+ .PP
+-When an image is stored, a message will be printed of the form:
++When an image is stored, a message will be printed of the form:
+ .PP
+ .nf
+ ------------------------------------------------------------
+@@ -313,9 +313,9 @@ The \fBdcmqrti\fP utility will attempt t
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "FILES"
+ .PP
+-\fI<docdir>/dcmqrcnf\&.txt\fP - configuration information
++\fI<docdir>/dcmqrcnf\&.txt\fP - configuration information
+ .br
+-\fI<docdir>/dcmqrset\&.txt\fP - setup information
++\fI<docdir>/dcmqrset\&.txt\fP - setup information
+ .br
+ \fI<etcdir>/dcmqrscp\&.cfg\fP - example configuration file
+ .SH "SEE ALSO"
+@@ -323,4 +323,4 @@ The default behaviour should be preferre
+ \fBdcmqrscp\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1993-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1993-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmqridx.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmqridx.1
+@@ -1,7 +1,7 @@
+ .TH "dcmqridx" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmqridx \- Register a DICOM image file in an image database index file
++dcmqridx \- Register a DICOM image file in an image database index file
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -84,4 +84,4 @@ The default behaviour should be preferre
+ \fBdcmqrscp\fP(1), \fBdcmqrti\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1993-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1993-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmpsrcv.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmpsrcv.1
+@@ -1,7 +1,7 @@
+ .TH "dcmpsrcv" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmpsrcv \- Network receive for presentation state viewer
++dcmpsrcv \- Network receive for presentation state viewer
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -78,4 +78,4 @@ The default behaviour should be preferre
+ \fBdcmpssnd\fP(1), \fBstorescp\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1998-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1998-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/termscu.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/termscu.1
+@@ -1,7 +1,7 @@
+ .TH "termscu" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-termscu \- DICOM termination SCU
++termscu \- DICOM termination SCU
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -98,4 +98,4 @@ The \fBtermscu\fP utility will attempt t
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2005-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2005-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmdjpls.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmdjpls.1
+@@ -1,7 +1,7 @@
+ .TH "dcmdjpls" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmdjpls \- Decode JPEG-LS compressed DICOM file
++dcmdjpls \- Decode JPEG-LS compressed DICOM file
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -234,4 +234,4 @@ The default behaviour should be preferre
+ \fBdcmcjpls\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2009-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2009-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmodify.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmodify.1
+@@ -1,7 +1,7 @@
+ .TH "dcmodify" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmodify \- Modify DICOM files
++dcmodify \- Modify DICOM files
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -436,4 +436,4 @@ The \fBdcmodify\fP utility will attempt
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2003-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2003-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcod2lum.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcod2lum.1
+@@ -1,7 +1,7 @@
+ .TH "dcod2lum" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcod2lum \- Convert hardcopy characteristic curve file to softcopy format
++dcod2lum \- Convert hardcopy characteristic curve file to softcopy format
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -34,11 +34,11 @@ out-file softcopy characteristic curve
+ The format of both input and output file is described the documentation of the \fBdcmdspfn\fP command line tool\&. In addition, the \fIdata\fP folder contains sample characteristics file monitors, cameras, printers and scanners\&.
+ .SH "FILES"
+ .PP
+-\fI<datadir>/camera\&.lut\fP - sample characteristics file of a camera
++\fI<datadir>/camera\&.lut\fP - sample characteristics file of a camera
+ .br
+-\fI<datadir>/monitor\&.lut\fP - sample characteristics file of a monitor
++\fI<datadir>/monitor\&.lut\fP - sample characteristics file of a monitor
+ .br
+-\fI<datadir>/printer\&.lut\fP - sample characteristics file of a printer
++\fI<datadir>/printer\&.lut\fP - sample characteristics file of a printer
+ .br
+ \fI<datadir>/scanner\&.lut\fP - sample characteristics file of a scanner
+ .SH "SEE ALSO"
+@@ -46,4 +46,4 @@ The format of both input and output file
+ \fBdcmdspfn\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2002-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2002-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/storescp.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/storescp.1
+@@ -1,7 +1,7 @@
+ .TH "storescp" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-storescp \- DICOM storage (C-STORE) SCP
++storescp \- DICOM storage (C-STORE) SCP
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -413,7 +413,7 @@ The other \fI--sort-xxx\fP options work
+ .fi
+ .PP
+ .PP
+-and for option \fI--sort-on-patientname\fP
++and for option \fI--sort-on-patientname\fP
+ .PP
+ .PP
+ .nf
+@@ -439,13 +439,13 @@ Option \fI--exec-on-reception\fP allows
+ .PP
+ .PD 0
+ .IP "\(bu" 2
+-\fB#p:\fP complete path to the output directory into which the last DICOM object was stored (not available with option \fI--ignore\fP though)
++\fB#p:\fP complete path to the output directory into which the last DICOM object was stored (not available with option \fI--ignore\fP though)
+ .IP "\(bu" 2
+-\fB#f:\fP filename of the current output file (not available with option \fI--ignore\fP though)
++\fB#f:\fP filename of the current output file (not available with option \fI--ignore\fP though)
+ .IP "\(bu" 2
+-\fB#a:\fP calling application entity title of the peer Storage SCU
++\fB#a:\fP calling application entity title of the peer Storage SCU
+ .IP "\(bu" 2
+-\fB#c:\fP called application entity title used by the peer Storage SCU to address \fBstorescp\fP
++\fB#c:\fP called application entity title used by the peer Storage SCU to address \fBstorescp\fP
+ .IP "\(bu" 2
+ \fB#r:\fP calling presentation address, i\&.e\&. hostname or IP address of the peer Storage SCU
+ .PP
+@@ -684,7 +684,7 @@ The \fBstorescp\fP utility will attempt
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "FILES"
+ .PP
+-\fI<docdir>/asconfig\&.txt\fP - configuration file documentation
++\fI<docdir>/asconfig\&.txt\fP - configuration file documentation
+ .br
+ \fI<etcdir>/storescp\&.cfg\fP - example association negotiation profile
+ .SH "SEE ALSO"
+@@ -692,4 +692,4 @@ The default behaviour should be preferre
+ \fBstorescu\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1996-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1996-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmj2pnm.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmj2pnm.1
+@@ -1,7 +1,7 @@
+ .TH "dcmj2pnm" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmj2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF, JPEG or BMP
++dcmj2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF, JPEG or BMP
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -434,11 +434,11 @@ The following preferred interpolation al
+ .PP
+ .PD 0
+ .IP "\(bu" 2
+-1 = free scaling algorithm with interpolation from pbmplus toolkit
++1 = free scaling algorithm with interpolation from pbmplus toolkit
+ .IP "\(bu" 2
+-2 = free scaling algorithm with interpolation from c't magazine
++2 = free scaling algorithm with interpolation from c't magazine
+ .IP "\(bu" 2
+-3 = magnification algorithm with bilinear interpolation from Eduard Stanescu
++3 = magnification algorithm with bilinear interpolation from Eduard Stanescu
+ .IP "\(bu" 2
+ 4 = magnification algorithm with bicubic interpolation from Eduard Stanescu
+ .PP
+@@ -485,11 +485,11 @@ The \fBdcmj2pnm\fP utility will attempt
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "FILES"
+ .PP
+-\fI<datadir>/camera\&.lut\fP - sample characteristics file of a camera
++\fI<datadir>/camera\&.lut\fP - sample characteristics file of a camera
+ .br
+-\fI<datadir>/monitor\&.lut\fP - sample characteristics file of a monitor
++\fI<datadir>/monitor\&.lut\fP - sample characteristics file of a monitor
+ .br
+-\fI<datadir>/printer\&.lut\fP - sample characteristics file of a printer
++\fI<datadir>/printer\&.lut\fP - sample characteristics file of a printer
+ .br
+ \fI<datadir>/scanner\&.lut\fP - sample characteristics file of a scanner
+ .SH "SEE ALSO"
+@@ -497,4 +497,4 @@ The default behaviour should be preferre
+ \fBdcm2pnm\fP(1), \fBimg2dcm\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2001-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2001-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/findscu.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/findscu.1
+@@ -1,7 +1,7 @@
+ .TH "findscu" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-findscu \- DICOM query (C-FIND) SCU
++findscu \- DICOM query (C-FIND) SCU
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -331,4 +331,4 @@ The default behaviour should be preferre
+ \fBmovescu\fP(1), \fBdump2dcm\fP(1), \fBdcmodify\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1994-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1994-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmscale.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmscale.1
+@@ -1,7 +1,7 @@
+ .TH "dcmscale" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmscale \- Scale DICOM images
++dcmscale \- Scale DICOM images
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -201,11 +201,11 @@ The following preferred interpolation al
+ .PP
+ .PD 0
+ .IP "\(bu" 2
+-1 = free scaling algorithm with interpolation from pbmplus toolkit
++1 = free scaling algorithm with interpolation from pbmplus toolkit
+ .IP "\(bu" 2
+-2 = free scaling algorithm with interpolation from c't magazine
++2 = free scaling algorithm with interpolation from c't magazine
+ .IP "\(bu" 2
+-3 = magnification algorithm with bilinear interpolation from Eduard Stanescu
++3 = magnification algorithm with bilinear interpolation from Eduard Stanescu
+ .IP "\(bu" 2
+ 4 = magnification algorithm with bicubic interpolation from Eduard Stanescu
+ .PP
+@@ -228,4 +228,4 @@ The \fBdcmscale\fP utility will attempt
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2002-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2002-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmrecv.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmrecv.1
+@@ -1,7 +1,7 @@
+ .TH "dcmrecv" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmrecv \- Simple DICOM storage SCP (receiver)
++dcmrecv \- Simple DICOM storage SCP (receiver)
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -274,7 +274,7 @@ The \fBdcmrecv\fP utility will attempt t
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "FILES"
+ .PP
+-\fI<docdir>/asconfig\&.txt\fP - configuration file documentation
++\fI<docdir>/asconfig\&.txt\fP - configuration file documentation
+ .br
+ \fI<etcdir>/storescp\&.cfg\fP - example association negotiation profile
+ .SH "SEE ALSO"
+@@ -282,4 +282,4 @@ The default behaviour should be preferre
+ \fBdcmsend\fP(1), \fBstorescu\fP(1), \fBstorescp\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dsrdump.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dsrdump.1
+@@ -1,7 +1,7 @@
+ .TH "dsrdump" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dsrdump \- Dump DICOM SR file and data set
++dsrdump \- Dump DICOM SR file and data set
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -226,4 +226,4 @@ The default behaviour should be preferre
+ \fBdcmconv\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2000-2013 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~20131114.orig/doxygen/manpages/man1/dcmcrle.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmcrle.1
+@@ -1,7 +1,7 @@
+ .TH "dcmcrle" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmcrle \- Encode DICOM file to RLE transfer syntax
++dcmcrle \- Encode DICOM file to RLE transfer syntax
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -206,4 +206,4 @@ The default behaviour should be preferre
+ \fBdcmdrle\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2002-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2002-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmdjpeg.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmdjpeg.1
+@@ -1,7 +1,7 @@
+ .TH "dcmdjpeg" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmdjpeg \- Decode JPEG-compressed DICOM file
++dcmdjpeg \- Decode JPEG-compressed DICOM file
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -279,4 +279,4 @@ The default behaviour should be preferre
+ \fBdcmcjpeg\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2001-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2001-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/pdf2dcm.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/pdf2dcm.1
+@@ -1,7 +1,7 @@
+ .TH "pdf2dcm" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-pdf2dcm \- Convert PDF file to DICOM
++pdf2dcm \- Convert PDF file to DICOM
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -131,4 +131,4 @@ The default behaviour should be preferre
+ \fBdcm2pdf\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2005-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2005-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmpsmk.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmpsmk.1
+@@ -1,7 +1,7 @@
+ .TH "dcmpsmk" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmpsmk \- Create DICOM grayscale softcopy presentation state
++dcmpsmk \- Create DICOM grayscale softcopy presentation state
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -196,4 +196,4 @@ The \fBdcmpsmk\fP utility will attempt t
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1998-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1998-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcm2pdf.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcm2pdf.1
+@@ -1,7 +1,7 @@
+ .TH "dcm2pdf" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcm2pdf \- Extract PDF file from DICOM encapsulated PDF
++dcm2pdf \- Extract PDF file from DICOM encapsulated PDF
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -156,4 +156,4 @@ The default behaviour should be preferre
+ \fBpdf2dcm\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2007-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2007-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dsr2xml.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dsr2xml.1
+@@ -1,7 +1,7 @@
+ .TH "dsr2xml" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dsr2xml \- Convert DICOM SR file and data set to XML
++dsr2xml \- Convert DICOM SR file and data set to XML
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -230,4 +230,4 @@ The default behaviour should be preferre
+ \fBxml2dsr\fP(1), \fBdcmconv\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2000-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2000-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmcjpeg.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmcjpeg.1
+@@ -1,7 +1,7 @@
+ .TH "dcmcjpeg" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmcjpeg \- Encode DICOM file to JPEG transfer syntax
++dcmcjpeg \- Encode DICOM file to JPEG transfer syntax
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -534,9 +534,9 @@ A few examples:
+ .PP
+ .PD 0
+ .IP "\(bu" 2
+-MR images are required to have BitsAllocated=16\&.
++MR images are required to have BitsAllocated=16\&.
+ .IP "\(bu" 2
+-NM Images can only be encoded with MONOCHROME2 or PALETTE COLOR photometric interpretation but not with RGB or YBR_FULL (which effectively prevents compression)\&.
++NM Images can only be encoded with MONOCHROME2 or PALETTE COLOR photometric interpretation but not with RGB or YBR_FULL (which effectively prevents compression)\&.
+ .IP "\(bu" 2
+ Hardcopy Color images must have RGB color model which is a problem if lossy compression is to be performed\&.
+ .PP
+@@ -546,13 +546,13 @@ With version DCMTK 3\&.5\&.4 a new encod
+ .PP
+ .PD 0
+ .IP "\(bu" 2
+-Only source images with Bits Allocated 8 or 16 are supported
++Only source images with Bits Allocated 8 or 16 are supported
+ .IP "\(bu" 2
+-Options for color space conversions, windowing or pixel scaling are ignored or overridden
++Options for color space conversions, windowing or pixel scaling are ignored or overridden
+ .IP "\(bu" 2
+-Photometric Interpretations YBR_FULL_422, YBR_PARTIAL_422, YBR_PARTIAL_420, YBR_ICT, YBR_RCT are not supported
++Photometric Interpretations YBR_FULL_422, YBR_PARTIAL_422, YBR_PARTIAL_420, YBR_ICT, YBR_RCT are not supported
+ .IP "\(bu" 2
+-The encoder changes automatically Planar Configuration from 1 to 0 if necessary
++The encoder changes automatically Planar Configuration from 1 to 0 if necessary
+ .IP "\(bu" 2
+ The compression ratio can be lower than in \fI--pseudo-lossless\fP mode
+ .PP
+@@ -614,4 +614,4 @@ The default behaviour should be preferre
+ \fBdcmdjpeg\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2001-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2001-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmsend.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmsend.1
+@@ -1,7 +1,7 @@
+ .TH "dcmsend" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmsend \- Simple DICOM storage SCU (sender)
++dcmsend \- Simple DICOM storage SCU (sender)
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -316,4 +316,4 @@ The default behaviour should be preferre
+ \fBdcmrecv\fP(1), \fBstorescu\fP(1), \fBstorescp\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2011-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2011-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/storescu.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/storescu.1
+@@ -1,7 +1,7 @@
+ .TH "storescu" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-storescu \- DICOM storage (C-STORE) SCU
++storescu \- DICOM storage (C-STORE) SCU
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -446,7 +446,7 @@ The \fBstorescu\fP utility will attempt
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "FILES"
+ .PP
+-\fI<docdir>/asconfig\&.txt\fP - configuration file documentation
++\fI<docdir>/asconfig\&.txt\fP - configuration file documentation
+ .br
+ \fI<etcdir>/storescu\&.cfg\fP - example association negotiation profile
+ .SH "SEE ALSO"
+@@ -454,4 +454,4 @@ The default behaviour should be preferre
+ \fBstorescp\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1996-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1996-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/movescu.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/movescu.1
+@@ -1,7 +1,7 @@
+ .TH "movescu" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-movescu \- DICOM retrieve (C-MOVE) SCU
++movescu \- DICOM retrieve (C-MOVE) SCU
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -585,4 +585,4 @@ The default behaviour should be preferre
+ \fBfindscu\fP(1), \fBstorescp\fP(1), \fBdump2dcm\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1994-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1994-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmqrscp.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmqrscp.1
+@@ -1,7 +1,7 @@
+ .TH "dcmqrscp" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmqrscp \- DICOM image archive (central test node)
++dcmqrscp \- DICOM image archive (central test node)
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -872,9 +872,9 @@ The \fBdcmqrscp\fP utility will attempt
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "FILES"
+ .PP
+-\fI<docdir>/dcmqrcnf\&.txt\fP - configuration information
++\fI<docdir>/dcmqrcnf\&.txt\fP - configuration information
+ .br
+-\fI<docdir>/dcmqrset\&.txt\fP - setup information
++\fI<docdir>/dcmqrset\&.txt\fP - setup information
+ .br
+ \fI<etcdir>/dcmqrscp\&.cfg\fP - example configuration file
+ .SH "SEE ALSO"
+@@ -882,4 +882,4 @@ The default behaviour should be preferre
+ \fBdcmqridx\fP(1), \fBdcmqrti\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1993-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1993-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/drtdump.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/drtdump.1
+@@ -1,7 +1,7 @@
+ .TH "drtdump" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-drtdump \- Dump DICOM RT file and data set
++drtdump \- Dump DICOM RT file and data set
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -131,4 +131,4 @@ The default behaviour should be preferre
+ \fBdcmconv\fP(1), \fBdcmdump\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2010-2012 by OFFIS e\&.V\&. and ICSMED AG, Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2010-2012 by OFFIS e\&.V\&. and ICSMED AG, Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/xml2dcm.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/xml2dcm.1
+@@ -1,7 +1,7 @@
+ .TH "xml2dcm" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-xml2dcm \- Convert XML document to DICOM file or data set
++xml2dcm \- Convert XML document to DICOM file or data set
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -272,4 +272,4 @@ The default behaviour should be preferre
+ \fBdcm2xml\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2003-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2003-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcm2xml.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcm2xml.1
+@@ -1,7 +1,7 @@
+ .TH "dcm2xml" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcm2xml \- Convert DICOM file and data set to XML
++dcm2xml \- Convert DICOM file and data set to XML
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -282,4 +282,4 @@ The default behaviour should be preferre
+ \fBxml2dcm\fP(1), \fBdcmconv\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2002-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2002-2013 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/echoscu.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/echoscu.1
+@@ -1,7 +1,7 @@
+ .TH "echoscu" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-echoscu \- DICOM verification (C-ECHO) SCU
++echoscu \- DICOM verification (C-ECHO) SCU
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -200,4 +200,4 @@ The \fBechoscu\fP utility will attempt t
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1994-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1994-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcml2pnm.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcml2pnm.1
+@@ -1,7 +1,7 @@
+ .TH "dcml2pnm" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcml2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF or BMP
++dcml2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF or BMP
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -394,11 +394,11 @@ The following preferred interpolation al
+ .PP
+ .PD 0
+ .IP "\(bu" 2
+-1 = free scaling algorithm with interpolation from pbmplus toolkit
++1 = free scaling algorithm with interpolation from pbmplus toolkit
+ .IP "\(bu" 2
+-2 = free scaling algorithm with interpolation from c't magazine
++2 = free scaling algorithm with interpolation from c't magazine
+ .IP "\(bu" 2
+-3 = magnification algorithm with bilinear interpolation from Eduard Stanescu
++3 = magnification algorithm with bilinear interpolation from Eduard Stanescu
+ .IP "\(bu" 2
+ 4 = magnification algorithm with bicubic interpolation from Eduard Stanescu
+ .PP
+@@ -441,11 +441,11 @@ The \fBdcml2pnm\fP utility will attempt
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "FILES"
+ .PP
+-\fI<datadir>/camera\&.lut\fP - sample characteristics file of a camera
++\fI<datadir>/camera\&.lut\fP - sample characteristics file of a camera
+ .br
+-\fI<datadir>/monitor\&.lut\fP - sample characteristics file of a monitor
++\fI<datadir>/monitor\&.lut\fP - sample characteristics file of a monitor
+ .br
+-\fI<datadir>/printer\&.lut\fP - sample characteristics file of a printer
++\fI<datadir>/printer\&.lut\fP - sample characteristics file of a printer
+ .br
+ \fI<datadir>/scanner\&.lut\fP - sample characteristics file of a scanner
+ .SH "SEE ALSO"
+@@ -453,4 +453,4 @@ The default behaviour should be preferre
+ \fBdcm2pnm\fP(1), \fBimg2dcm\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2001-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2001-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmmkcrv.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmmkcrv.1
+@@ -1,7 +1,7 @@
+ .TH "dcmmkcrv" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmmkcrv \- Add 2D curve data to image
++dcmmkcrv \- Add 2D curve data to image
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -124,4 +124,4 @@ The \fBdcmmkcrv\fP utility will attempt
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1998-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1998-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcm2pnm.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcm2pnm.1
+@@ -1,7 +1,7 @@
+ .TH "dcm2pnm" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcm2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF or BMP
++dcm2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF or BMP
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -394,11 +394,11 @@ The following preferred interpolation al
+ .PP
+ .PD 0
+ .IP "\(bu" 2
+-1 = free scaling algorithm with interpolation from pbmplus toolkit
++1 = free scaling algorithm with interpolation from pbmplus toolkit
+ .IP "\(bu" 2
+-2 = free scaling algorithm with interpolation from c't magazine
++2 = free scaling algorithm with interpolation from c't magazine
+ .IP "\(bu" 2
+-3 = magnification algorithm with bilinear interpolation from Eduard Stanescu
++3 = magnification algorithm with bilinear interpolation from Eduard Stanescu
+ .IP "\(bu" 2
+ 4 = magnification algorithm with bicubic interpolation from Eduard Stanescu
+ .PP
+@@ -439,11 +439,11 @@ The \fBdcm2pnm\fP utility will attempt t
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "FILES"
+ .PP
+-\fI<datadir>/camera\&.lut\fP - sample characteristics file of a camera
++\fI<datadir>/camera\&.lut\fP - sample characteristics file of a camera
+ .br
+-\fI<datadir>/monitor\&.lut\fP - sample characteristics file of a monitor
++\fI<datadir>/monitor\&.lut\fP - sample characteristics file of a monitor
+ .br
+-\fI<datadir>/printer\&.lut\fP - sample characteristics file of a printer
++\fI<datadir>/printer\&.lut\fP - sample characteristics file of a printer
+ .br
+ \fI<datadir>/scanner\&.lut\fP - sample characteristics file of a scanner
+ .SH "SEE ALSO"
+@@ -451,4 +451,4 @@ The default behaviour should be preferre
+ \fBdcmj2pnm\fP(1), \fBimg2dcm\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1998-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1998-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/img2dcm.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/img2dcm.1
+@@ -1,7 +1,7 @@
+ .TH "img2dcm" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-img2dcm \- Convert standard image formats into DICOM format
++img2dcm \- Convert standard image formats into DICOM format
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -190,7 +190,7 @@ Using the \fI--dataset-from\fP option \f
+ .PP
+ .PD 0
+ .IP "\(bu" 2
+-The \fI--study-from\fP and \fI--series-from\fP options (mutually exclusive) can be used to import patient, study and series information from an existing DICOM file\&. If \fI--series-from\fP is specified, then the given DICOM file is opened by \fBimg2dcm\fP and all mandatory information down to the series level is imported\&. Note that this includes patient, study and series information\&. In case of \fI--study-from\fP, the series information is excluded\&. The following attributes are taken over:
++The \fI--study-from\fP and \fI--series-from\fP options (mutually exclusive) can be used to import patient, study and series information from an existing DICOM file\&. If \fI--series-from\fP is specified, then the given DICOM file is opened by \fBimg2dcm\fP and all mandatory information down to the series level is imported\&. Note that this includes patient, study and series information\&. In case of \fI--study-from\fP, the series information is excluded\&. The following attributes are taken over:
+ .PP
+ .nf
+ Patient Level:
+@@ -227,7 +227,7 @@ The \fI--key\fP option can be used to ad
+ .SS "UIDs"
+ New Study and Series Instance UIDs are generated \fBif necessary\fP after applying the \fI--study-from\fP and \fI--series\fP options\&. If Study Instance UID or Series Instance UID are not present after these steps, they are newly generated, independently from each other\&. A contrary behaviour is chosen for the SOP Instance UID that one could expect to be taken over when using the \fI--dataset-from\fP option\&. This is \fBnot\fP the case, the SOP Instance UID is \fBnot\fP copied to the new object\&. This should be the desirable behaviour for most use cases\&. However, if a certain SOP Instance UID should be inserted into the new object, the \fI--key\fP option should be used\&.
+ .SS "Input Templates"
+-For supporting the conversion into DICOM, \fBimg2dcm\fP comes with some pre-defined templates which can be used for the \fI--dataset-from\fP option (see sample files \fISC\&.dump\fP and \fIVLP\&.dump\fP)\&. These templates should be filled with the desired values and then must be dumped (converted) to a DICOM file before actually being used with \fBimg2dcm\fP\&. Use \fBdump2dcm\fP to convert the dump to DICOM\&. Example:
++For supporting the conversion into DICOM, \fBimg2dcm\fP comes with some pre-defined templates which can be used for the \fI--dataset-from\fP option (see sample files \fISC\&.dump\fP and \fIVLP\&.dump\fP)\&. These templates should be filled with the desired values and then must be dumped (converted) to a DICOM file before actually being used with \fBimg2dcm\fP\&. Use \fBdump2dcm\fP to convert the dump to DICOM\&. Example:
+ .PP
+ .nf
+ dump2dcm SC.dump SC.dcm
+@@ -274,45 +274,45 @@ Here are some examples that show how the
+ .PP
+ .PD 0
+ .IP "1." 4
+-img2dcm image\&.jpg out\&.dcm
++img2dcm image\&.jpg out\&.dcm
+ .br
+-Read JPEG file 'image\&.jpg', convert to the old Secondary Capture SOP class and save the result to DICOM file 'out\&.dcm'\&. This is the easiest way of using \fBimg2dcm\fP\&. Any type 1 and type 2 attributes required for writing valid objects of this SOP class are inserted automatically\&.
++Read JPEG file 'image\&.jpg', convert to the old Secondary Capture SOP class and save the result to DICOM file 'out\&.dcm'\&. This is the easiest way of using \fBimg2dcm\fP\&. Any type 1 and type 2 attributes required for writing valid objects of this SOP class are inserted automatically\&.
+ .PP
+
+ .IP "2." 4
+-img2dcm -i BMP image\&.bmp out\&.dcm
++img2dcm -i BMP image\&.bmp out\&.dcm
+ .br
+-Same as above but tells img2dcm to read a BMP file instead of JPEG\&.
++Same as above but tells img2dcm to read a BMP file instead of JPEG\&.
+ .PP
+
+ .IP "3." 4
+-img2dcm image\&.jpg out\&.dcm -vlp -k 'PatientName=Bond^James'
++img2dcm image\&.jpg out\&.dcm -vlp -k 'PatientName=Bond^James'
+ .br
+-Same as first example, but writes Visible Light Photographic Image object to 'out\&.dcm' and sets PatientName to 'Bond^James' which otherwise would be left empty\&.
++Same as first example, but writes Visible Light Photographic Image object to 'out\&.dcm' and sets PatientName to 'Bond^James' which otherwise would be left empty\&.
+ .PP
+
+ .IP "4." 4
+-img2dcm image\&.jpg out\&.dcm --series-from template\&.dcm -k 'PatientName=Bond^James'
++img2dcm image\&.jpg out\&.dcm --series-from template\&.dcm -k 'PatientName=Bond^James'
+ .br
+-Same as 1), but imports patient/study/series infomation from DICOM file 'template\&.dcm'\&. Please note that attribute PatientName will contain 'Bond^James' at the end, any value from 'template\&.dcm' will be overwritten\&. That is, because the -k option is applied at the very end of the conversion pipeline (see above)\&.
++Same as 1), but imports patient/study/series infomation from DICOM file 'template\&.dcm'\&. Please note that attribute PatientName will contain 'Bond^James' at the end, any value from 'template\&.dcm' will be overwritten\&. That is, because the -k option is applied at the very end of the conversion pipeline (see above)\&.
+ .PP
+
+ .IP "5." 4
+-img2dcm image\&.jpg out\&.dcm --no-checks
++img2dcm image\&.jpg out\&.dcm --no-checks
+ .br
+-Same as 1), but does not perform any attribute checking and no type 1 and type 2 attribute insertion! So in this case, an invalid DICOM object would be generated\&. This can be interesting if the output file is not meant to be completed but will undergo further transformations, e\&. g\&. adding attributes using \fBdcmodify\fP\&. Only use option \fI--no-checks\fP if you know what you are doing!
++Same as 1), but does not perform any attribute checking and no type 1 and type 2 attribute insertion! So in this case, an invalid DICOM object would be generated\&. This can be interesting if the output file is not meant to be completed but will undergo further transformations, e\&. g\&. adding attributes using \fBdcmodify\fP\&. Only use option \fI--no-checks\fP if you know what you are doing!
+ .PP
+
+ .IP "6." 4
+-img2dcm image\&.jpg out\&.dcm --no-type1-invent
++img2dcm image\&.jpg out\&.dcm --no-type1-invent
+ .br
+-Same as 1), but does not insert missing type 1 attributes and/or their values\&. Type 2 attributes will be inserted\&. Note that in this case it must be assured that all type 1 attributes are provided by other means, i\&. e\&. by adding them with the \fI--key\fP option\&. Otherwise, \fBimg2dcm\fP will report an error and will stop converting\&.
++Same as 1), but does not insert missing type 1 attributes and/or their values\&. Type 2 attributes will be inserted\&. Note that in this case it must be assured that all type 1 attributes are provided by other means, i\&. e\&. by adding them with the \fI--key\fP option\&. Otherwise, \fBimg2dcm\fP will report an error and will stop converting\&.
+ .PP
+
+ .IP "7." 4
+-img2dcm image\&.jpg out\&.dcm --keep-appn --insist-on-jfif
++img2dcm image\&.jpg out\&.dcm --keep-appn --insist-on-jfif
+ .br
+-Same as 1), but takes over APPn information like EXIF into the DICOM object's resulting JPEG stream\&. Further, \fI--insist-on-jfif\fP will force \fBimg2dcm\fP to abort if no JFIF information is existent in the source file\&.
++Same as 1), but takes over APPn information like EXIF into the DICOM object's resulting JPEG stream\&. Further, \fI--insist-on-jfif\fP will force \fBimg2dcm\fP to abort if no JFIF information is existent in the source file\&.
+ .PP
+
+ .PP
+@@ -335,7 +335,7 @@ The \fBimg2dcm\fP utility will attempt t
+ The default behaviour should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&.
+ .SH "FILES"
+ .PP
+-\fI<datadir>/SC\&.dump\fP - Sample dump file for Secondary Capture images
++\fI<datadir>/SC\&.dump\fP - Sample dump file for Secondary Capture images
+ .br
+ \fI<datadir>/VLP\&.dump\fP - Sample dump file for Visible Light Photographic images
+ .SH "SEE ALSO"
+@@ -343,4 +343,4 @@ The default behaviour should be preferre
+ \fBdcm2pnm\fP(1), \fBdcmj2pnm\fP(1), \fBdump2dcm\fP(1), \fBdcmconv\fP(1), \fBdcmodify\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2007-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2007-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmmkdir.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmmkdir.1
+@@ -1,7 +1,7 @@
+ .TH "dcmmkdir" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmmkdir \- Create a DICOMDIR file
++dcmmkdir \- Create a DICOMDIR file
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -17,57 +17,57 @@ Currently the following profiles are sup
+ .PP
+ .PD 0
+ .IP "\(bu" 2
+-General Purpose CD-R Interchange (STD-GEN-CD)
++General Purpose CD-R Interchange (STD-GEN-CD)
+ .IP "\(bu" 2
+-General Purpose Interchange on DVD-RAM Media (STD-GEN-DVD-RAM)
++General Purpose Interchange on DVD-RAM Media (STD-GEN-DVD-RAM)
+ .IP "\(bu" 2
+-General Purpose DVD Interchange with JPEG (STD-GEN-DVD-JPEG)
++General Purpose DVD Interchange with JPEG (STD-GEN-DVD-JPEG)
+ .IP "\(bu" 2
+-General Purpose DVD Interchange with JPEG 2000 (STD-GEN-DVD-J2K)
++General Purpose DVD Interchange with JPEG 2000 (STD-GEN-DVD-J2K)
+ .IP "\(bu" 2
+-General Purpose BD Interchange with JPEG (STD-GEN-BD-JPEG)
++General Purpose BD Interchange with JPEG (STD-GEN-BD-JPEG)
+ .IP "\(bu" 2
+-General Purpose BD Interchange with JPEG 2000 (STD-GEN-BD-J2K)
++General Purpose BD Interchange with JPEG 2000 (STD-GEN-BD-J2K)
+ .IP "\(bu" 2
+-General Purpose BD Interchange with MPEG2 MP at ML (STD-GEN-BD-MPEG2-MPML)
++General Purpose BD Interchange with MPEG2 MP at ML (STD-GEN-BD-MPEG2-MPML)
+ .IP "\(bu" 2
+-General Purpose BD Interchange with MPEG2 MP at HL (STD-GEN-BD-MPEG2-MPHL)
++General Purpose BD Interchange with MPEG2 MP at HL (STD-GEN-BD-MPEG2-MPHL)
+ .IP "\(bu" 2
+-General Purpose BD Interchange with MPEG-4 AVC/H\&.264 HiP at Level4\&.1 (STD-GEN-BD-MPEG4-HPLV41)
++General Purpose BD Interchange with MPEG-4 AVC/H\&.264 HiP at Level4\&.1 (STD-GEN-BD-MPEG4-HPLV41)
+ .IP "\(bu" 2
+-General Purpose BD Interchange with MPEG-4 AVC/H\&.264 BD-Compatible HiP at Level4\&.1 (STD-GEN-BD-MPEG4-HPLV41BD)
++General Purpose BD Interchange with MPEG-4 AVC/H\&.264 BD-Compatible HiP at Level4\&.1 (STD-GEN-BD-MPEG4-HPLV41BD)
+ .IP "\(bu" 2
+-General Purpose USB and Flash Memory Interchange with JPEG (STD-GEN-USB/MMC/CF/SD-JPEG)
++General Purpose USB and Flash Memory Interchange with JPEG (STD-GEN-USB/MMC/CF/SD-JPEG)
+ .IP "\(bu" 2
+-General Purpose USB and Flash Memory Interchange with JPEG 2000 (STD-GEN-USB/MMC/CF/SD-J2K)
++General Purpose USB and Flash Memory Interchange with JPEG 2000 (STD-GEN-USB/MMC/CF/SD-J2K)
+ .IP "\(bu" 2
+-General Purpose MIME Interchange (STD-GEN-MIME)
++General Purpose MIME Interchange (STD-GEN-MIME)
+ .IP "\(bu" 2
+-DVD Interchange with MPEG2 MP at ML (STD-DVD-MPEG2-MPML)
++DVD Interchange with MPEG2 MP at ML (STD-DVD-MPEG2-MPML)
+ .IP "\(bu" 2
+-Basic Cardiac X-Ray Angiographic Studies on CD-R Media (STD-XABC-CD)
++Basic Cardiac X-Ray Angiographic Studies on CD-R Media (STD-XABC-CD)
+ .IP "\(bu" 2
+-1024 X-Ray Angiographic Studies on CD-R Media (STD-XA1K-CD)
++1024 X-Ray Angiographic Studies on CD-R Media (STD-XA1K-CD)
+ .IP "\(bu" 2
+-1024 X-Ray Angiographic Studies on DVD Media (STD-XA1K-DVD)
++1024 X-Ray Angiographic Studies on DVD Media (STD-XA1K-DVD)
+ .IP "\(bu" 2
+-Dental Radiograph Interchange (STD-DEN-CD)
++Dental Radiograph Interchange (STD-DEN-CD)
+ .IP "\(bu" 2
+-CT/MR Studies on various Media (STD-CTMR-xxxx)
++CT/MR Studies on various Media (STD-CTMR-xxxx)
+ .IP "\(bu" 2
+-Ultrasound Single Frame for Image Display (STD-US-ID-SF-xxxx)
++Ultrasound Single Frame for Image Display (STD-US-ID-SF-xxxx)
+ .IP "\(bu" 2
+-Ultrasound Single Frame with Spatial Calibration (STD-US-SC-SF-xxxx)
++Ultrasound Single Frame with Spatial Calibration (STD-US-SC-SF-xxxx)
+ .IP "\(bu" 2
+-Ultrasound Single Frame with Combined Calibration (STD-US-CC-SF-xxxx)
++Ultrasound Single Frame with Combined Calibration (STD-US-CC-SF-xxxx)
+ .IP "\(bu" 2
+-Ultrasound Single & Multi-Frame for Image Display (STD-US-ID-MF-xxxx)
++Ultrasound Single & Multi-Frame for Image Display (STD-US-ID-MF-xxxx)
+ .IP "\(bu" 2
+-Ultrasound Single & Multi-Frame with Spatial Calibration (STD-US-SC-MF-xxxx)
++Ultrasound Single & Multi-Frame with Spatial Calibration (STD-US-SC-MF-xxxx)
+ .IP "\(bu" 2
+-Ultrasound Single & Multi-Frame with Combined Calibration (STD-US-CC-MF-xxxx)
++Ultrasound Single & Multi-Frame with Combined Calibration (STD-US-CC-MF-xxxx)
+ .IP "\(bu" 2
+-12-lead ECG Interchange on Diskette (STD-WVFM-ECG-FD)
++12-lead ECG Interchange on Diskette (STD-WVFM-ECG-FD)
+ .IP "\(bu" 2
+ Hemodynamic Waveform Interchange on Diskette (STD-WVFM-HD-FD)
+ .PP
+@@ -402,4 +402,4 @@ The default behaviour should be preferre
+ \fBdcmgpdir\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2001-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2001-2011 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/xml2dsr.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/xml2dsr.1
+@@ -1,7 +1,7 @@
+ .TH "xml2dsr" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-xml2dsr \- Convert DICOM SR file and data set to XML
++xml2dsr \- Convert DICOM SR file and data set to XML
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -236,4 +236,4 @@ The default behaviour should be preferre
+ \fBdsr2xml\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 2003-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 2003-2012 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/doxygen/manpages/man1/dcmprscp.1
++++ dcmtk-3.6.1~20131114/doxygen/manpages/man1/dcmprscp.1
+@@ -1,7 +1,7 @@
+ .TH "dcmprscp" 1 "Thu Nov 14 2013" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+ .nh
+ .SH NAME
+-dcmprscp \- DICOM basic grayscale print management SCP
++dcmprscp \- DICOM basic grayscale print management SCP
+ .SH "SYNOPSIS"
+ .PP
+ .PP
+@@ -89,4 +89,4 @@ The default behaviour should be preferre
+ \fBdcmprscu\fP(1)
+ .SH "COPYRIGHT"
+ .PP
+-Copyright (C) 1999-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
++Copyright (C) 1999-2010 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmprscu.man
++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmprscu.man
+@@ -162,7 +162,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -171,7 +171,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -183,7 +183,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -201,6 +201,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1999-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1999-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmp2pgm.man
++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmp2pgm.man
+@@ -119,7 +119,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -128,7 +128,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -140,7 +140,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -154,6 +154,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1998-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1998-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpsprt.man
++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsprt.man
+@@ -103,7 +103,7 @@ dcmfile-in DICOM image file(s) to be pr
+ use printer default (default)
+ \endverbatim
+
+-\subsection behaviour_options requested decimate/crop behaviour options
++\subsection behavior_options requested decimate/crop behavior options
+ \verbatim
+ --request-decimate
+ request decimate
+@@ -273,7 +273,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -282,7 +282,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -294,7 +294,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -312,6 +312,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1999-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1999-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpsmk.man
++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsmk.man
+@@ -214,7 +214,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -223,7 +223,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -235,7 +235,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -245,6 +245,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1998-2011 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1998-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpssnd.man
++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpssnd.man
+@@ -99,7 +99,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -108,7 +108,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -120,7 +120,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -138,6 +138,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1998-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1998-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpschk.man
++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpschk.man
+@@ -101,7 +101,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -110,7 +110,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -122,7 +122,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -132,6 +132,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2000-2010 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~20131114.orig/dcmpstat/docs/dcmpsrcv.man
++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsrcv.man
+@@ -91,7 +91,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -100,7 +100,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -112,7 +112,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -130,6 +130,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1998-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1998-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmprscp.man
++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmprscp.man
+@@ -102,7 +102,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -111,7 +111,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -123,7 +123,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -141,6 +141,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1999-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1999-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmmklut.man
++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmmklut.man
+@@ -14,7 +14,7 @@ dcmmklut [options] dcmimg-out
+
+ \section description DESCRIPTION
+
+-The \b dcmmklut utility allows to create a variety of DICOM Modality,
++The \b dcmmklut utility allows one to create a variety of DICOM Modality,
+ Presentation and VOI look-up tables (LUT) and is intended for the creation
+ of test images. The utility is able to read an existing DICOM image file,
+ create a look up table according to the command line options, and write
+@@ -213,7 +213,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -222,7 +222,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -234,7 +234,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -248,6 +248,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1998-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1998-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmmkcrv.man
++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmmkcrv.man
+@@ -14,7 +14,7 @@ dcmmkcrv [options] dcmfile-in curvedata-
+
+ \section description DESCRIPTION
+
+-The \b dcmmkcrv utility allows to create DICOM images containing curve data.
++The \b dcmmkcrv utility allows one to create DICOM images containing curve data.
+ Since curve data is hardly used by vendors today, this is intended as a
+ means to test implementations that can read curve data. The utility reads an
+ existing DICOM image and a text file containing the curve data in textual
+@@ -147,7 +147,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -156,7 +156,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -168,7 +168,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -178,6 +178,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1998-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1998-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmtls/include/dcmtk/dcmtls/tlslayer.h
++++ dcmtk-3.6.1~20131114/dcmtls/include/dcmtk/dcmtls/tlslayer.h
+@@ -81,7 +81,7 @@ public:
+ * @param initializeOpenSSL Determines if OpenSSL library should be initialized.
+ * Some setups (e.g. multi-threaded environments) may be interested in using
+ * more than one TLS transport layer at a time and thus must make sure the
+- * libary is only initialized once.
++ * library is only initialized once.
+ */
+ DcmTLSTransportLayer(int networkRole, const char *randFile, OFBool initializeOpenSSL = OFTrue);
+
+--- dcmtk-3.6.1~20131114.orig/dcmsr/include/dcmtk/dcmsr/dsrtypes.h
++++ dcmtk-3.6.1~20131114/dcmsr/include/dcmtk/dcmsr/dsrtypes.h
+@@ -100,7 +100,7 @@ class DSRIODConstraintChecker;
+
+
+ /*-----------------------*
+- * contant definitions *
++ * constant definitions *
+ *-----------------------*/
+
+ /** @name specific error conditions for module dcmsr.
+@@ -676,7 +676,7 @@ class DCMTK_DCMSR_EXPORT DSRTypes
+ CS_Japanese,
+ /// ISO-IR 166: Thai
+ CS_Thai,
+- // UTF-8: Unicode in UTF-8
++ /// UTF-8: Unicode in UTF-8
+ CS_UTF8,
+ /// internal type used to mark the last entry
+ CS_last = CS_UTF8
+@@ -1090,7 +1090,7 @@ class DCMTK_DCMSR_EXPORT DSRTypes
+ */
+ static OFBool checkForValidReference(const OFString &stringValue);
+
+- /** create specified SR IOD content relationship contraint checker object.
++ /** create specified SR IOD content relationship constraint checker object.
+ * Please note that the created object has to be deleted by the caller.
+ ** @param documentType associated SR document type for which the checker object is created
+ ** @return pointer to new IOD checker object if successful, NULL if document type is not supported
+@@ -1102,7 +1102,7 @@ class DCMTK_DCMSR_EXPORT DSRTypes
+ * It facilitates the introduction of new relationship/value types and the maintenance.
+ ** @param relationshipType relationship type of the node to be created
+ * @param valueType value type of the node to be created
+- ** @return pointer to the new document tree nodeif successful, NULL otherwise
++ ** @return pointer to the new document tree node if successful, NULL otherwise
+ */
+ static DSRDocumentTreeNode *createDocumentTreeNode(const E_RelationshipType relationshipType,
+ const E_ValueType valueType);
+--- dcmtk-3.6.1~20131114.orig/dcmsr/apps/dsr2html.cc
++++ dcmtk-3.6.1~20131114/dcmsr/apps/dsr2html.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
+@@ -220,6 +220,7 @@ int main(int argc, char *argv[])
+ 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("--disable-vr-checker", "-Dv", "disable check for VR-conformant string values");
+ cmd.addSubGroup("character set:");
+ cmd.addOption("--charset-require", "+Cr", "require declaration of ext. charset (default)");
+ cmd.addOption("--charset-assume", "+Ca", 1, "[c]harset: string",
+@@ -335,6 +336,8 @@ int main(int argc, char *argv[])
+ opt_readFlags |= DSRTypes::RF_ignoreContentItemErrors;
+ if (cmd.findOption("--skip-invalid-items"))
+ opt_readFlags |= DSRTypes::RF_skipInvalidContentItems;
++ if (cmd.findOption("--disable-vr-checker"))
++ dcmEnableVRCheckerForStringValues.set(OFFalse);
+
+ /* character set options */
+ cmd.beginOptionBlock();
+--- dcmtk-3.6.1~20131114.orig/dcmsr/apps/dsr2xml.cc
++++ dcmtk-3.6.1~20131114/dcmsr/apps/dsr2xml.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
+@@ -163,6 +163,8 @@ int main(int argc, char *argv[])
+ cmd.addOption("--read-xfer-implicit", "-ti", "read with implicit VR little endian TS");
+
+ cmd.addGroup("processing options:");
++ cmd.addSubGroup("error handling:");
++ cmd.addOption("--disable-vr-checker", "-Dv", "disable check for VR-conformant string values");
+ cmd.addSubGroup("specific character set:");
+ cmd.addOption("--charset-require", "+Cr", "require declaration of ext. charset (default)");
+ cmd.addOption("--charset-assume", "+Ca", 1, "[c]harset: string",
+@@ -246,6 +248,8 @@ int main(int argc, char *argv[])
+ cmd.endOptionBlock();
+
+ /* processing options */
++ if (cmd.findOption("--disable-vr-checker"))
++ dcmEnableVRCheckerForStringValues.set(OFFalse);
+ cmd.beginOptionBlock();
+ if (cmd.findOption("--charset-require"))
+ opt_defaultCharset = NULL;
+--- dcmtk-3.6.1~20131114.orig/dcmsr/apps/dsrdump.cc
++++ dcmtk-3.6.1~20131114/dcmsr/apps/dsrdump.cc
+@@ -167,6 +167,7 @@ int main(int argc, char *argv[])
+ 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("--disable-vr-checker", "-Dv", "disable check for VR-conformant string values");
+ #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");
+@@ -269,6 +270,8 @@ int main(int argc, char *argv[])
+ opt_readFlags |= DSRTypes::RF_ignoreContentItemErrors;
+ if (cmd.findOption("--skip-invalid-items"))
+ opt_readFlags |= DSRTypes::RF_skipInvalidContentItems;
++ if (cmd.findOption("--disable-vr-checker"))
++ dcmEnableVRCheckerForStringValues.set(OFFalse);
+ #ifdef WITH_LIBICONV
+ if (cmd.findOption("--convert-to-utf8")) opt_convertToUTF8 = OFTrue;
+ #endif
+--- dcmtk-3.6.1~20131114.orig/dcmsr/docs/dsr2html.man
++++ dcmtk-3.6.1~20131114/dcmsr/docs/dsr2html.man
+@@ -122,6 +122,9 @@ error handling:
+ -Ei --skip-invalid-items
+ skip invalid content items (incl. sub-tree)
+
++ -Dv --disable-vr-checker
++ disable check for VR-conformant string values
++
+ specific character set:
+
+ +Cr --charset-require
+@@ -298,7 +301,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -307,7 +310,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -319,7 +322,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -338,6 +341,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~20131114.orig/dcmsr/docs/xml2dsr.man
++++ dcmtk-3.6.1~20131114/dcmsr/docs/xml2dsr.man
+@@ -262,7 +262,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -271,7 +271,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -283,7 +283,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -301,6 +301,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2003-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2003-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmsr/docs/dsrdump.man
++++ dcmtk-3.6.1~20131114/dcmsr/docs/dsrdump.man
+@@ -120,6 +120,9 @@ error handling:
+ -Ei --skip-invalid-items
+ skip invalid content items (including sub-tree)
+
++ -Dv --disable-vr-checker
++ disable check for VR-conformant string values
++
+ specific character set:
+
+ +U8 --convert-to-utf8
+@@ -240,7 +243,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -249,7 +252,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -261,7 +264,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+--- dcmtk-3.6.1~20131114.orig/dcmsr/docs/dsr2xml.man
++++ dcmtk-3.6.1~20131114/dcmsr/docs/dsr2xml.man
+@@ -67,30 +67,6 @@ xmlfile-out XML output filename (defaul
+ use config file f for the logger
+ \endverbatim
+
+-\subsection processing_options processing options
+-\verbatim
+-specific character set:
+-
+- +Cr --charset-require
+- require declaration of extended charset (default)
+-
+- +Ca --charset-assume [c]harset: string
+- assume charset c if no extended charset declared
+-
+- +Cc --charset-check-all
+- check all data elements with string values
+- (default: only PN, LO, LT, SH, ST and UT)
+-
+- # this option is only used for the mapping to an appropriate
+- # XML character encoding, but not for the conversion 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
+-\endverbatim
+-
+ \subsection input_options input options
+ \verbatim
+ input file format:
+@@ -122,6 +98,35 @@ input transfer syntax:
+ read with implicit VR little endian TS
+ \endverbatim
+
++\subsection processing_options processing options
++\verbatim
++error handling:
++
++ -Dv --disable-vr-checker
++ disable check for VR-conformant string values
++
++specific character set:
++
++ +Cr --charset-require
++ require declaration of extended charset (default)
++
++ +Ca --charset-assume [c]harset: string
++ assume charset c if no extended charset declared
++
++ +Cc --charset-check-all
++ check all data elements with string values
++ (default: only PN, LO, LT, SH, ST and UT)
++
++ # this option is only used for the mapping to an appropriate
++ # XML character encoding, but not for the conversion 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
++\endverbatim
++
+ \subsection output_options output options
+ \verbatim
+ encoding:
+@@ -254,7 +259,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -263,7 +268,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -275,7 +280,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -293,6 +298,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2000-2012 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~20131114.orig/oflog/include/dcmtk/oflog/config/defines.h
++++ dcmtk-3.6.1~20131114/oflog/include/dcmtk/oflog/config/defines.h
+@@ -231,7 +231,8 @@
+ #define DCMTK_LOG4CPLUS_DEBUGGING
+ #endif
+
+-/* These two are not needed since we build static libraries */
++/* These are not needed since config.h uses DCMTK_DECL_EXPORT/IMPORT directly */
++#if 0
+ /* Defined if the compiler understands __declspec(dllexport) or
+ __attribute__((visibility("default"))) construct. */
+ #define DCMTK_LOG4CPLUS_DECLSPEC_EXPORT
+@@ -243,12 +244,14 @@
+ /* Defined if the compiler understands
+ __attribute__((visibility("hidden"))) construct. */
+ #define DCMTK_LOG4CPLUS_DECLSPEC_PRIVATE
++#endif
+
+-/* */
+-#define DCMTK_LOG4CPLUS_HAVE_TLS_SUPPORT
++/* This define is unused and thus its value does not matter */
++#undef DCMTK_LOG4CPLUS_HAVE_TLS_SUPPORT
+
+-/* */
+-#define DCMTK_LOG4CPLUS_THREAD_LOCAL_VAR
++/* Configure should set this to thread_local, __declspec(thread) or __thread,
++ * whatever works. However, let's just use the TLS functions directly instead. */
++#undef DCMTK_LOG4CPLUS_THREAD_LOCAL_VAR
+
+ /* Defined if the host OS provides ENAMETOOLONG errno value. */
+ #ifdef HAVE_ENAMETOOLONG
+--- dcmtk-3.6.1~20131114.orig/dcmimage/docs/dcmquant.man
++++ dcmtk-3.6.1~20131114/dcmimage/docs/dcmquant.man
+@@ -249,7 +249,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -258,7 +258,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -270,7 +270,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -280,6 +280,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2001-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2001-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmimage/docs/dcm2pnm.man
++++ dcmtk-3.6.1~20131114/dcmimage/docs/dcm2pnm.man
+@@ -455,7 +455,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -464,7 +464,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -476,7 +476,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -497,6 +497,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1998-2011 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1998-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmimage/docs/dcmscale.man
++++ dcmtk-3.6.1~20131114/dcmimage/docs/dcmscale.man
+@@ -234,7 +234,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -243,7 +243,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -255,7 +255,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -265,6 +265,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2002-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2002-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmjpls/docs/dcml2pnm.man
++++ dcmtk-3.6.1~20131114/dcmjpls/docs/dcml2pnm.man
+@@ -456,7 +456,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -465,7 +465,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -477,7 +477,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -498,6 +498,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2001-2011 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2001-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmjpls/docs/dcmdjpls.man
++++ dcmtk-3.6.1~20131114/dcmjpls/docs/dcmdjpls.man
+@@ -69,7 +69,7 @@ input file format:
+ -f --read-dataset
+ read data set without file meta information
+
+- # This option allows to decompress JPEG-LS compressed DICOM objects that have
++ # This option allows one to decompress JPEG-LS compressed DICOM objects that have
+ # been stored as dataset without meta-header. Such a thing should not exist
+ # since the transfer syntax cannot be reliably determined without meta-header,
+ # but unfortunately it does.
+@@ -240,7 +240,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -249,7 +249,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -261,7 +261,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -275,6 +275,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2009-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2009-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmjpls/docs/dcmcjpls.man
++++ dcmtk-3.6.1~20131114/dcmjpls/docs/dcmcjpls.man
+@@ -288,8 +288,8 @@ complies with all restrictions of the ob
+
+ The user is responsible for making sure that the compressed images he creates
+ are compliant with the DICOM standard. If in question, the \b dcmcjpls utility
+-allows to convert an image to secondary capture - this SOP class does not pose
+-restrictions as the ones mentioned above.
++allows one to convert an image to secondary capture - this SOP class does not
++pose restrictions as the ones mentioned above.
+
+ \section transfer_syntaxes TRANSFER SYNTAXES
+
+@@ -341,7 +341,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -350,7 +350,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -362,7 +362,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -376,6 +376,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2009-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2009-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmqrdb/docs/dcmqridx.man
++++ dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqridx.man
+@@ -14,7 +14,7 @@ dcmqridx [options] index-out [dcmfile-in
+
+ \section description DESCRIPTION
+
+-The \b dcmqridx ulility registers DICOM image files in the database index file
++The \b dcmqridx utility registers DICOM image files in the database index file
+ used by the \b dcmqrscp and \b dcmqrti applications. No image files are copied.
+ \b dcmqridx can also list the contents of the database index file.
+
+@@ -96,7 +96,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -105,7 +105,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -117,7 +117,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -131,6 +131,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1993-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1993-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmqrdb/docs/dcmqrti.man
++++ dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqrti.man
+@@ -112,7 +112,7 @@ conflict with another command.
+
+ The "help" command gives a summary of all available commands. Its output is
+ shown underneath. In order to separate the examples from surrounding text,
+-all examples are bracketted by dashed lines. These lines do not appear when
++all examples are bracketed by dashed lines. These lines do not appear when
+ running the program.
+
+ \verbatim
+@@ -158,7 +158,7 @@ peer AE. The fourth column shows the ho
+ peer AE.
+
+ When invoked with an argument index, the "title" command will set the current
+-peer AE. The \b dcmqrti program will attempt to initate an association to the
++peer AE. The \b dcmqrti program will attempt to initiate an association to the
+ current peer AE when asked to send a study/series/image or to send an echo.
+
+ \subsubsection database_command "database" Command
+@@ -402,7 +402,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -411,7 +411,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -423,7 +423,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built into
+ the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -443,6 +443,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1993-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1993-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmqrdb/docs/dcmqrscp.man
++++ dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqrscp.man
+@@ -598,7 +598,7 @@ LittleEndianExplicitTransferSyntax
+ BigEndianExplicitTransferSyntax 1.2.840.10008.1.2.2
+ \endverbatim
+
+-This default behaviour can be changed with the \e --propose options (see above).
++This default behavior can be changed with the \e --propose options (see above).
+ Depending on these options, the following transfer syntaxes are supported:
+
+ \verbatim
+@@ -790,7 +790,7 @@ BigEndianExplicitTransferSyntax
+ The \b dcmqrscp application will prefer transfer syntaxes having an explicit
+ encoding over the default implicit transfer syntax. If \b dcmqrscp is running
+ on big-endian hardware it will prefer BigEndianExplicit to LittleEndianExplicit
+-transfer syntax (and vice versa). This behaviour can be changed with the
++transfer syntax (and vice versa). This behavior can be changed with the
+ \e --prefer options (see above). Depending on these options, the following
+ transfer syntaxes are supported:
+
+@@ -915,7 +915,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -924,7 +924,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -936,7 +936,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built into
+ the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+--- dcmtk-3.6.1~20131114.orig/CMake/dcmtkPrepare.cmake
++++ dcmtk-3.6.1~20131114/CMake/dcmtkPrepare.cmake
+@@ -13,12 +13,19 @@ IF(CMAKE_BACKWARDS_COMPATIBILITY GREATER
+ SET(CMAKE_BACKWARDS_COMPATIBILITY 2.8.12 CACHE STRING "Latest version of CMake when this project was released." FORCE)
+ ENDIF(CMAKE_BACKWARDS_COMPATIBILITY GREATER 2.8.12)
+
+-# Make sure CMAKE_BUILD_TYPE has a value. Default to release.
+-# CMAKE_CONFIGURATION_TYPES is set for generators that support multiple
+-# configuration types (and have per-configuration subdirectories like
+-# Debug and Release). It is empty for other generators and for those
++# CMAKE_BUILD_TYPE is set to value "Release" if none is specified by the
++# selected build file generator. For those generators that support multiple
++# configuration types (e.g. Debug, Release), CMAKE_CONFIGURATION_TYPES holds
++# possible values. For other generators this value is empty, and for those
+ # generators the build type is controlled at CMake time by CMAKE_BUILD_TYPE.
+-# http://www.cmake.org/pipermail/cmake/2006-January/008065.html
++# See http://www.cmake.org/pipermail/cmake/2006-January/008065.html for
++# details.
++#
++# To disable the CMAKE_BUILD_TYPE default value, set CMAKE_BUILD_TYPE to value
++# "None" during CMake configuration, e.g. use "-DCMAKE_BUILD_TYPE:STRING=None"
++# on the command line. This may be useful if the compiler flags should be
++# controlled manually (e.g. as defined in environment variables like CXXFLAGS)
++# and no CMake defaults related to the selected configuration type kick in.
+ IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ MESSAGE(STATUS "Setting build type to 'Release' as none was specified.")
+ SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+@@ -127,7 +134,7 @@ IF(COMMAND CMAKE_POLICY)
+ ENDIF(COMMAND CMAKE_POLICY)
+
+ # pass optional build date to compiler
+-ADD_DEFINITIONS("-DDCMTK_BUILD_DATE=\\\"2013-11-14\\\"")
++#ADD_DEFINITIONS("-DDCMTK_BUILD_DATE=\\\"YYYY-MM-DD\\\"")
+
+ # make OFString(NULL) safe by default
+ ADD_DEFINITIONS("-DUSE_NULL_SAFE_OFSTRING")
+--- dcmtk-3.6.1~20131114.orig/dcmnet/tests/tpool.cc
++++ dcmtk-3.6.1~20131114/dcmnet/tests/tpool.cc
+@@ -35,8 +35,8 @@ protected:
+ void run()
+ {
+ negotiateAssociation();
+- result = sendECHORequest( 0 );
+- closeAssociation(DCMSCU_RELEASE_ASSOCIATION);
++ result = sendECHORequest(0);
++ releaseAssociation();
+ }
+ };
+
+@@ -51,58 +51,58 @@ protected:
+ };
+
+
+-/* Test starts pool with a maximum of 5 SCP workers. All workers are
+- configured to respond to C-ECHO (Verification SOP Class). 5 SCU
+- threads are created and connect simultanously to the pool, send
+- C-ECHO messages are relase the association.
+- Currently the pool ends itself after 3 seconds without connection
+- request. This can be changed to a "shutDown()" call on the pool
+- once it is implemented
+-*/
++/* Test starts pool with a maximum of 5 SCP workers (default value).
++ * All workers are configured to respond to C-ECHO (Verification SOP
++ * Class). 20 SCU threads are created and connect simultaneously to
++ * the pool, send C-ECHO messages are release the association.
++ * Currently the pool ends itself after 3 seconds without connection
++ * request. This can be changed to a "shutDown()" call on the pool
++ * once it is implemented.
++ */
+ OFTEST(dcmnet_scp_pool)
+ {
+ TestPool pool;
+ DcmSCPConfig& config = pool.getConfig();
+
+- config.setAETitle( "PoolTestSCP" );
+- config.setPort( 11112 );
+- config.setConnectionBlockingMode( DUL_NOBLOCK );
+-
+- /* Stop listening after 3 seconds. This makes sure the
+- server pool exits 3 seconds after the last connection request
+- of the SCUs. As soon as it is possible to shut down the pool
+- via API (currently under test), this should be done instead of
+- exiting via connection timeout.
++ config.setAETitle("PoolTestSCP");
++ config.setPort(11112);
++ config.setConnectionBlockingMode(DUL_NOBLOCK);
++
++ /* Stop listening after 3 seconds. This makes sure the server pool
++ * exits 3 seconds after the last connection request of the SCUs.
++ * As soon as it is possible to shut down the pool via API
++ * (currently under test), this should be done instead of exiting
++ * via connection timeout.
+ */
+- config.setConnectionTimeout( 3 );
++ config.setConnectionTimeout(3);
+
+- pool.setMaxThreads( 20 );
++ pool.setMaxThreads(20);
+ OFList<OFString> xfers;
+ xfers.push_back(UID_LittleEndianExplicitTransferSyntax);
+ xfers.push_back(UID_LittleEndianImplicitTransferSyntax);
+- config.addPresentationContext(UID_VerificationSOPClass,xfers);
++ config.addPresentationContext(UID_VerificationSOPClass, xfers);
+
+- OFVector<TestSCU*> scus( 20 );
+- for( OFVector<TestSCU*>::iterator it1 = scus.begin(); it1 != scus.end(); ++it1 )
++ OFVector<TestSCU*> scus(20);
++ for (OFVector<TestSCU*>::iterator it1 = scus.begin(); it1 != scus.end(); ++it1)
+ {
+ *it1 = new TestSCU;
+- (*it1)->setAETitle( "PoolTestSCU" );
+- (*it1)->setPeerAETitle( "PoolTestSCP" );
+- (*it1)->setPeerHostName( "localhost" );
+- (*it1)->setPeerPort( 11112 );
+- (*it1)->addPresentationContext(UID_VerificationSOPClass,xfers);
++ (*it1)->setAETitle("PoolTestSCU");
++ (*it1)->setPeerAETitle("PoolTestSCP");
++ (*it1)->setPeerHostName("localhost");
++ (*it1)->setPeerPort(11112);
++ (*it1)->addPresentationContext(UID_VerificationSOPClass, xfers);
+ (*it1)->initNetwork();
+ }
+
+ pool.start();
+
+- for( OFVector<TestSCU*>::const_iterator it2 = scus.begin(); it2 != scus.end(); ++it2 )
++ for (OFVector<TestSCU*>::const_iterator it2 = scus.begin(); it2 != scus.end(); ++it2)
+ (*it2)->start();
+
+- for( OFVector<TestSCU*>::iterator it3 = scus.begin(); it3 != scus.end(); ++it3 )
++ for (OFVector<TestSCU*>::iterator it3 = scus.begin(); it3 != scus.end(); ++it3)
+ {
+ (*it3)->join();
+- OFCHECK( (*it3)->result.good() );
++ OFCHECK((*it3)->result.good());
+ delete *it3;
+ }
+
+@@ -110,7 +110,7 @@ OFTEST(dcmnet_scp_pool)
+ // pool.stopAfterCurrentAssociations();
+ pool.join();
+
+- OFCHECK( pool.result.good() );
++ OFCHECK(pool.result.good());
+ }
+
+ #endif // WITH_THREADS
+--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/storescu.man
++++ dcmtk-3.6.1~20131114/dcmnet/docs/storescu.man
+@@ -410,12 +410,12 @@ RTBrachyTreatmentRecordStorage
+ RTTreatmentSummaryRecordStorage 1.2.840.10008.5.1.4.1.1.481.7
+ \endverbatim
+
+-The default behaviour of \b storescu is to propose two presentation contexts
++The default behavior of \b storescu is to propose two presentation contexts
+ for each supported SOP class (abstract syntax) - one with the preferred
+ transfer syntax and one with all other uncompressed transfer syntaxes. The
+ default preferred transfer syntax is explicit VR with byte ordering
+ corresponding to the local byte ordering of the machine on which \b storescu
+-is running. This behaviour can be changed with the \e --propose, \e --combine
++is running. This behavior can be changed with the \e --propose, \e --combine
+ and \e --required options, see above. Depending on these options, the
+ following transfer syntaxes are supported:
+
+@@ -449,7 +449,7 @@ classes.
+ \subsection profiles Association Negotiation Profiles and Configuration Files
+
+ \b storescu supports a flexible mechanism for specifying the DICOM network
+-association negotiation behaviour, based on so-called "association
++association negotiation behavior, based on so-called "association
+ negotiation profiles" which may be read from a configuration file.
+ The format and semantics of this configuration file are documented in
+ \e asconfig.txt.
+@@ -482,7 +482,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -491,7 +491,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -503,7 +503,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -522,6 +522,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1996-2011 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1996-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/dcmrecv.man
++++ dcmtk-3.6.1~20131114/dcmnet/docs/dcmrecv.man
+@@ -283,7 +283,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -292,7 +292,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -336,7 +336,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/findscu.man
++++ dcmtk-3.6.1~20131114/dcmnet/docs/findscu.man
+@@ -358,7 +358,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -367,7 +367,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -379,7 +379,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -393,6 +393,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1994-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1994-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/echoscu.man
++++ dcmtk-3.6.1~20131114/dcmnet/docs/echoscu.man
+@@ -211,7 +211,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -220,7 +220,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -232,7 +232,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -242,6 +242,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1994-2011 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1994-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/dcmsend.man
++++ dcmtk-3.6.1~20131114/dcmnet/docs/dcmsend.man
+@@ -230,7 +230,7 @@ request could not be sent to the storage
+
+ If more than 128 presentation contexts are needed, which is the maximum number
+ allowed according to the DICOM standard, a new association is started after the
+-previous one has been completed. In cases where this behaviour is unwanted, it
++previous one has been completed. In cases where this behavior is unwanted, it
+ can be disabled using option \e --single-association. In addition, whether
+ only lossless compressed data sets are decompressed (if needed), which is the
+ default, or also lossy compressed data sets can be specified using the
+@@ -300,7 +300,7 @@ has to propose the default transfer synt
+ associated with each abstract syntax (i.e. SOP class). This requirement is
+ waived when the SCU only has access to the SOP instance in lossy compressed
+ form. With option \e --no-illegal-proposal the strict DICOM-conformant
+-behaviour can be enforced, i.e. no possibly illegal presentation context will
++behavior can be enforced, i.e. no possibly illegal presentation context will
+ be proposed but the corresponding SOP instance will be rejected (if needed).
+
+ Please note, however, that the default transfer syntax for "Lossless JPEG
+@@ -336,7 +336,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -345,7 +345,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -393,7 +393,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/storescp.man
++++ dcmtk-3.6.1~20131114/dcmnet/docs/storescp.man
+@@ -459,7 +459,7 @@ dot "." is not added automatically). Th
+ filenames created by \e --rename-on-eostudy to maintain the length of 8
+ characters.
+
+-Option \e --exec-on-reception allows to execute a certain command line after
++Option \e --exec-on-reception allows one to execute a certain command line after
+ having received and processed one DICOM object (through a C-STORE-RQ message).
+ The command line to be executed is passed to this option as a parameter. The
+ specified command line may contain a number of placeholders which will be
+@@ -479,7 +479,7 @@ The specified command line is executed a
+ execution of \b storescp will not be held back. This behavior can be influenced
+ with the \e --exec-sync option.
+
+-Option \e --exec-on-eostudy allows to execute a certain command line when all
++Option \e --exec-on-eostudy allows one to execute a certain command line when all
+ DICOM objects that belong to one study have been received by \b storescp.
+ The same placeholders as with \e --exec-on-reception may be used, except for
+ '\#f', which is not supported. A study is considered complete by \b storescp
+@@ -682,11 +682,11 @@ LittleEndianExplicitTransferSyntax
+ BigEndianExplicitTransferSyntax 1.2.840.10008.1.2.2
+ \endverbatim
+
+-The default behaviour of the \b storescp application is to prefer transfer
++The default behavior of the \b storescp application is to prefer transfer
+ syntaxes having an explicit encoding over the default implicit transfer syntax.
+ If \b storescp is running on big-endian hardware it will prefer
+ BigEndianExplicit to LittleEndianExplicit transfer syntax (and vice versa).
+-This behaviour can be changed with the \e --prefer options (see above). Using
++This behavior can be changed with the \e --prefer options (see above). Using
+ option \e --accept-all any of the following transfer syntaxes is supported:
+
+ \verbatim
+@@ -753,7 +753,7 @@ privileges, which may be a security risk
+ \subsection profiles Association Negotiation Profiles and Configuration Files
+
+ \b storescp supports a flexible mechanism for specifying the DICOM network
+-association negotiation behaviour, based on so-called "association negotiation
++association negotiation behavior, based on so-called "association negotiation
+ profiles" which may be read from a configuration file. The format and
+ semantics of this configuration file are documented in \e asconfig.txt.
+
+@@ -785,7 +785,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -794,7 +794,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -806,7 +806,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/termscu.man
++++ dcmtk-3.6.1~20131114/dcmnet/docs/termscu.man
+@@ -112,7 +112,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -121,7 +121,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -133,7 +133,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -143,6 +143,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2005-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2005-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/getscu.man
++++ dcmtk-3.6.1~20131114/dcmnet/docs/getscu.man
+@@ -424,7 +424,7 @@ BigEndianExplicitTransferSyntax
+ When acting as a storage SCP, the \b getscu application will prefer transfer
+ syntaxes having an explicit encoding over the default implicit transfer syntax.
+ If \b getscu is running on big-endian hardware it will prefer BigEndianExplicit
+-to LittleEndianExplicit transfer syntax (and vice versa). This behaviour can
++to LittleEndianExplicit transfer syntax (and vice versa). This behavior can
+ be changed with the \e --prefer options (see above). Depending on the
+ \e --prefer option actually used, a combination of the following transfer
+ syntaxes is supported:
+@@ -496,7 +496,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -505,7 +505,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -517,7 +517,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/movescu.man
++++ dcmtk-3.6.1~20131114/dcmnet/docs/movescu.man
+@@ -563,7 +563,7 @@ BigEndianExplicitTransferSyntax
+ When acting as an SCP, the \b movescu application will prefer transfer syntaxes
+ having an explicit encoding over the default implicit transfer syntax. If
+ \b movescu is running on big-endian hardware it will prefer BigEndianExplicit
+-to LittleEndianExplicit transfer syntax (and vice versa). This behaviour can
++to LittleEndianExplicit transfer syntax (and vice versa). This behavior can
+ be changed with the \e --prefer options (see above). Using option
+ \e --accept-all any of the following transfer syntaxes is supported:
+
+@@ -647,7 +647,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -656,7 +656,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -668,7 +668,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+--- dcmtk-3.6.1~20131114.orig/dcmdata/include/dcmtk/dcmdata/dcvrat.h
++++ dcmtk-3.6.1~20131114/dcmdata/include/dcmtk/dcmdata/dcvrat.h
+@@ -115,6 +115,14 @@ class DCMTK_DCMDATA_EXPORT DcmAttributeT
+ const char *pixelFileName = NULL,
+ size_t *pixelCounter = NULL);
+
++ /** write object in XML format
++ * @param out output stream to which the XML document is written
++ * @param flags optional flag used to customize the output (see DCMTypes::XF_xxx)
++ * @return status, EC_Normal if successful, an error code otherwise
++ */
++ OFCondition writeXML(STD_NAMESPACE ostream &out,
++ const size_t flags = 0);
++
+ /** get particular tag value
+ * @param tagVal reference to result variable (cleared in case of error)
+ * @param pos index of the value to be retrieved (0..vm-1)
+--- dcmtk-3.6.1~20131114.orig/dcmdata/include/dcmtk/dcmdata/dcbytstr.h
++++ dcmtk-3.6.1~20131114/dcmdata/include/dcmtk/dcmdata/dcbytstr.h
+@@ -30,6 +30,17 @@
+ #include "dcmtk/ofstd/ofstring.h"
+
+
++/** This flag defines whether the VR checker is actually used by the various
++ * checkStringValue() methods. Since this checker is currently limited to
++ * ASCII and Latin-1, and the detection of the character set might fail for
++ * incorrectly encoded DICOM datasets, this check can be disabled globally.
++ * Please note, however, that other checks (i.e. VM and max. value length)
++ * are still performed if the optional parameters are set accordingly.
++ * By default, the VR checker is enabled (value: "OFTrue").
++ */
++extern DCMTK_DCMDATA_EXPORT OFGlobal<OFBool> dcmEnableVRCheckerForStringValues; /* default: OFTrue */
++
++
+ /** base class for all DICOM value representations storing a character string
+ */
+ class DCMTK_DCMDATA_EXPORT DcmByteString: public DcmElement
+--- dcmtk-3.6.1~20131114.orig/dcmdata/include/dcmtk/dcmdata/dcvrpn.h
++++ dcmtk-3.6.1~20131114/dcmdata/include/dcmtk/dcmdata/dcvrpn.h
+@@ -13,7 +13,7 @@
+ *
+ * Module: dcmdata
+ *
+- * Author: Gerd Ehlers
++ * Author: Gerd Ehlers, Joerg Riesmeier
+ *
+ * Purpose: Interface of class DcmPersonName
+ *
+--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/dcvrof.cc
++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/dcvrof.cc
+@@ -26,6 +26,7 @@
+
+ #include "dcmtk/dcmdata/dcvrof.h"
+ #include "dcmtk/dcmdata/dcvrfl.h"
++#include "dcmtk/dcmdata/dcswap.h"
+ #include "dcmtk/dcmdata/dcuid.h" /* for UID generation */
+
+
+@@ -106,11 +107,24 @@ OFCondition DcmOtherFloat::writeXML(STD_
+ /* for an empty value field, we do not need to do anything */
+ if (getLengthField() > 0)
+ {
+- /* generate a new UID but the binary data is not (yet) written. */
+- OFUUID uuid;
+- out << "<BulkData uuid=\"";
+- uuid.print(out, OFUUID::ER_RepresentationHex);
+- out << "\"/>" << OFendl;
++ /* encode binary data as Base64 */
++ if (flags & DCMTypes::XF_encodeBase64)
++ {
++ out << "<InlineBinary>";
++ Uint8 *byteValues = OFstatic_cast(Uint8 *, getValue());
++ /* Base64 encoder requires big endian input data */
++ swapIfNecessary(EBO_BigEndian, gLocalByteOrder, byteValues, getLengthField(), sizeof(Float32));
++ /* update the byte order indicator variable correspondingly */
++ setByteOrder(EBO_BigEndian);
++ OFStandard::encodeBase64(out, byteValues, OFstatic_cast(size_t, getLengthField()));
++ out << "</InlineBinary>" << OFendl;
++ } else {
++ /* generate a new UID but the binary data is not (yet) written. */
++ OFUUID uuid;
++ out << "<BulkData uuid=\"";
++ uuid.print(out, OFUUID::ER_RepresentationHex);
++ out << "\"/>" << OFendl;
++ }
+ }
+ } else {
+ /* write element value (if loaded) */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/dcelem.cc
++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/dcelem.cc
+@@ -1321,7 +1321,7 @@ void DcmElement::writeXMLStartTag(STD_NA
+ out << " tag=\"";
+ out << STD_NAMESPACE hex << STD_NAMESPACE setfill('0')
+ << STD_NAMESPACE setw(4) << tag.getGTag();
+- /* in Native DICOM Model, write "ggggeeee" (no comma) */
++ /* in Native DICOM Model, write "ggggeeee" (no comma, upper case!) */
+ if (flags & DCMTypes::XF_useNativeModel)
+ {
+ /* for private element numbers, zero out 2 first element digits */
+@@ -1417,12 +1417,12 @@ OFCondition DcmElement::writeXML(STD_NAM
+ {
+ /* write XML start tag */
+ writeXMLStartTag(out, flags);
+- /* write element value (if loaded) */
+- if (valueLoaded())
++ OFString value;
++ const OFBool convertNonASCII = (flags & DCMTypes::XF_convertNonASCII) > 0;
++ if (flags & DCMTypes::XF_useNativeModel)
+ {
+- OFString value;
+- const OFBool convertNonASCII = (flags & DCMTypes::XF_convertNonASCII) > 0;
+- if (flags & DCMTypes::XF_useNativeModel)
++ /* write element value (if non-empty) */
++ if (!isEmpty())
+ {
+ const unsigned long vm = getVM();
+ for (unsigned long valNo = 0; valNo < vm; valNo++)
+@@ -1438,7 +1438,11 @@ OFCondition DcmElement::writeXML(STD_NAM
+ out << "</Value>" << OFendl;
+ }
+ }
+- } else {
++ }
++ } else {
++ /* write element value (only if loaded) */
++ if (valueLoaded())
++ {
+ if (getOFStringArray(value).good())
+ {
+ /* check whether conversion to XML markup string is required */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/dcvrdt.cc
++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/dcvrdt.cc
+@@ -1,6 +1,6 @@
+ /*
+ *
+- * Copyright (C) 1994-2011, OFFIS e.V.
++ * Copyright (C) 1994-2013, OFFIS e.V.
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation were developed by
+@@ -343,36 +343,38 @@ OFCondition DcmDateTime::checkStringValu
+ const size_t valLen = value.length();
+ if (valLen > 0)
+ {
+- size_t posStart = 0;
+- unsigned long vmNum = 0;
+- /* iterate over all value components */
+- while (posStart != OFString_npos)
+- {
+- ++vmNum;
+- /* search for next component separator */
+- const size_t posEnd = value.find('\\', posStart);
+- const size_t length = (posEnd == OFString_npos) ? valLen - posStart : posEnd - posStart;
+- /* check length of current value component */
+- if (length > MAX_DT_LENGTH)
++ size_t posStart = 0;
++ unsigned long vmNum = 0;
++ /* iterate over all value components */
++ while (posStart != OFString_npos)
+ {
+- result = EC_MaximumLengthViolated;
+- break;
+- } else {
+- /* check value representation */
+- const int vrID = DcmElement::scanValue(value, "dt", posStart, length);
+- if ((vrID != 7) && (vrID != 18))
+- {
+- result = EC_ValueRepresentationViolated;
+- break;
+- }
++ ++vmNum;
++ /* search for next component separator */
++ const size_t posEnd = value.find('\\', posStart);
++ const size_t length = (posEnd == OFString_npos) ? valLen - posStart : posEnd - posStart;
++ /* check length of current value component */
++ if (length > MAX_DT_LENGTH)
++ {
++ result = EC_MaximumLengthViolated;
++ break;
++ }
++ else if (dcmEnableVRCheckerForStringValues.get())
++ {
++ /* check value representation */
++ const int vrID = DcmElement::scanValue(value, "dt", posStart, length);
++ if ((vrID != 7) && (vrID != 18))
++ {
++ result = EC_ValueRepresentationViolated;
++ break;
++ }
++ }
++ posStart = (posEnd == OFString_npos) ? posEnd : posEnd + 1;
++ }
++ if (result.good() && !vm.empty())
++ {
++ /* check value multiplicity */
++ result = DcmElement::checkVM(vmNum, vm);
+ }
+- posStart = (posEnd == OFString_npos) ? posEnd : posEnd + 1;
+- }
+- if (result.good() && !vm.empty())
+- {
+- /* check value multiplicity */
+- result = DcmElement::checkVM(vmNum, vm);
+- }
+ }
+ return result;
+ }
+--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/dcvrtm.cc
++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/dcvrtm.cc
+@@ -380,36 +380,38 @@ OFCondition DcmTime::checkStringValue(co
+ const size_t valLen = value.length();
+ if (valLen > 0)
+ {
+- size_t posStart = 0;
+- unsigned long vmNum = 0;
+- /* iterate over all value components */
+- while (posStart != OFString_npos)
+- {
+- ++vmNum;
+- /* search for next component separator */
+- const size_t posEnd = value.find('\\', posStart);
+- const size_t length = (posEnd == OFString_npos) ? valLen - posStart : posEnd - posStart;
+- /* check length of current value component */
+- if (length > MAX_TM_LENGTH)
++ size_t posStart = 0;
++ unsigned long vmNum = 0;
++ /* iterate over all value components */
++ while (posStart != OFString_npos)
+ {
+- result = EC_MaximumLengthViolated;
+- break;
+- } else {
+- /* check value representation */
+- const int vrID = DcmElement::scanValue(value, "tm", posStart, length);
+- if ((vrID != 4) && (!oldFormat || (vrID != 5)))
+- {
+- result = EC_ValueRepresentationViolated;
+- break;
+- }
++ ++vmNum;
++ /* search for next component separator */
++ const size_t posEnd = value.find('\\', posStart);
++ const size_t length = (posEnd == OFString_npos) ? valLen - posStart : posEnd - posStart;
++ /* check length of current value component */
++ if (length > MAX_TM_LENGTH)
++ {
++ result = EC_MaximumLengthViolated;
++ break;
++ }
++ else if (dcmEnableVRCheckerForStringValues.get())
++ {
++ /* check value representation */
++ const int vrID = DcmElement::scanValue(value, "tm", posStart, length);
++ if ((vrID != 4) && (!oldFormat || (vrID != 5)))
++ {
++ result = EC_ValueRepresentationViolated;
++ break;
++ }
++ }
++ posStart = (posEnd == OFString_npos) ? posEnd : posEnd + 1;
++ }
++ if (result.good() && !vm.empty())
++ {
++ /* check value multiplicity */
++ result = DcmElement::checkVM(vmNum, vm);
+ }
+- posStart = (posEnd == OFString_npos) ? posEnd : posEnd + 1;
+- }
+- if (result.good() && !vm.empty())
+- {
+- /* check value multiplicity */
+- result = DcmElement::checkVM(vmNum, vm);
+- }
+ }
+ return result;
+ }
+--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/CMakeLists.txt
++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/CMakeLists.txt
+@@ -9,10 +9,13 @@ SET(DICOMDIC "${dcmdata_SOURCE_DIR}/da
+ SET(PRIVATEDIC "${dcmdata_SOURCE_DIR}/data/private.dic")
+ SET(DICTIONARIES "${DICOMDIC}" "${PRIVATEDIC}")
+
+-ADD_EXECUTABLE(mkdictbi EXCLUDE_FROM_ALL mkdictbi dctagkey dcdicent dcdict dcdictbi dcvr dchashdi cmdlnarg dctypes)
+-ADD_EXECUTABLE(mkdeftag EXCLUDE_FROM_ALL mkdeftag dctagkey dcdicent dcdict dcdictbi dcvr dchashdi cmdlnarg dctypes)
+-TARGET_LINK_LIBRARIES(mkdictbi ofstd oflog)
+-TARGET_LINK_LIBRARIES(mkdeftag ofstd oflog)
++IF(BUILD_APPS)
++ # don't use DCMTK_ADD_EXECUTABLE() since we don't want to install the files
++ ADD_EXECUTABLE(mkdictbi EXCLUDE_FROM_ALL mkdictbi dctagkey dcdicent dcdict dcdictbi dcvr dchashdi cmdlnarg dctypes)
++ ADD_EXECUTABLE(mkdeftag EXCLUDE_FROM_ALL mkdeftag dctagkey dcdicent dcdict dcdictbi dcvr dchashdi cmdlnarg dctypes)
++ENDIF(BUILD_APPS)
++DCMTK_TARGET_LINK_MODULES(mkdictbi ofstd oflog)
++DCMTK_TARGET_LINK_MODULES(mkdeftag ofstd oflog)
+
+ ADD_CUSTOM_TARGET(gendeftag
+ COMMAND mkdeftag -o ${dcmdata_SOURCE_DIR}/include/dcmtk/dcmdata/dcdeftag.h ${DICTIONARIES}
+--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/dcvrod.cc
++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/dcvrod.cc
+@@ -26,6 +26,7 @@
+
+ #include "dcmtk/dcmdata/dcvrod.h"
+ #include "dcmtk/dcmdata/dcvrfd.h"
++#include "dcmtk/dcmdata/dcswap.h"
+ #include "dcmtk/dcmdata/dcuid.h" /* for UID generation */
+
+
+@@ -106,11 +107,24 @@ OFCondition DcmOtherDouble::writeXML(STD
+ /* for an empty value field, we do not need to do anything */
+ if (getLengthField() > 0)
+ {
+- /* generate a new UID but the binary data is not (yet) written. */
+- OFUUID uuid;
+- out << "<BulkData uuid=\"";
+- uuid.print(out, OFUUID::ER_RepresentationHex);
+- out << "\"/>" << OFendl;
++ /* encode binary data as Base64 */
++ if (flags & DCMTypes::XF_encodeBase64)
++ {
++ out << "<InlineBinary>";
++ Uint8 *byteValues = OFstatic_cast(Uint8 *, getValue());
++ /* Base64 encoder requires big endian input data */
++ swapIfNecessary(EBO_BigEndian, gLocalByteOrder, byteValues, getLengthField(), sizeof(Float64));
++ /* update the byte order indicator variable correspondingly */
++ setByteOrder(EBO_BigEndian);
++ OFStandard::encodeBase64(out, byteValues, OFstatic_cast(size_t, getLengthField()));
++ out << "</InlineBinary>" << OFendl;
++ } else {
++ /* generate a new UID but the binary data is not (yet) written. */
++ OFUUID uuid;
++ out << "<BulkData uuid=\"";
++ uuid.print(out, OFUUID::ER_RepresentationHex);
++ out << "\"/>" << OFendl;
++ }
+ }
+ } else {
+ /* write element value (if loaded) */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/dcvrat.cc
++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/dcvrat.cc
+@@ -1,6 +1,6 @@
+ /*
+ *
+- * Copyright (C) 1994-2011, OFFIS e.V.
++ * Copyright (C) 1994-2013, OFFIS e.V.
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation were developed by
+@@ -147,6 +147,47 @@ void DcmAttributeTag::print(STD_NAMESPAC
+ }
+
+
++// ********************************
++
++
++OFCondition DcmAttributeTag::writeXML(STD_NAMESPACE ostream &out,
++ const size_t flags)
++{
++ /* AT requires special handling in the Native DICOM Model format */
++ if (flags & DCMTypes::XF_useNativeModel)
++ {
++ /* write normal XML start tag */
++ DcmElement::writeXMLStartTag(out, flags);
++ /* get unsigned integer data */
++ Uint16 *uintVals;
++ getUint16Array(uintVals);
++ const unsigned long vm = getVM();
++ /* check for empty/invalid value */
++ if ((uintVals != NULL) && (vm > 0))
++ {
++ out << STD_NAMESPACE uppercase << STD_NAMESPACE setfill('0');
++ /* print tag values "ggggeeee" in hex mode (upper case!) */
++ for (unsigned long valNo = 0; valNo < vm; valNo++)
++ {
++ out << "<Value number=\"" << (valNo + 1) << "\">";
++ out << STD_NAMESPACE hex << STD_NAMESPACE setw(4) << (*(uintVals++));
++ out << STD_NAMESPACE setw(4) << (*(uintVals++)) << STD_NAMESPACE dec;
++ out << "</Value>" << OFendl;
++ }
++ /* reset i/o manipulators */
++ out << STD_NAMESPACE nouppercase << STD_NAMESPACE setfill(' ');
++ }
++ /* write normal XML end tag */
++ DcmElement::writeXMLEndTag(out, flags);
++ /* always report success */
++ return EC_Normal;
++ } else {
++ /* DCMTK-specific format does not require anything special */
++ return DcmElement::writeXML(out, flags);
++ }
++}
++
++
+ // ********************************
+
+
+--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/dcvrpn.cc
++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/dcvrpn.cc
+@@ -13,7 +13,7 @@
+ *
+ * Module: dcmdata
+ *
+- * Author: Gerd Ehlers, Andreas Barth
++ * Author: Gerd Ehlers, Andreas Barth, Joerg Riesmeier
+ *
+ * Purpose: Implementation of class DcmPersonName
+ *
+@@ -125,7 +125,7 @@ OFCondition DcmPersonName::writeXML(STD_
+ /* strings to hold family, first, and middle name as well as prefix and suffix component */
+ OFString components[5];
+ /* arrays in order to permit looping while creating the output */
+- const char* compGroupNames[3] = { "SingleByte", "Ideographic", "Phonetic" };
++ const char* compGroupNames[3] = { "Alphabetic", "Ideographic", "Phonetic" };
+ const char* compNames[5] = { "FamilyName", "GivenName", "MiddleName", "NamePrefix", "NameSuffix" };
+ for (unsigned int it = 0; it < vm; it++)
+ {
+@@ -450,15 +450,18 @@ OFCondition DcmPersonName::checkStringVa
+ /* search for next component separator */
+ const size_t posEnd = value.find('\\', posStart);
+ const size_t length = (posEnd == OFString_npos) ? valLen - posStart : posEnd - posStart;
+- /* currently, the VR checker only supports ASCII and Latin-1 */
+- if (charset.empty() || (charset == "ISO_IR 6") || (charset == "ISO_IR 100"))
++ if (dcmEnableVRCheckerForStringValues.get())
+ {
+- /* check value representation */
+- const int vrID = DcmElement::scanValue(value, "pn", posStart, length);
+- if (vrID != 11)
++ /* currently, the VR checker only supports ASCII and Latin-1 */
++ if (charset.empty() || (charset == "ISO_IR 6") || (charset == "ISO_IR 100"))
+ {
+- result = EC_ValueRepresentationViolated;
+- break;
++ /* check value representation */
++ const int vrID = DcmElement::scanValue(value, "pn", posStart, length);
++ if (vrID != 11)
++ {
++ result = EC_ValueRepresentationViolated;
++ break;
++ }
+ }
+ }
+ posStart = (posEnd == OFString_npos) ? posEnd : posEnd + 1;
+--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/Makefile.dep
++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/Makefile.dep
+@@ -2769,7 +2769,8 @@ dcvrod.o: dcvrod.cc ../../config/include
+ ../../ofstd/include/dcmtk/ofstd/offile.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstd.h ../include/dcmtk/dcmdata/dcvr.h \
+ ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \
+- ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcuid.h
++ ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcswap.h \
++ ../include/dcmtk/dcmdata/dcuid.h
+ dcvrof.o: dcvrof.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../../ofstd/include/dcmtk/ofstd/ofuuid.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+@@ -2816,7 +2817,8 @@ dcvrof.o: dcvrof.cc ../../config/include
+ ../../ofstd/include/dcmtk/ofstd/offile.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstd.h ../include/dcmtk/dcmdata/dcvr.h \
+ ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \
+- ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcuid.h
++ ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcswap.h \
++ ../include/dcmtk/dcmdata/dcuid.h
+ dcvrpn.o: dcvrpn.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmdata/dcvrpn.h ../include/dcmtk/dcmdata/dcchrstr.h \
+ ../include/dcmtk/dcmdata/dcbytstr.h ../include/dcmtk/dcmdata/dctypes.h \
+--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/dcbytstr.cc
++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/dcbytstr.cc
+@@ -1,6 +1,6 @@
+ /*
+ *
+- * Copyright (C) 1994-2012, OFFIS e.V.
++ * Copyright (C) 1994-2013, OFFIS e.V.
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation were developed by
+@@ -34,6 +34,11 @@
+ #include "dcmtk/ofstd/ofstdinc.h"
+
+
++// global flags
++
++OFGlobal<OFBool> dcmEnableVRCheckerForStringValues(OFTrue);
++
++
+ // global function to get a particular component of a DICOM string
+ OFCondition getStringPart(OFString &result,
+ const char *str,
+@@ -173,7 +178,7 @@ Uint32 DcmByteString::getRealLength()
+ /* strips non-significant trailing spaces (padding) and determines 'realLength' */
+ makeMachineByteString();
+ }
+- /* strig length of the internal representation */
++ /* string length of the internal representation */
+ return realLength;
+ }
+
+@@ -742,12 +747,15 @@ OFCondition DcmByteString::checkStringVa
+ /* check value length (if a maximum is specified) */
+ if ((maxLen > 0) && (value.length() > maxLen))
+ result = EC_MaximumLengthViolated;
+- /* currently, the VR checker only supports ASCII and Latin-1 */
+- else if (charset.empty() || (charset == "ISO_IR 6") || (charset == "ISO_IR 100"))
++ else if (dcmEnableVRCheckerForStringValues.get())
+ {
+- /* check value representation */
+- if (DcmElement::scanValue(value, vr) != vrID)
+- result = EC_ValueRepresentationViolated;
++ /* currently, the VR checker only supports ASCII and Latin-1 */
++ if (charset.empty() || (charset == "ISO_IR 6") || (charset == "ISO_IR 100"))
++ {
++ /* check value representation */
++ if (DcmElement::scanValue(value, vr) != vrID)
++ result = EC_ValueRepresentationViolated;
++ }
+ }
+ } else {
+ size_t posStart = 0;
+@@ -765,14 +773,17 @@ OFCondition DcmByteString::checkStringVa
+ result = EC_MaximumLengthViolated;
+ break;
+ }
+- /* currently, the VR checker only supports ASCII and Latin-1 */
+- else if (charset.empty() || (charset == "ISO_IR 6") || (charset == "ISO_IR 100"))
++ else if (dcmEnableVRCheckerForStringValues.get())
+ {
+- /* check value representation */
+- if (DcmElement::scanValue(value, vr, posStart, length) != vrID)
++ /* currently, the VR checker only supports ASCII and Latin-1 */
++ if (charset.empty() || (charset == "ISO_IR 6") || (charset == "ISO_IR 100"))
+ {
+- result = EC_ValueRepresentationViolated;
+- break;
++ /* check value representation */
++ if (DcmElement::scanValue(value, vr, posStart, length) != vrID)
++ {
++ result = EC_ValueRepresentationViolated;
++ break;
++ }
+ }
+ }
+ posStart = (posEnd == OFString_npos) ? posEnd : posEnd + 1;
+--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/dcvrda.cc
++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/dcvrda.cc
+@@ -1,6 +1,6 @@
+ /*
+ *
+- * Copyright (C) 1994-2011, OFFIS e.V.
++ * Copyright (C) 1994-2013, OFFIS e.V.
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation were developed by
+@@ -265,29 +265,32 @@ OFCondition DcmDate::checkStringValue(co
+ const size_t valLen = value.length();
+ if (valLen > 0)
+ {
+- size_t posStart = 0;
+- unsigned long vmNum = 0;
+- /* iterate over all value components */
+- while (posStart != OFString_npos)
+- {
+- ++vmNum;
+- /* search for next component separator */
+- const size_t posEnd = value.find('\\', posStart);
+- const size_t length = (posEnd == OFString_npos) ? valLen - posStart : posEnd - posStart;
+- /* check value representation */
+- const int vrID = DcmElement::scanValue(value, "da", posStart, length);
+- if ((vrID != 2) && (!oldFormat || (vrID != 3)) && (vrID != 17))
++ size_t posStart = 0;
++ unsigned long vmNum = 0;
++ /* iterate over all value components */
++ while (posStart != OFString_npos)
+ {
+- result = EC_ValueRepresentationViolated;
+- break;
++ ++vmNum;
++ /* search for next component separator */
++ const size_t posEnd = value.find('\\', posStart);
++ const size_t length = (posEnd == OFString_npos) ? valLen - posStart : posEnd - posStart;
++ if (dcmEnableVRCheckerForStringValues.get())
++ {
++ /* check value representation */
++ const int vrID = DcmElement::scanValue(value, "da", posStart, length);
++ if ((vrID != 2) && (!oldFormat || (vrID != 3)) && (vrID != 17))
++ {
++ result = EC_ValueRepresentationViolated;
++ break;
++ }
++ }
++ posStart = (posEnd == OFString_npos) ? posEnd : posEnd + 1;
++ }
++ if (result.good() && !vm.empty())
++ {
++ /* check value multiplicity */
++ result = DcmElement::checkVM(vmNum, vm);
+ }
+- posStart = (posEnd == OFString_npos) ? posEnd : posEnd + 1;
+- }
+- if (result.good() && !vm.empty())
+- {
+- /* check value multiplicity */
+- result = DcmElement::checkVM(vmNum, vm);
+- }
+ }
+ return result;
+ }
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/img2dcm.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/img2dcm.man
+@@ -253,10 +253,10 @@ New Study and Series Instance UIDs are g
+ applying the \e --study-from and \e --series options. If Study Instance UID or
+ Series Instance UID are not present after these steps, they are newly generated,
+ independently from each other.
+-A contrary behaviour is chosen for the SOP Instance UID that one could expect
++A contrary behavior is chosen for the SOP Instance UID that one could expect
+ to be taken over when using the \e --dataset-from option. This is \b not the
+ case, the SOP Instance UID is \b not copied to the new object. This should
+-be the desirable behaviour for most use cases. However, if a certain SOP
++be the desirable behavior for most use cases. However, if a certain SOP
+ Instance UID should be inserted into the new object, the \e --key option should
+ be used.
+
+@@ -290,8 +290,8 @@ and slightly transformed (e. g. JFIF hea
+ conversion of even big JPEG files without the need of decoding and re-encoding.
+ The JPEG plugin chooses the necessary output transfer syntax automatically
+ depending on the actual encoding of the data inside the JPEG file. Therefore,
+-the following Transfer Syntaxes (and their corresponding JPEG encodings) are used
+-by the JPEG plugin:
++the following Transfer Syntaxes (and their corresponding JPEG encodings) are
++used by the JPEG plugin:
+
+ \li JPEG Coding Process 1
+ Baseline, Lossy, Non-Hierarchical, Sequential, DCT, Huffman, 8 Bit
+@@ -311,7 +311,7 @@ The support for the Extended JPEG Transf
+ (\e --disable-ext option) as well as the support for the (retired) Progressive
+ JPEG Transfer Syntax (\e --disable-progr option).
+
+-JPEG lossless encoding as well as any arithmethic or hierarchical JPEG encoding
++JPEG lossless encoding as well as any arithmetic or hierarchical JPEG encoding
+ modes are not supported by the plugin.
+
+ JFIF (JPEG File Interchange Format) information facilitates optional APPn
+@@ -351,10 +351,10 @@ Please note that the first one is deprec
+ but is selected as a default because it is widely supported. Future versions
+ of \b img2dcm might provide further output plugins for other SOP Classes.
+
+-For the new Secondary Capture SOP classes, it is not possible to specifiy which
++For the new Secondary Capture SOP classes, it is not possible to specify which
+ specific SOP class should be used for output. That is because these new SOP
+-classes are differentiated from each other by colour depth (1/8/16) and the
+-fact whether the image is black/white or colour. That is why \b img2dcm decides
++classes are differentiated from each other by color depth (1/8/16) and the
++fact whether the image is black/white or color. That is why \b img2dcm decides
+ during conversion, which output SOP class is suitable for a given source image.
+
+ \section examples EXAMPLES
+@@ -449,7 +449,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -458,7 +458,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -470,7 +470,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -491,6 +491,6 @@ images
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2007-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2007-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcm2pdf.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcm2pdf.man
+@@ -171,7 +171,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -180,7 +180,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -192,7 +192,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -206,6 +206,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2007-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2007-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/pdf2dcm.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/pdf2dcm.man
+@@ -140,7 +140,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -149,7 +149,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -161,7 +161,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -175,6 +175,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2005-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2005-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmdrle.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmdrle.man
+@@ -70,7 +70,7 @@ input file format:
+ -f --read-dataset
+ read data set without file meta information
+
+- # This option allows to decompress RLE compressed DICOM objects that have
++ # This option allows one to decompress RLE compressed DICOM objects that have
+ # been stored as dataset without meta-header. Such a thing should not exist
+ # since the transfer syntax cannot be reliably determined without meta-header,
+ # but unfortunately it does.
+@@ -94,8 +94,8 @@ RLE byte segment order:
+ +br --byte-order-reverse
+ least significant byte first
+
+- # This option allows to decompress RLE compressed DICOM files in which the
+- # order of byte segments is encoded in incorrect order. This only affects
++ # This option allows one to decompress RLE compressed DICOM files in which
++ # the order of byte segments is encoded in incorrect order. This only affects
+ # images with more than one byte per sample.
+ \endverbatim
+
+@@ -212,7 +212,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -221,7 +221,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -233,7 +233,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -247,6 +247,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2002-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany
++Copyright (C) 2002-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmftest.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmftest.man
+@@ -30,7 +30,7 @@ DICOM "magic word" 'DICM' at byte positi
+ the complete data set. For each file the test result is printed to \e stdout
+ in the form "yes: <filename>\n" or "no: <filename>\n". The utility terminates
+ with a return code corresponding to the number of files found to be non-DICOM,
+-i.e. if all files pass as DICOM files, the return value is 0. This behaviour
++i.e. if all files pass as DICOM files, the return value is 0. This behavior
+ is intended for use in shell script programming.
+
+ \section see_also SEE ALSO
+@@ -39,6 +39,6 @@ is intended for use in shell script prog
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1997-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1997-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+\ No newline at end of file
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcm2xml.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcm2xml.man
+@@ -241,7 +241,8 @@ additional attribute "binary" with a val
+ command line option \e --write-binary-data causes also binary value fields to
+ be printed (attribute value is "yes" or "base64"). But, be careful when using
+ this option together with \e --load-all because of the large amounts of pixel
+-data that might be printed to the output.
++data that might be printed to the output. Please note that in this context
++element values with a VR of OD or OF are not regarded as "binary information".
+
+ Multiple values (i.e. where the DICOM value multiplicity is greater than 1)
+ are separated by a backslash "\" (except for Base64 encoded data). The "len"
+@@ -271,8 +272,8 @@ available in future versions of \b dcm2x
+ In addition, Supplement 163 (Store Over the Web by Representational State
+ Transfer Services) introduces a new \<InlineBinary\> XML element that allows
+ for encoding binary data as Base64. Currently, the command line option
+-\e --encode-base64 enables this encoding for the following VRs: OB, OW, UN.
+-That means in particular, OD and OF are still missing.
++\e --encode-base64 enables this encoding for the following VRs: OB, OD, OF, OW,
++and UN.
+
+ \subsection known_issues Known Issues
+
+@@ -280,8 +281,8 @@ In addition to what is written in the ab
+ further known issues with the current implementation of the Native DICOM Model
+ format. For example, large element values with a VR other than OB, OD, OF, OW
+ or UN are currently never written as bulk data, although it might be useful,
+-e.g. for very long text elements (especially UT) or very long numeric fields (of
+-various VRs).
++e.g. for very long text elements (especially UT) or very long numeric fields
++(of various VRs).
+
+ \section notes NOTES
+
+@@ -342,7 +343,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -351,7 +352,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -363,7 +364,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmdump.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmdump.man
+@@ -357,7 +357,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -366,7 +366,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -378,7 +378,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -392,6 +392,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1994-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1994-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmgpdir.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmgpdir.man
+@@ -192,19 +192,19 @@ length encoding in sequences and items:
+
+ \section notes NOTES
+
+-All files specified on the command line (or discovered by recursivly examining
++All files specified on the command line (or discovered by recursively examining
+ the contents of directories with the \e +r option) are first evaluated for
+ their compatibility with the General Purpose CD-R Image Interchange Profile
+ (Supplement 19). Only appropriate files encoded using the Explicit VR Little
+ Endian Uncompressed Transfer Syntax will be accepted. Files having invalid
+ filenames will be rejected (the rules can be relaxed via the \e +m option).
+ Files missing required attributes will be rejected (the \e +I option can relax
+-this behaviour).
++this behavior).
+
+ A \e DICOMDIR file will only be constructed if all files have passed initial
+ tests.
+
+-The \b dcmgpdir utility also allows to append new entries to and to update
++The \b dcmgpdir utility also allows one to append new entries to and to update
+ existing entries in a \e DICOMDIR file. Using option \e +A new entries are
+ only appended to the DICOMDIR, i.e. existing records like the ones for PATIENT
+ information are not updated. Using option \e +U also existing records are
+@@ -255,7 +255,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -264,7 +264,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -276,7 +276,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -290,6 +290,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1996-2011 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1996-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmodify.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmodify.man
+@@ -14,9 +14,9 @@ dcmodify [options] dcmfile-in...
+
+ \section description DESCRIPTION
+
+-\b dcmodify is a tool that allows to modify, insert and delete tags and items
+-in DICOM files. Sequences and tags with a value multiplicity > 1 are also
+-supported. Metaheader information and the tag's VR can not be modified
++\b dcmodify is a tool that allows one to modify, insert and delete tags and
++items in DICOM files. Sequences and tags with a value multiplicity > 1 are
++also supported. Metaheader information and the tag's VR can not be modified
+ directly by \b dcmodify at this time. In addition to tag modifications,
+ \b dcmodify makes available some input options - forcing \b dcmodify to
+ handle its input files as the user specifies - and output options to control
+@@ -29,12 +29,11 @@ representation (VR). Usually, an error
+ user should take care of the right VR usage.
+
+ If \b dcmodify doesn't know the tag it should insert, then the tag's VR is set
+-to UN and the value provided on commandline is interpreted as being a
+-series of hexadecimal numbers (like they are provided for VR=OB). Please
+-insert these tags into the dictionary to avoid this behaviour. Also,
+-specifying the \e -iun option, it is possible to force \b dcmodify to
+-leave UN values untouched. Using option \e -u lets \b dcmodify saving all
+-VR=UN attributes as OB.
++to UN and the value provided on command line is interpreted as being a series
++of hexadecimal numbers (like they are provided for VR=OB). Please insert these
++tags into the dictionary to avoid this behavior. Also, specifying the \e -iun
++option, it is possible to force \b dcmodify to leave UN values untouched.
++Using option \e -u lets \b dcmodify saving all VR=UN attributes as OB.
+
+ \b dcmodify is able to work with so-called tag paths to access tags in
+ sequences. The (pseudo-formalized) syntax is
+@@ -327,7 +326,7 @@ dictionary. So please be careful to ent
+
+ If you wish to change a private tags value \e and VR, because you just added
+ this tag to your dictionary, you can delete it with \b dcmodify and re-insert
+-it. Then \b dcmodify uses your dicitionary entry to determine the right VR
++it. Then \b dcmodify uses your dictionary entry to determine the right VR
+ (also see subsection insertions).
+
+ Also, see description above how inserting values into elements with unknown VR
+@@ -347,11 +346,11 @@ For the deletion of private non-reservat
+ \b dcmodify will automatically correct 'Media Storage SOP Class UID' and
+ 'Media Storage SOP Instance UID' in the metaheader, if you make changes to the
+ related tags in the dataset ('SOP Class UID' and 'SOP Instance UID') via
+-insert or modify mode options. You can disable this behaviour by using the
++insert or modify mode options. You can disable this behavior by using the
+ \e -nmu option.
+
+ If you generate new UID's with \e -gst, \e -gse or \e -gin, this will only
+-affect the UID you choosed to generate. So if you use \e -gst to generate a
++affect the UID you chose to generate. So if you use \e -gst to generate a
+ new 'Study Instance UID', then 'Series Instance UID' and 'SOP Instance UID'
+ will not be affected! This gives you the possibility to generate each value
+ separately. Normally, you would also modify the 'underlying' UIDs. As a
+@@ -360,7 +359,7 @@ disadvantage of this flexibility, the us
+ by the user as necessary.
+
+ When choosing the \e -gin option, the related metaheader tag ('Media Storage
+-SOP Instance UID') is updated automatically. This behaviour cannot be
++SOP Instance UID') is updated automatically. This behavior cannot be
+ disabled.
+
+ \section creating_new_files CREATING NEW FILES
+@@ -368,8 +367,8 @@ disabled.
+ Option \e --create-file lets \b dcmodify create a file if it does not already
+ exist on disk. This can be used in order to create files from scratch by
+ performing consecutive insertions with options like \e --insert. This might
+-especially become handy when creating query files for tools like findscu or
+-movescu. In case no specific output transfer syntax is defined, \b dcmodify
++especially become handy when creating query files for tools like \b findscu or
++\b movescu. In case no specific output transfer syntax is defined, \b dcmodify
+ chooses Little Endian Explicit Uncompressed for output. Files that are newly
+ created are always written as DICOM file format, i.e. option \e --write-dataset
+ is not permitted together with \e --create. This way, at least the metaheader
+@@ -394,7 +393,7 @@ possible for all basic operations, i.e.
+ intermediate path nodes a powerful tool for construction and processing complex
+ datasets.
+
+-The options \e -ma and \e -ea for modifying or deleting all occurences of a
++The options \e -ma and \e -ea for modifying or deleting all occurrences of a
+ DICOM element based on its tag do not accept any wildcards but only work on
+ single elements (i.e. a single dictionary name or tag key).
+
+@@ -514,7 +513,7 @@ single elements (i.e. a single dictionar
+ one returns an error, the others are being performed anyway. However in case
+ of any error, the modified file is not saved, unless the \e --ignore-errors
+ option is specified. If that option is selected, \b dcmodify also
+-continues modifying further files specified on commandline; otherwise
++continues modifying further files specified on command line; otherwise
+ \b dcmodify exits after the first file that had modification errors.
+
+ If the \e --ignore-missing-tags option is enabled, any modify or erase
+@@ -551,7 +550,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -560,7 +559,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -572,7 +571,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmconv.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmconv.man
+@@ -323,7 +323,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -332,7 +332,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -344,7 +344,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -358,6 +358,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1994-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1994-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/xml2dcm.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/xml2dcm.man
+@@ -299,7 +299,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -308,7 +308,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -320,7 +320,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -338,6 +338,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2003-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2003-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dump2dcm.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/dump2dcm.man
+@@ -277,7 +277,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -286,7 +286,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -298,7 +298,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -312,6 +312,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1996-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1996-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmcrle.man
++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmcrle.man
+@@ -212,7 +212,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -221,7 +221,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -233,7 +233,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -247,6 +247,6 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2002-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2002-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmwlm/libsrc/wlds.cc
++++ dcmtk-3.6.1~20131114/dcmwlm/libsrc/wlds.cc
+@@ -329,7 +329,7 @@ void WlmDataSource::CheckSequenceElement
+ // which pertains to a certain command line option
+ if( noSequenceExpansion == OFFalse )
+ {
+- // if the user did not explicitely disable the expansion of empty sequences in C-FIND request
++ // if the user did not explicitly disable the expansion of empty sequences in C-FIND request
+ // messages go ahead and expand this sequence according to the remark above
+ ExpandEmptySequenceInSearchMask( element );
+ }
+@@ -431,7 +431,7 @@ void WlmDataSource::ExpandEmptySequenceI
+ // contains a sequence attribute which contains no item or a single empty item, all
+ // attributes from that particular sequence are in fact queried and shall be returned
+ // by the SCP. This implementation accounts for this specification by inserting a
+-// corresponding single item with all required attributes into such emtpy sequences.
++// corresponding single item with all required attributes into such empty sequences.
+ // This function performs the insertion of the required item and attributes.
+ // Parameters : element - [inout] Pointer to the currently processed element.
+ // Return Value : none.
+@@ -656,7 +656,8 @@ OFBool WlmDataSource::CheckMatchingKey(
+ ok = OFFalse;
+ }
+ else
+- return OFTrue;
++ ok = OFTrue;
++ break;
+
+ case EVR_TM:
+ // get string value
+@@ -670,7 +671,8 @@ OFBool WlmDataSource::CheckMatchingKey(
+ ok = OFFalse;
+ }
+ else
+- return OFTrue;
++ ok = OFTrue;
++ break;
+
+ case EVR_CS:
+ // get string value
+@@ -684,7 +686,8 @@ OFBool WlmDataSource::CheckMatchingKey(
+ ok = OFFalse;
+ }
+ else
+- return OFTrue;
++ ok = OFTrue;
++ break;
+
+ case EVR_AE:
+ // get string value
+@@ -698,7 +701,8 @@ OFBool WlmDataSource::CheckMatchingKey(
+ ok = OFFalse;
+ }
+ else
+- return OFTrue;
++ ok = OFTrue;
++ break;
+
+ case EVR_PN:
+ // get string value
+@@ -712,7 +716,8 @@ OFBool WlmDataSource::CheckMatchingKey(
+ ok = OFFalse;
+ }
+ else
+- return OFTrue;
++ ok = OFTrue;
++ break;
+
+ case EVR_LO:
+ // get string value
+@@ -726,7 +731,8 @@ OFBool WlmDataSource::CheckMatchingKey(
+ ok = OFFalse;
+ }
+ else
+- return OFTrue;
++ ok = OFTrue;
++ break;
+
+ case EVR_SH:
+ // get string value
+@@ -740,7 +746,8 @@ OFBool WlmDataSource::CheckMatchingKey(
+ ok = OFFalse;
+ }
+ else
+- return OFTrue;
++ ok = OFTrue;
++ break;
+
+ default:
+ break;
+--- dcmtk-3.6.1~20131114.orig/dcmwlm/docs/wlmscpfs.man
++++ dcmtk-3.6.1~20131114/dcmwlm/docs/wlmscpfs.man
+@@ -235,11 +235,11 @@ LittleEndianExplicitTransferSyntax 1.
+ BigEndianExplicitTransferSyntax 1.2.840.10008.1.2.2
+ \endverbatim
+
+-The default behaviour of the \b wlmscpfs application is to prefer transfer
++The default behavior of the \b wlmscpfs application is to prefer transfer
+ syntaxes having an explicit encoding over the default implicit transfer
+ syntax. If \b wlmscpfs is running on big-endian hardware it will prefer
+ BigEndianExplicit to LittleEndianExplicit transfer syntax (and vice versa).
+-This behaviour can be changed with the \e --prefer options (see above).
++This behavior can be changed with the \e --prefer options (see above).
+
+ If compiled with zlib support enabled (see \e --version output) and if
+ option \e --prefer-deflated is used, also the following transfer syntax
+@@ -408,7 +408,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -417,7 +417,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -429,7 +429,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+--- dcmtk-3.6.1~20131114.orig/dcmrt/docs/drtdump.man
++++ dcmtk-3.6.1~20131114/dcmrt/docs/drtdump.man
+@@ -146,7 +146,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -155,7 +155,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -167,7 +167,7 @@ in the \e DCMDICTPATH environment variab
+ <em>\<datadir\>/dicom.dic</em> will be loaded unless the dictionary is built
+ into the application (default for Windows).
+
+-The default behaviour should be preferred and the \e DCMDICTPATH environment
++The default behavior should be preferred and the \e DCMDICTPATH environment
+ variable only used when alternative data dictionaries are required. The
+ \e DCMDICTPATH environment variable has the same format as the Unix shell
+ \e PATH variable in that a colon (":") separates entries. On Windows systems,
+@@ -181,7 +181,7 @@ It is an error if no data dictionary can
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2010-2012 by OFFIS e.V. and ICSMED AG, Escherweg 2, 26121
++Copyright (C) 2010-2013 by OFFIS e.V. and ICSMED AG, Escherweg 2, 26121
+ Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmimgle/docs/dconvlum.man
++++ dcmtk-3.6.1~20131114/dcmimgle/docs/dconvlum.man
+@@ -54,6 +54,6 @@ Barten's model (including GSDF).
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1999-2010 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1999-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+\ No newline at end of file
+--- dcmtk-3.6.1~20131114.orig/dcmimgle/docs/dcod2lum.man
++++ dcmtk-3.6.1~20131114/dcmimgle/docs/dcod2lum.man
+@@ -56,6 +56,6 @@ sample characteristics file monitors, ca
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 2002-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 2002-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
+--- dcmtk-3.6.1~20131114.orig/dcmimgle/docs/dcmdspfn.man
++++ dcmtk-3.6.1~20131114/dcmimgle/docs/dcmdspfn.man
+@@ -170,7 +170,7 @@ multiple values are allowed (1-n), a com
+ Command line options are distinguished from parameters by a leading '+' or '-'
+ sign, respectively. Usually, order and position of command line options are
+ arbitrary (i.e. they can appear anywhere). However, if options are mutually
+-exclusive the rightmost appearance is used. This behaviour conforms to the
++exclusive the rightmost appearance is used. This behavior conforms to the
+ standard evaluation rules of common Unix shells.
+
+ In addition, one or more command files can be specified using an '@' sign as a
+@@ -179,7 +179,7 @@ is replaced by the content of the corres
+ whitespaces are treated as a single separator unless they appear between two
+ quotation marks) prior to any further evaluation. Please note that a command
+ file cannot contain another command file. This simple but effective approach
+-allows to summarize common combinations of options/parameters and avoids
++allows one to summarize common combinations of options/parameters and avoids
+ longish and confusing command lines (an example is provided in file
+ <em>\<datadir\>/dumppat.txt</em>).
+
+@@ -196,6 +196,6 @@ longish and confusing command lines (an
+
+ \section copyright COPYRIGHT
+
+-Copyright (C) 1999-2012 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
++Copyright (C) 1999-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+
+ */
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/series
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-12-19 12:11:41 UTC (rev 15572)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-12-19 16:36:29 UTC (rev 15573)
@@ -5,7 +5,8 @@
system_charls.patch
datadic_install.patch
debian_iconv.patch
-spelling.patch
-ofstd_markup_6.patch
+#spelling.patch
+#ofstd_markup_6.patch
warn_unused_result.patch
setuid.patch
+import_git.patch
More information about the debian-med-commit
mailing list