[med-svn] r13781 - in trunk/packages/dcmtk/branches/experimental/debian: . patches

Mathieu Malaterre malat at alioth.debian.org
Fri May 31 15:42:58 UTC 2013 

Author: malat
Date: 2013-05-31 15:42:58 +0000 (Fri, 31 May 2013)
New Revision: 13781

Added:
   trunk/packages/dcmtk/branches/experimental/debian/patches/datadic_install.patch
   trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch
Modified:
   trunk/packages/dcmtk/branches/experimental/debian/changelog
   trunk/packages/dcmtk/branches/experimental/debian/control
   trunk/packages/dcmtk/branches/experimental/debian/patches/series
   trunk/packages/dcmtk/branches/experimental/debian/rules
Log:
New exp upload

Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/changelog	2013-05-31 14:31:06 UTC (rev 13780)
+++ trunk/packages/dcmtk/branches/experimental/debian/changelog	2013-05-31 15:42:58 UTC (rev 13781)
@@ -1,3 +1,10 @@
+dcmtk (3.6.1~20121102-2) experimental; urgency=low
+
+  * Install *.dic to versioned dir (See #709123)
+  * Add preliminary work to get iconv support
+
+ -- Mathieu Malaterre <malat at debian.org>  Fri, 31 May 2013 17:39:30 +0200
+
 dcmtk (3.6.1~20121102-1) experimental; urgency=low
 
   * Use new dh syntax

Modified: trunk/packages/dcmtk/branches/experimental/debian/control
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/control	2013-05-31 14:31:06 UTC (rev 13780)
+++ trunk/packages/dcmtk/branches/experimental/debian/control	2013-05-31 15:42:58 UTC (rev 13781)
@@ -11,9 +11,9 @@
                libpng-dev,
                libsndfile1-dev,
                libssl-dev,
-               libtiff4-dev,
+               libtiff-dev | libtiff5-dev,
                libwrap0-dev,
-               libxml2-dev,
+               libxml2-dev, gettext,
                zlib1g-dev
 Build-Depends-Indep: doxygen (>= 1.7.4), graphviz
 Standards-Version: 3.9.4

Added: trunk/packages/dcmtk/branches/experimental/debian/patches/datadic_install.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/datadic_install.patch	                        (rev 0)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/datadic_install.patch	2013-05-31 15:42:58 UTC (rev 13781)
@@ -0,0 +1,11 @@
+Description: Install dict to versioned dir
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/709123
+Forwarded: no
+
+--- dcmtk-3.6.1~20121102.orig/dcmdata/data/CMakeLists.txt
++++ dcmtk-3.6.1~20121102/dcmdata/data/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ # declare installation files
+-INSTALL(FILES dicom.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
++INSTALL(FILES dicom.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)

Added: trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch	                        (rev 0)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch	2013-05-31 15:42:58 UTC (rev 13781)
@@ -0,0 +1,73 @@
+Description: Upstream needs libiconv and libcharset
+ Debian does not ship either of them, so instead use
+ iconv support from eglibc
+ and use libcharset support from gettext
+Author: Mathieu Malaterre <malat at debian.org>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/701802
+Forwarded: yes
+
+Index: dcmtk-3.6.1~20121102/CMake/FindICONV.cmake
+===================================================================
+--- dcmtk-3.6.1~20121102.orig/CMake/FindICONV.cmake	2013-05-31 17:40:44.903835590 +0200
++++ dcmtk-3.6.1~20121102/CMake/FindICONV.cmake	2013-05-31 17:40:56.083835464 +0200
+@@ -14,11 +14,12 @@
+ MARK_AS_ADVANCED(LIBICONV_INCLUDE_DIR)
+ 
+ # Look for the library
+-SET(LIBICONV_LIBS iconv)
+-FIND_LIBRARY(LIBICONV_LIBRARY NAMES ${LIBICONV_LIBS})
+-MARK_AS_ADVANCED(LIBICONV_LIBRARY)
++#SET(LIBICONV_LIBS iconv)
++#FIND_LIBRARY(LIBICONV_LIBRARY NAMES ${LIBICONV_LIBS})
++#MARK_AS_ADVANCED(LIBICONV_LIBRARY)
+ 
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICONV REQUIRED_VARS LIBICONV_LIBRARY LIBICONV_INCLUDE_DIR)
++#FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICONV REQUIRED_VARS LIBICONV_LIBRARY LIBICONV_INCLUDE_DIR)
++SET(LIBICONV_FOUND TRUE)
+ 
+ # Copy the result to output variables
+ IF(LIBICONV_FOUND)
+Index: dcmtk-3.6.1~20121102/CMake/FindCharset.cmake
+===================================================================
+--- dcmtk-3.6.1~20121102.orig/CMake/FindCharset.cmake	2013-05-31 17:40:44.983835589 +0200
++++ dcmtk-3.6.1~20121102/CMake/FindCharset.cmake	2013-05-31 17:40:56.083835464 +0200
+@@ -7,10 +7,14 @@
+ INCLUDE(FindPackageHandleStandardArgs)
+ 
+ # Look for the header file
+-FIND_PATH(LIBCHARSET_INCLUDE_DIR NAMES localcharset.h)
++FIND_PATH(LIBCHARSET_INCLUDE_DIR localcharset.h
++/usr/share/gettext/intl/
++)
+ MARK_AS_ADVANCED(LIBCHARSET_INCLUDE_DIR)
+ 
+-SET(LIBCHARSET_LIBS charset)
++SET(LIBCHARSET_LIBS 
++gettextlib
++)
+ FIND_LIBRARY(LIBCHARSET_LIBRARY NAMES ${LIBCHARSET_LIBS})
+ MARK_AS_ADVANCED(LIBCHARSET_LIBRARY)
+ 
+Index: dcmtk-3.6.1~20121102/ofstd/libsrc/ofchrenc.cc
+===================================================================
+--- dcmtk-3.6.1~20121102.orig/ofstd/libsrc/ofchrenc.cc	2013-05-31 17:40:45.043835590 +0200
++++ dcmtk-3.6.1~20121102/ofstd/libsrc/ofchrenc.cc	2013-05-31 17:40:56.083835464 +0200
+@@ -28,6 +28,9 @@
+ #ifdef WITH_LIBICONV
+ #include <iconv.h>
+ #include <localcharset.h>
++// The following #define is important this way it turns on/off iconv support in DCMTK
++// debian/iconv.h does not define this variable
++#define _LIBICONV_VERSION 0x010E
+ #endif
+ 
+ BEGIN_EXTERN_C
+@@ -469,6 +472,7 @@
+     OFString versionStr = "LIBICONV, Version ";
+     char buf[10];
+     // extract major and minor version number
++    int _libiconv_version = 0;
+     sprintf(buf, "%i.%i", (_libiconv_version >> 8), (_libiconv_version & 0xff));
+     versionStr.append(buf);
+     return versionStr;

Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/series
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/series	2013-05-31 14:31:06 UTC (rev 13780)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/series	2013-05-31 15:42:58 UTC (rev 13781)
@@ -4,3 +4,5 @@
 prefs.patch
 bug706062.patch
 system_charls.patch
+datadic_install.patch
+debian_iconv.patch

Modified: trunk/packages/dcmtk/branches/experimental/debian/rules
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/rules	2013-05-31 14:31:06 UTC (rev 13780)
+++ trunk/packages/dcmtk/branches/experimental/debian/rules	2013-05-31 15:42:58 UTC (rev 13781)
@@ -18,6 +18,8 @@
 %:
 	dh $@ --parallel --buildsystem=cmake
 
+# -DDCMTK_INSTALL_DATDIR:STRING=libdcmtk3
+
 # SKIP_RPATH=OFF to run test suite:
 CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
  -DBUILD_SHARED_LIBS:BOOL=ON \
@@ -30,6 +32,7 @@
  -DDCMTK_WITH_ICONV:BOOL=ON \
  -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
  -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk3 \
  -DCMAKE_SKIP_RPATH:BOOL=OFF
 
 # -DCMAKE_INSTALL_PREFIX=/usr \

More information about the debian-med-commit mailing list