[med-svn] [dcmtk] 03/10: Update for new release

Gert Wollny gewo at moszumanska.debian.org
Sun Aug 6 14:31:16 UTC 2017 

This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch master
in repository dcmtk.

commit 411e319684bcb121b009e5b4153d01f05e4036db
Author: Gert Wollny <gewo at debian.org>
Date:   Wed Aug 2 15:15:03 2017 +0000

    Update for new release
---
 debian/changelog                                   | 10 ++++
 debian/control                                     |  4 +-
 debian/libdcmtk11.install                          |  2 -
 debian/libdcmtk12.install                          |  2 +
 ...tian-overrides => libdcmtk12.lintian-overrides} |  6 +--
 debian/patches/02_system_charls.patch              | 57 +++++-----------------
 debian/patches/03_datadic_install.patch            | 27 +++++-----
 ...4_Fixed-OFoptional-by-introducing-OFalign.patch | 47 ++++++------------
 debian/patches/05_performance.patch                |  8 +--
 debian/patches/08_remove_system_processor.patch    |  8 +--
 debian/patches/09_round_time.patch                 | 23 +--------
 debian/patches/series                              |  2 +-
 debian/rules                                       |  2 +-
 debian/watch                                       |  2 +-
 14 files changed, 73 insertions(+), 127 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3db7128..961696a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dcmtk (3.6.2-1~exp1) experimental; urgency=medium
+
+  * Update d/watch
+  * New upstream version 3.6.2 Closes: #868867
+  * d/p/* refresh patches
+  * drop d/p/09_ because it was applied upstream   
+  * s/* update SO version
+
+ -- Gert Wollny <gewo at debian.org>  Wed, 02 Aug 2017 13:48:47 +0000
+
 dcmtk (3.6.1~20170228-2) unstable; urgency=medium
 
   * d/p/09: Improve numerical stability by rounding the time to 
diff --git a/debian/control b/debian/control
index 284f06f..de3cda4 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Description: OFFIS DICOM toolkit command line utilities
  .
  Note: This version was compiled with libssl support.
 
-Package: libdcmtk11
+Package: libdcmtk12
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
@@ -67,7 +67,7 @@ Depends: libxml2-dev,
          libwrap0-dev,
          libcharls-dev,
          libtiff-dev,
-         libdcmtk11 (= ${binary:Version}),
+         libdcmtk12 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: dcmtk-doc
 Breaks: libinsighttoolkit4-dev (<< 4.9.0)
diff --git a/debian/libdcmtk11.install b/debian/libdcmtk11.install
deleted file mode 100644
index b936c36..0000000
--- a/debian/libdcmtk11.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*.so.*
-usr/share/libdcmtk11/*.dic
diff --git a/debian/libdcmtk12.install b/debian/libdcmtk12.install
new file mode 100644
index 0000000..d0950e5
--- /dev/null
+++ b/debian/libdcmtk12.install
@@ -0,0 +1,2 @@
+usr/lib/*.so.*
+usr/share/libdcmtk12/*.dic
diff --git a/debian/libdcmtk11.lintian-overrides b/debian/libdcmtk12.lintian-overrides
similarity index 59%
rename from debian/libdcmtk11.lintian-overrides
rename to debian/libdcmtk12.lintian-overrides
index d3c05a4..e87a569 100644
--- a/debian/libdcmtk11.lintian-overrides
+++ b/debian/libdcmtk12.lintian-overrides
@@ -1,5 +1,5 @@
 # There is more than one library in one package bundles which makes perfectly
 # sense in this application but does not enable naming the library package apropriately
-libdcmtk11: package-name-doesnt-match-sonames
-libdcmtk11: embedded-library
-libdcmtk11: no-symbols-control-file
+libdcmtk12: package-name-doesnt-match-sonames
+libdcmtk12: embedded-library
+libdcmtk12: no-symbols-control-file
diff --git a/debian/patches/02_system_charls.patch b/debian/patches/02_system_charls.patch
index 3480bbf..e7b0f22 100644
--- a/debian/patches/02_system_charls.patch
+++ b/debian/patches/02_system_charls.patch
@@ -3,10 +3,8 @@ Author: Mathieu Malaterre <malat at debian.org>
 Bug-Debian: http://bugs.debian.org/705923
 Forwarded: no
 
-Index: b/dcmjpls/CMakeLists.txt
-===================================================================
---- a/dcmjpls/CMakeLists.txt	2016-11-07 12:41:34.000000000 +0100
-+++ b/dcmjpls/CMakeLists.txt	2016-11-12 19:01:40.000000000 +0100
+--- a/dcmjpls/CMakeLists.txt
++++ b/dcmjpls/CMakeLists.txt
 @@ -2,6 +2,6 @@
  PROJECT(dcmjpls)
  
@@ -15,24 +13,8 @@ Index: b/dcmjpls/CMakeLists.txt
 +FOREACH(SUBDIR libsrc apps include)
    ADD_SUBDIRECTORY(${SUBDIR})
  ENDFOREACH(SUBDIR)
-Index: b/dcmjpls/libsrc/CMakeLists.txt
-===================================================================
---- a/dcmjpls/libsrc/CMakeLists.txt	2016-11-07 12:41:34.000000000 +0100
-+++ b/dcmjpls/libsrc/CMakeLists.txt	2016-11-12 19:01:40.000000000 +0100
-@@ -1,7 +1,7 @@
- # declare additional include directories
--INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR})
-+INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${ZLIB_INCDIR})
- 
- # create library from source files
- DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
- 
--DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls)
-+DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage CharLS)
-Index: b/dcmjpls/libsrc/djerror.h
-===================================================================
---- a/dcmjpls/libsrc/djerror.h	2016-11-07 12:41:34.000000000 +0100
-+++ b/dcmjpls/libsrc/djerror.h	2016-11-12 19:01:40.000000000 +0100
+--- a/dcmjpls/libsrc/djerror.h
++++ b/dcmjpls/libsrc/djerror.h
 @@ -24,7 +24,7 @@
  
  #include "dcmtk/config/osconfig.h"
@@ -42,10 +24,8 @@ Index: b/dcmjpls/libsrc/djerror.h
  
  /** Helper class for converting between dcmjpls and CharLS error codes
   */
