[med-svn] [Git][med-team/dicomscope][master] 5 commits: debhelper 11

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / dicomscope


Commits:
5aaa8c7a by Andreas Tille at 2018-10-11T14:30:01Z
debhelper 11

- - - - -
0aaafdce by Andreas Tille at 2018-10-11T14:30:08Z
Point Vcs fields to salsa.debian.org

- - - - -
aa96da84 by Andreas Tille at 2018-10-11T14:30:08Z
Standards-Version: 4.2.1

- - - - -
e9888c1e by Andreas Tille at 2018-10-11T14:43:31Z
Adapt doc location to debhelper 11 decision

- - - - -
8612ccdc by Andreas Tille at 2018-10-11T14:51:11Z
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/dicomscope-doc.doc-base.dscs
- debian/dicomscope-doc.doc-base.dsum
- − debian/patches/fixbug694846.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+dicomscope (3.6.0-19) unstable; urgency=medium
+
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.1
+
+ -- Andreas Tille <tille at debian.org>  Thu, 11 Oct 2018 16:46:40 +0200
+
 dicomscope (3.6.0-18) unstable; urgency=medium
 
   * d/control: 


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
@@ -1,18 +1,18 @@
 Source: dicomscope
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>, 
+Uploaders: Andreas Tille <tille at debian.org>,
            Gert Wollny <gewo at debian.org> 
 Section: graphics
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11~),
                cmake,
                libdcmtk-dev,
                default-jdk,
                javahelper,
                zip
-Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/dicomscope.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/dicomscope.git
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/dicomscope
+Vcs-Git: https://salsa.debian.org/med-team/dicomscope.git
 Homepage: http://dicom.offis.de/dscope.php.en
 
 Package: dicomscope
@@ -43,8 +43,8 @@ Description: OFFIS DICOM Viewer
 
 Package: libdicomscope-jni
 Architecture: any
-Section: java
 Multi-Arch: same
+Section: java
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Breaks: dicomscope (<< 3.6.0-12)


=====================================
debian/dicomscope-doc.doc-base.dscs
=====================================
@@ -18,4 +18,4 @@ Abstract: The OFFIS DICOM Viewer
 Section: Science/Medicine
 
 Format: PDF
-Files: /usr/share/doc/dicomscope-doc/dscs360.pdf
+Files: /usr/share/doc/dicomscope/dscs360.pdf


=====================================
debian/dicomscope-doc.doc-base.dsum
=====================================
@@ -18,4 +18,4 @@ Abstract: The OFFIS DICOM Viewer
 Section: Science/Medicine
 
 Format: PDF
-Files: /usr/share/doc/dicomscope-doc/dsum360.pdf
+Files: /usr/share/doc/dicomscope/dsum360.pdf


=====================================
debian/patches/fixbug694846.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: As per bug #694846 libraries were underlinked
-Author: Mathieu Malaterre <malat at debian.org>
-Bug-Debian: http://bugs.debian.org/694846
-Forwarded: not-needed
-
---- dicomscope-3.6.0.orig/interface/libsrc/CMakeLists.txt
-+++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt
-@@ -47,6 +47,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H  -DNDEBU
- 
- ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS})
- TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg
-+  dcmnet
-   ijg16 ijg12 ijg8 xml2 dcmdsig dcmqrdb crypto oflog)
- INSTALL(TARGETS jInterface
-   RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime


=====================================
debian/rules
=====================================
@@ -11,7 +11,7 @@ CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE:STRING="" \
 	-DDICOMSCOPE_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH)/jni
 
 %:
-	dh $@ --buildsystem=cmake --parallel --with javahelper
+	dh $@ --buildsystem=cmake --with javahelper
 
 override_dh_auto_configure-arch:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)



View it on GitLab: https://salsa.debian.org/med-team/dicomscope/compare/11f809c16b51b4e60ed9037fa079af1531a9ae7d...8612ccdcb6dd8b1ff34a9487cb2a721fa4722650

-- 
View it on GitLab: https://salsa.debian.org/med-team/dicomscope/compare/11f809c16b51b4e60ed9037fa079af1531a9ae7d...8612ccdcb6dd8b1ff34a9487cb2a721fa4722650
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/20181011/e82336db/attachment-0001.html>