[med-svn] [Git][med-team/dcmtk][master] 3 commits: d/rules: Set ICONV to OFF

[Mathieu Malaterre]

Mathieu Malaterre pushed to branch master at Debian Med / dcmtk


Commits:
a9d92398 by Mathieu Malaterre at 2021-04-26T08:33:35+02:00
d/rules: Set ICONV to OFF

dcmtk package is build using ICU on Debian, remove invalid setting for
ICONV this is confusing.

Info: Building DCMTK with character set conversion support using the ICU

- - - - -
fa2c1ac3 by Mathieu Malaterre at 2021-04-26T08:38:35+02:00
d/rules: Remove bogus setting of c++11 in d/rules

Debian package was compiled using gnu++11 which is not anymore the
default for current gcc. Set it to c++14 to take advantage of latest
compilation optimization.

https://support.dcmtk.org/docs/cxx11_support.html

- - - - -
3d57911e by Mathieu Malaterre at 2021-04-26T12:50:43+02:00
d/changelog: Add dch entries

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,14 @@
 dcmtk (3.6.6-1~ext2) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * Team upload.
   * Remove patches thanks to a hint by Jörg Riesmeier (see #981326)
 
- -- Andreas Tille <tille at debian.org>  Fri, 23 Apr 2021 10:36:47 +0200
+  [ Mathieu Malaterre ]
+  * d/rules: Set ICONV to OFF
+  * d/rules: Remove bogus setting of c++11 in d/rules
+
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 26 Apr 2021 12:49:46 +0200
 
 dcmtk (3.6.6-1~ext1) experimental; urgency=medium
 


=====================================
debian/rules
=====================================
@@ -34,14 +34,12 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DDCMTK_WITH_DOXYGEN:BOOL=$(BUILDDOC) \
  -DDCMTK_WITH_TIFF:BOOL=ON \
  -DDCMTK_WITH_ZLIB:BOOL=ON \
- -DDCMTK_WITH_ICONV:BOOL=ON \
+ -DDCMTK_WITH_ICONV:BOOL=OFF \
  -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
  -DCMAKE_VERBOSE_MAKEFILE=ON \
  -DCMAKE_INSTALL_DATADIC:STRING=share/libdcmtk16 \
  -DCMAKE_SKIP_RPATH:BOOL=OFF \
- -DDCMTK_USE_CXX11_STL:BOOL=ON \
- -DDCMTK_ENABLE_CXX11:BOOL=ON
-
+ -DCMAKE_CXX_STANDARD:STRING=14
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)



View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/fe8bcbf5b07d6e80f1d498f88f44e0d14e8607d9...3d57911ef165423d6bac92f06c19a10fec8d3932

-- 
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/fe8bcbf5b07d6e80f1d498f88f44e0d14e8607d9...3d57911ef165423d6bac92f06c19a10fec8d3932
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210426/df879bae/attachment-0001.htm>