-Index: b/dcmjpls/libsrc/djcodecd.cc
-===================================================================
---- a/dcmjpls/libsrc/djcodecd.cc	2016-11-07 12:41:34.000000000 +0100
-+++ b/dcmjpls/libsrc/djcodecd.cc	2016-11-12 19:01:40.000000000 +0100
+--- a/dcmjpls/libsrc/djcodecd.cc
++++ b/dcmjpls/libsrc/djcodecd.cc
 @@ -37,7 +37,7 @@
  #include "djerror.h"                 /* for private class DJLSError */
  
@@ -55,10 +35,8 @@ Index: b/dcmjpls/libsrc/djcodecd.cc
  
  E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const
  {
-Index: b/dcmjpls/libsrc/djcodece.cc
-===================================================================
---- a/dcmjpls/libsrc/djcodece.cc	2016-11-07 12:41:34.000000000 +0100
-+++ b/dcmjpls/libsrc/djcodece.cc	2016-11-12 19:54:33.530316529 +0100
+--- a/dcmjpls/libsrc/djcodece.cc
++++ b/dcmjpls/libsrc/djcodece.cc
 @@ -55,7 +55,7 @@
  #include "dcmtk/dcmimgle/dcmimage.h"  /* for class DicomImage */
  
@@ -77,7 +55,7 @@ Index: b/dcmjpls/libsrc/djcodece.cc
      result = DJLSError::convert(err);
  
      if (result.good())
-@@ -1054,7 +1054,7 @@
+@@ -1055,7 +1055,7 @@
  
    size_t bytesWritten = 0;
  
@@ -86,10 +64,8 @@ Index: b/dcmjpls/libsrc/djcodece.cc
    result = DJLSError::convert(err);
  
    if (result.good())
-Index: b/dcmjpls/apps/CMakeLists.txt
-===================================================================
---- a/dcmjpls/apps/CMakeLists.txt	2016-11-07 12:41:34.000000000 +0100
-+++ b/dcmjpls/apps/CMakeLists.txt	2016-11-12 19:01:40.000000000 +0100
+--- a/dcmjpls/apps/CMakeLists.txt
++++ b/dcmjpls/apps/CMakeLists.txt
 @@ -8,5 +8,5 @@
  
  # make sure executables are linked to the corresponding libraries
@@ -97,14 +73,3 @@ Index: b/dcmjpls/apps/CMakeLists.txt
 -  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
 +  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd)
  ENDFOREACH(PROGRAM)
