[med-svn] r15122 - in trunk/packages/dicomscope/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2013-11-06 13:14:35 +0000 (Wed, 06 Nov 2013)
New Revision: 15122

Modified:
   trunk/packages/dicomscope/trunk/debian/changelog
   trunk/packages/dicomscope/trunk/debian/control
   trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
   trunk/packages/dicomscope/trunk/debian/rules
Log:
Remove overlinking

Modified: trunk/packages/dicomscope/trunk/debian/changelog
===================================================================
--- trunk/packages/dicomscope/trunk/debian/changelog	2013-11-06 12:55:50 UTC (rev 15121)
+++ trunk/packages/dicomscope/trunk/debian/changelog	2013-11-06 13:14:35 UTC (rev 15122)
@@ -4,6 +4,8 @@
   * Install jni/glue lib to multi-arch jni path
   * Remove patch, not needed anymore:
     - d/p/fixbug694846.patch
+  * Bump Std-Vers to 3.9.4, no changes needed
+  * Remove obsolete DMUA flag
 
  -- Mathieu Malaterre <malat at debian.org>  Wed, 06 Nov 2013 13:48:45 +0100
 

Modified: trunk/packages/dicomscope/trunk/debian/control
===================================================================
--- trunk/packages/dicomscope/trunk/debian/control	2013-11-06 12:55:50 UTC (rev 15121)
+++ trunk/packages/dicomscope/trunk/debian/control	2013-11-06 13:14:35 UTC (rev 15122)
@@ -1,12 +1,11 @@
 Source: dicomscope
 Section: graphics
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <malat at debian.org>
 Priority: extra
 Build-Depends: debhelper (>= 9), cmake (>= 2.8.2), libdcmtk2-dev (>= 3.6.0), default-jdk,
  libssl-dev, libxml2-dev, javahelper
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dicomscope/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dicomscope/trunk/
 Homepage: http://dicom.offis.de/dscope.php.en

Modified: trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2013-11-06 12:55:50 UTC (rev 15121)
+++ trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2013-11-06 13:14:35 UTC (rev 15122)
@@ -6,7 +6,7 @@
 Index: dicomscope-3.6.0/CMakeLists.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/CMakeLists.txt	2013-11-06 13:46:30.000000000 +0100
++++ dicomscope-3.6.0/CMakeLists.txt	2013-11-06 13:58:16.000000000 +0100
 @@ -0,0 +1,25 @@
 +cmake_minimum_required(VERSION 2.8.2)
 +project(DICOMSCOPE)
@@ -36,8 +36,8 @@
 Index: dicomscope-3.6.0/interface/libsrc/CMakeLists.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt	2013-11-06 13:47:10.000000000 +0100
-@@ -0,0 +1,56 @@
++++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt	2013-11-06 14:13:11.000000000 +0100
+@@ -0,0 +1,55 @@
 +set(dsgui_SRCS
 +  DSRCodeValue.cpp
 +  DSRCompositeValue.cpp
@@ -86,8 +86,7 @@
 +add_definitions(-DHAVE_CONFIG_H -DNDEBUG -DHAVE_STRSTREAM_H)
 +
 +add_library(jInterface SHARED ${dsgui_SRCS})
-+target_link_libraries(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg
-+  ijg16 ijg12 ijg8 xml2 dcmdsig dcmqrdb crypto oflog)
++target_link_libraries(jInterface dcmpstat ofstd dcmdata dcmjpeg dcmsr)
 +set_property(TARGET jInterface PROPERTY NO_SONAME 1)
 +install(TARGETS jInterface
 +  RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime
@@ -97,7 +96,7 @@
 Index: dicomscope-3.6.0/tkgui/CMakeLists.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/tkgui/CMakeLists.txt	2013-11-06 13:48:25.000000000 +0100
++++ dicomscope-3.6.0/tkgui/CMakeLists.txt	2013-11-06 13:58:16.000000000 +0100
 @@ -0,0 +1,45 @@
 +# Java
 +find_package(Java REQUIRED) # javac, jar

Modified: trunk/packages/dicomscope/trunk/debian/rules
===================================================================
--- trunk/packages/dicomscope/trunk/debian/rules	2013-11-06 12:55:50 UTC (rev 15121)
+++ trunk/packages/dicomscope/trunk/debian/rules	2013-11-06 13:14:35 UTC (rev 15122)
@@ -5,7 +5,7 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE:STRING="" \
-	-DDICOMSCOPE_INSTALL_LIB_DIR:STRING=lib/jni/$(DEB_HOST_MULTIARCH) \
+	-DDICOMSCOPE_INSTALL_LIB_DIR:STRING=lib/jni/$(DEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --buildsystem=cmake --parallel --with javahelper
@@ -20,6 +20,7 @@
 	dh_install
 
 override_dh_clean:
+	dh_clean
 	find DICOMscope -name *.class -delete
 
 override_dh_installman: