[med-svn] [Git][med-team/dcmtk][master] 13 commits: debian/control: switch to comat level 10

Gert Wollny gitlab at salsa.debian.org
Wed Nov 11 17:45:41 GMT 2020 


Gert Wollny pushed to branch master at Debian Med / dcmtk


Commits:
f38bc5c7 by Gert Wollny at 2020-11-10T15:07:19+01:00
debian/control: switch to comat level 10

- - - - -
d92d18c4 by Gert Wollny at 2020-11-10T16:21:45+01:00
d/rules: don't install libcharls.so Closes: #971433

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>

- - - - -
8d91e1d3 by Gert Wollny at 2020-11-10T16:21:45+01:00
d/control: cme fix dpkg

- - - - -
43f5c3d8 by Gert Wollny at 2020-11-10T16:21:45+01:00
d/compat: remove obsolete file

- - - - -
0f4eee71 by Gert Wollny at 2020-11-10T16:21:45+01:00
d/changelog: prep for upload to unstable

- - - - -
2e18dd89 by Gert Wollny at 2020-11-11T16:25:11+01:00
d/dcmtk.manpages, d/dcmtk-doc.docs: Update some path

- - - - -
0a582cc1 by Gert Wollny at 2020-11-11T16:40:48+01:00
d/rules: remove some unneeded files

- - - - -
2d22ddeb by Gert Wollny at 2020-11-11T16:44:43+01:00
fix spaces

- - - - -
5557a379 by Gert Wollny at 2020-11-11T17:06:37+01:00
d/copyright: remove duplicate entries

- - - - -
fffc8ff1 by Gert Wollny at 2020-11-11T17:07:33+01:00
d/dcmtk-doc.docs-base: Fix docu path

- - - - -
e481f12c by Gert Wollny at 2020-11-11T17:10:32+01:00
d/* more lintian fixes

- - - - -
9a1a34d0 by Gert Wollny at 2020-11-11T17:35:35+01:00
d/dcmtk-doc.doc-base: fix

- - - - -
444c57d0 by Gert Wollny at 2020-11-11T17:37:21+01:00
d/dcmtk.docs: Fix NEWS name

- - - - -


12 changed files:

- debian/NEWS.Debian → debian/NEWS
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/dcmtk-doc.doc-base
- debian/dcmtk-doc.docs
- debian/dcmtk.docs
- debian/dcmtk.manpages
- debian/libdcmtk15.lintian-overrides
- debian/rules
- − debian/source/lintian-overrides


Changes:

=====================================
debian/NEWS.Debian → debian/NEWS
=====================================


=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+dcmtk (3.6.5-2) UNRELEASED; urgency=medium
+
+  * debian/control: switch to comat level 10
+  * d/rules: don't install libcharls.so Closes: #971433
+  * d/control: cme fix dpkg
+  * d/compat: remove obsolete file
+
+ -- Gert Wollny <gewo at debian.org>  Tue, 10 Nov 2020 15:17:05 +0100
+
+dcmtk (3.6.5-1) unstable; urgency=medium
+
+  * debian/control: switch to comat level 10
+  * d/rules: don't install libcharls.so Closes: #971433
+    Closes: #971412
+
+ -- Gert Wollny <gewo at debian.org>  Tue, 10 Nov 2020 15:08:59 +0100
+
 dcmtk (3.6.5-1~exp1) experimental; urgency=medium
 
   [ Andreas Tille ]


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Gert Wollny <gewo at debian.org>
 Section: science
 Priority: optional
 Build-Depends: cmake,
-               debhelper (>= 9),
+               debhelper-compat (= 13),
                help2man,
                libcharls-dev,
                libpng-dev,
@@ -17,7 +17,7 @@ Build-Depends: cmake,
                zlib1g-dev
 Build-Depends-Indep: doxygen,
                      graphviz
-Standards-Version: 4.1.5
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/dcmtk
 Vcs-Git: https://salsa.debian.org/med-team/dcmtk.git
 Homepage: http://dicom.offis.de/dcmtk


=====================================
debian/copyright
=====================================
@@ -69,23 +69,14 @@ License: OFFIS
  include the three paragraphs of this copyright notice.
 
 Files: dcmnet/include/dcmtk/dcmnet/dul.h
-       dcmnet/include/dcmtk/dcmnet/dul.h
        dcmnet/libsrc/dulstruc.h
-       dcmnet/libsrc/dulstruc.h
-       dcmnet/libsrc/dul.cc
        dcmnet/libsrc/dul.cc
        dcmnet/libsrc/dulconst.cc
-       dcmnet/libsrc/dulconst.cc
        dcmnet/libsrc/dulpriv.h
-       dcmnet/libsrc/dulpriv.h
-       dcmnet/libsrc/dulpres.cc
        dcmnet/libsrc/dulpres.cc
        dcmnet/libsrc/dulfsm.h
-       dcmnet/libsrc/dulfsm.h
-       dcmnet/libsrc/dulfsm.cc
        dcmnet/libsrc/dulfsm.cc
        dcmnet/libsrc/dulparse.cc
-       dcmnet/libsrc/dulparse.cc
 Copyright: 1993, RSNA and Washington University
 License: RSNA
  The software and supporting documentation for the Radiological
@@ -407,10 +398,8 @@ Files: dcmsr/include/dcmtk/dcmsr/dsrdncsr.h
  dcmsr/include/dcmtk/dcmsr/cmr/tid300.h
  dcmsr/include/dcmtk/dcmsr/cmr/dsrdnflt.h
  dcmsr/include/dcmtk/dcmsr/cmr/dsritcsr.h
- dcmsr/include/dcmtk/dcmsr/cmr/dsritcsr.h
  dcmsr/include/dcmtk/dcmsr/cmr/dsrprdcc.h
  dcmsr/include/dcmtk/dcmsr/dsrpficc.h
- dcmsr/include/dcmtk/dcmsr/dsrplicc.h
  dcmsr/libsrc/dsrpficc.cc
  dcmsr/libsrc/dsrplicc.cc
  dcmsr/libcmr/tid1409m.cc
@@ -420,7 +409,6 @@ Files: dcmsr/include/dcmtk/dcmsr/dsrdncsr.h
  dcmsr/libcmr/tid300cc.cc
  dcmsr/libcmr/dsrdnflt.cc
  dcmsr/libcmr/dsritcsr.cc
- dcmsr/libcmr/dsritcsr.cc
  dcmsr/libcmr/dsrprdcc.cc
 Copyright: 2016-2017, J. Riesmeier, Oldenburg, Germany
 License: OFFISeV


=====================================
debian/dcmtk-doc.doc-base
=====================================
@@ -8,5 +8,5 @@ Abstract:  This manual comprises the complete on-line documentation for the
 Section: Science/Medicine
 
 Format: HTML
-Index: /usr/share/doc/dcmtk-doc/html/index.html
-Files: /usr/share/doc/dcmtk-doc/html/*
+Index: /usr/share/doc/dcmtk/dcmtk/html/index.html
+Files: /usr/share/doc/dcmtk/dcmtk/html/*


=====================================
debian/dcmtk-doc.docs
=====================================
@@ -1 +1 @@
-debian/tmp/usr/share/doc/dcmtk/html
+usr/share/doc/dcmtk/


=====================================
debian/dcmtk.docs
=====================================
@@ -1,3 +1,3 @@
 FAQ
 README
-debian/NEWS.Debian
+debian/NEWS


=====================================
debian/dcmtk.manpages
=====================================
@@ -1 +1 @@
-doxygen/manpages/man1/*.1
+usr/share/man/man1/*.1


=====================================
debian/libdcmtk15.lintian-overrides
=====================================
@@ -3,3 +3,4 @@
 libdcmtk15: package-name-doesnt-match-sonames
 libdcmtk15: embedded-library
 libdcmtk15: no-symbols-control-file
+libdcmtk15: lacks-unversioned-link-to-shared-library


=====================================
debian/rules
=====================================
@@ -22,8 +22,7 @@ endif
 # improper md5sum...
 
 %:
-	dh $@ --parallel --buildsystem=cmake
-
+	dh $@ --buildsystem=cmake
 
 # SKIP_RPATH=OFF to run test suite:
 # see #701231
@@ -82,6 +81,12 @@ override_dh_install-arch:
 	rm ./debian/dcmtk/usr/bin/msgserv
 	rm ./debian/dcmtk/usr/bin/wltest
 
+	rm ./debian/libdcmtk-dev/usr/lib/*/libcharls.so
+
+	rm ./debian/tmp/usr/share/SC.dump
+	rm ./debian/tmp/usr/share/VLP.dump
+	rm ./debian/tmp/usr/share/dcm2xml.dtd
+	rm ./debian/tmp/usr/share/dumppat.txt
 
 get-orig-source:
 	uscan --force-download --verbose --rename


=====================================
debian/source/lintian-overrides deleted
=====================================
@@ -1,3 +0,0 @@
-# upstream provides two alternates build system: autotools and cmake
-# since we pick cmake, no need to take care of this check:
-dcmtk: outdated-autotools-helper-file



View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/aa731a0363d2e37ceebcc7f3e259d8b2deef2fdc...444c57d02a9e17913aff957a6111a9951c24a102

-- 
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/aa731a0363d2e37ceebcc7f3e259d8b2deef2fdc...444c57d02a9e17913aff957a6111a9951c24a102
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/20201111/cce149c8/attachment-0001.html>

More information about the debian-med-commit mailing list