-Index: b/dcmjpls/libcharls/CMakeLists.txt
-===================================================================
---- a/dcmjpls/libcharls/CMakeLists.txt	2016-11-07 12:41:34.000000000 +0100
-+++ b/dcmjpls/libcharls/CMakeLists.txt	2016-11-12 19:01:40.000000000 +0100
-@@ -1,5 +1,5 @@
- # declare additional include directories
--INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/libcharls ${ofstd_SOURCE_DIR}/include)
-+INCLUDE_DIRECTORIES(${ofstd_SOURCE_DIR}/include)
- 
- # create library from source files
- DCMTK_ADD_LIBRARY(charls header intrface jpegls)
diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch
index 74fa1e4..b2dd8f7 100644
--- a/debian/patches/03_datadic_install.patch
+++ b/debian/patches/03_datadic_install.patch
@@ -3,16 +3,9 @@ Author: Mathieu Malaterre <malat at debian.org>
 Bug-Debian: http://bugs.debian.org/709123
 Forwarded: no
 
---- a/dcmdata/data/CMakeLists.txt
-+++ b/dcmdata/data/CMakeLists.txt
-@@ -1,2 +1,3 @@
- # declare installation files
--INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
-+INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
-+INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)
 --- a/CMake/GenerateDCMTKConfigure.cmake
 +++ b/CMake/GenerateDCMTKConfigure.cmake
-@@ -127,10 +127,10 @@
+@@ -134,10 +134,10 @@
    SET(ENVIRONMENT_PATH_SEPARATOR ";")
    # Set dictionary path to the data dir inside install main dir (prefix)
    IF(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
@@ -25,10 +18,10 @@ Forwarded: no
      ENDIF(ENABLE_PRIVATE_TAGS)
       # Again, for Windows strip all / from path and replace it with \\.
      STRING(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}")
-@@ -148,10 +148,10 @@
+@@ -155,10 +155,10 @@
    SET(ENVIRONMENT_PATH_SEPARATOR ":")
    # Set dictionary path to the data dir inside install main dir (prefix).
-   if (DCMTK_ENABLE_EXTERNAL_DICTIONARY)
+   IF(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
 -    SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIR}/dicom.dic")
 +    SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIC}/dicom.dic")
      # If private dictionary should be utilized, add it to default dictionary path.
@@ -36,5 +29,17 @@ Forwarded: no
 -      SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIR}/private.dic")
 +      SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIC}/private.dic")
      ENDIF(ENABLE_PRIVATE_TAGS)
-   ELSE (DCMTK_ENABLE_EXTERNAL_DICTIONARY)
+   ELSE(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
      SET(DCM_DICT_DEFAULT_PATH "")
+--- a/dcmdata/data/CMakeLists.txt
++++ b/dcmdata/data/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ # declare installation files
+-INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${DCMTK_INSTALL_DATDIR}" COMPONENT data)
+-
++INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
++INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)
++ 
+ # add paths to the dictionaries to a CMake variable for being used by the unit tests
+ SET(DCMTK_DICOM_DICTIONARIES
+   "${CMAKE_CURRENT_SOURCE_DIR}/dicom.dic"
diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
index b04375f..8b07109 100644
--- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
+++ b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
@@ -1,27 +1,12 @@
-From 21142a1d3354b5d4e97a2e160221ae391362e8c1 Mon Sep 17 00:00:00 2001
-From: Jan Schlamelcher <dicom at offis.de>
-Date: Fri, 4 Jul 2014 12:02:51 +0200
-Subject: [PATCH] Fixed OFoptional by introducing OFalign?
-
----
- CMake/GenerateDCMTKConfigure.cmake        |   29 +++
- CMake/osconfig.h.in                       |   12 +
- config/aclocal.m4                         |   41 +++
- config/configure                          |   60 +++++
- config/configure.in                       |    2 +
- config/include/dcmtk/config/osconfig.h.in |    6 +
- ofstd/include/dcmtk/ofstd/ofalign.h       |  190 ++++++++++++++
- ofstd/include/dcmtk/ofstd/ofoption.h      |  390 +++++++++++++++++++----------
- ofstd/include/dcmtk/ofstd/oftraits.h      |    4 +-
- ofstd/tests/toption.cc                    |    8 +
- 10 files changed, 610 insertions(+), 132 deletions(-)
- create mode 100644 ofstd/include/dcmtk/ofstd/ofalign.h
-
+From 21142a1d3354b5d4e97a2e160221ae391362e8c1 Mon Sep 17 00:00:00 2001
+From: Jan Schlamelcher <dicom at offis.de>
+Date: Fri, 4 Jul 2014 12:02:51 +0200
+Subject: [PATCH] Fixed OFoptional by introducing OFalign?
 --- a/CMake/osconfig.h.in
 +++ b/CMake/osconfig.h.in
-@@ -1146,4 +1146,7 @@
- /* The path on the Android device that should be used for temporary files */
- #cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@"
+@@ -1165,4 +1165,7 @@
+ /* Define if the compiler supports __declspec(align) */
+ #cmakedefine HAVE_DECLSPEC_ALIGN
  
 +/* Define if the compiler supports __declspec(align) */
 +#cmakedefine HAVE_DECLSPEC_ALIGN
@@ -29,8 +14,8 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  #endif /* !OSCONFIG_H*/
 --- a/config/aclocal.m4
 +++ b/config/aclocal.m4
-@@ -1490,6 +1490,47 @@
- fi
+@@ -1963,6 +1963,47 @@
+     fi
  ])
  
 +AC_DEFUN([AC_CHECK_ALIGNOF],
@@ -76,12 +61,12 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
 +])
  
  dnl
- dnl CHECK_VLA checks if the C Compiler supports variable-length arrays
+ dnl This macro checks if a given preprocessor symbol exists and is a string
 --- a/config/configure
 +++ b/config/configure
-@@ -15293,6 +15293,66 @@
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -16771,6 +16771,66 @@
+     fi
+ 
  
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __alignof__" >&5
 +$as_echo_n "checking for __alignof__... " >&6; }
@@ -148,9 +133,9 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  
 --- a/ofstd/tests/toption.cc
 +++ b/ofstd/tests/toption.cc
-@@ -38,6 +38,11 @@
- 
-     OFoptional<int> o0( 3 ), o1, o2( OFnullopt );
+@@ -43,6 +43,11 @@
+     COUT << OFalignof(OFoptional<float>) << ' ' << sizeof(OFoptional<float>) << OFendl;
+     COUT << OFalignof(long) << ' ' << sizeof(long) << ' ' << OFalignof(OFoptional<long>) << ' ' << sizeof(OFoptional<long>) << OFendl;
  
 +    COUT << OFalignof(OFoptional<char>) << ' ' << sizeof(OFoptional<char>) << OFendl;
 +    COUT << OFalignof(OFoptional<short>) << ' ' << sizeof(OFoptional<short>) << OFendl;
diff --git a/debian/patches/05_performance.patch b/debian/patches/05_performance.patch
index 61fc8d7..7004827 100644
--- a/debian/patches/05_performance.patch
+++ b/debian/patches/05_performance.patch
@@ -6,10 +6,10 @@ Description: Fix a DCMTK performance problem
 
 --- a/dcmnet/libsrc/dul.cc
 +++ b/dcmnet/libsrc/dul.cc
-@@ -1789,7 +1789,7 @@
+@@ -1862,7 +1862,7 @@
+         msg += OFStandard::getLastNetworkErrorCode().message();
          return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
      }
- #endif
 -    setTCPBufferLength(sock);
 +    //setTCPBufferLength(sock);
  
@@ -17,10 +17,10 @@ Description: Fix a DCMTK performance problem
       * Disable the so-called Nagle algorithm (if requested).
 --- a/dcmnet/libsrc/dulfsm.cc
 +++ b/dcmnet/libsrc/dulfsm.cc
-@@ -2419,7 +2419,7 @@
+@@ -2447,7 +2447,7 @@
+           msg += OFStandard::getLastNetworkErrorCode().message();
            return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
          }
- #endif
 -        setTCPBufferLength(s);
 +        //setTCPBufferLength(s);
  
diff --git a/debian/patches/08_remove_system_processor.patch b/debian/patches/08_remove_system_processor.patch
index 22e7617..526c577 100644
--- a/debian/patches/08_remove_system_processor.patch
+++ b/debian/patches/08_remove_system_processor.patch
@@ -4,7 +4,7 @@ Author: Gert Wollny <gw.fossdev at gmail.com>
 
 --- a/CMake/GenerateDCMTKConfigure.cmake
 +++ b/CMake/GenerateDCMTKConfigure.cmake
-@@ -108,15 +108,6 @@
+@@ -115,15 +115,6 @@
  
  # Configure file
  
@@ -18,11 +18,11 @@ Author: Gert Wollny <gw.fossdev at gmail.com>
 -DCMTK_UNSET(SYSTEM_PROCESSOR)
 -
  # Configure dictionary path and install prefix
- IF(WIN32 AND NOT CYGWIN AND NOT MINGW)
+ IF(WIN32 AND NOT CYGWIN)
    # Set DCMTK_PREFIX needed within some code. Be sure that all / are replaced by \\.
 --- a/CMake/dcmtkPrepare.cmake
 +++ b/CMake/dcmtkPrepare.cmake
-@@ -360,11 +360,6 @@
+@@ -389,11 +389,6 @@
    OPTION(DCMTK_FORCE_FPIC_ON_UNIX "Add -fPIC compiler flag on unix 64 bit machines to allow linking from dynamic libraries even if DCMTK is built statically" OFF)
    MARK_AS_ADVANCED(DCMTK_FORCE_FPIC_ON_UNIX)
  
@@ -36,7 +36,7 @@ Author: Gert Wollny <gw.fossdev at gmail.com>
  
 --- a/config/include/dcmtk/config/osconfig.h.in
 +++ b/config/include/dcmtk/config/osconfig.h.in
-@@ -30,9 +30,6 @@
+@@ -26,9 +26,6 @@
  /* Define if __attribute__((aligned)) supports templates */
  #undef ATTRIBUTE_ALIGNED_SUPPORTS_TEMPLATES
  
diff --git a/debian/patches/09_round_time.patch b/debian/patches/09_round_time.patch
index 8cf7a1b..91c499c 100644
--- a/debian/patches/09_round_time.patch
+++ b/debian/patches/09_round_time.patch
@@ -5,7 +5,7 @@ Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859204
 
 --- a/ofstd/libsrc/oftime.cc
 +++ b/ofstd/libsrc/oftime.cc
-@@ -47,6 +47,7 @@
+@@ -48,6 +48,7 @@
  #include "dcmtk/ofstd/oftime.h"
  #include "dcmtk/ofstd/ofstd.h"
  
@@ -13,26 +13,7 @@ Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859204
  
  /*------------------*
   *  implementation  *
-@@ -99,13 +100,16 @@
- 
- OFBool OFTime::operator==(const OFTime &timeVal) const
- {
--    return (getTimeInSeconds(OFTrue /*useTimeZone*/, OFFalse /*normalize*/) == timeVal.getTimeInSeconds(OFTrue /*useTimeZone*/, OFFalse /*normalize*/));
-+    // Dicom supports at most 6 decimal digits, to compare cut off to eliminate numerical errors.
-+    double me = rint(getTimeInSeconds(OFTrue /*useTimeZone*/, OFFalse /*normalize*/) * 1000000);
-+    double other =  rint(timeVal.getTimeInSeconds(OFTrue /*useTimeZone*/, OFFalse /*normalize*/) * 1000000);
-+    return me == other; 
- }
- 
- 
- OFBool OFTime::operator!=(const OFTime &timeVal) const
- {
--    return (getTimeInSeconds(OFTrue /*useTimeZone*/, OFFalse /*normalize*/) != timeVal.getTimeInSeconds(OFTrue /*useTimeZone*/, OFFalse /*normalize*/));
-+  return ! (*this == timeVal); 
- }
- 
- 
-@@ -491,6 +495,7 @@
+@@ -528,6 +529,7 @@
  {
      /* compute number of seconds since 00:00:00 */
      double result = ((OFstatic_cast(double, hour) - timeZone) * 60 + OFstatic_cast(double, minute)) * 60 + second;
diff --git a/debian/patches/series b/debian/patches/series
index 0ae3d31..0bed37b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@
 06_soversion_abi.patch
 07_dont_export_all_executables.patch
 08_remove_system_processor.patch
-09_round_time.patch
+#09_round_time.patch
diff --git a/debian/rules b/debian/rules
index afa7c20..e23c0a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DDCMTK_WITH_ICONV:BOOL=ON \
  -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
  -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk11 \
+ -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk12 \
  -DCMAKE_SKIP_RPATH:BOOL=OFF \
  -DDCMTK_USE_CXX11_STL:BOOL=ON
 
diff --git a/debian/watch b/debian/watch
index cb945b4..782daf8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/_/~/" \
-http://dicom.offis.de/dicom/offis/software/dcmtk/snapshot/dcmtk-(.*)\.tar\.gz
+http://dicom.offis.de/dicom/offis/software/dcmtk/dcmtk362/dcmtk-(.*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtk.git

More information about the debian-med-commit mailing list