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

[Gert Wollny]

Author: gewo
Date: 2017-08-23 07:44:26 +0000 (Wed, 23 Aug 2017)
New Revision: 23916

Added:
   trunk/packages/dicomscope/trunk/debian/patches/openjdk-1.9.patch
Modified:
   trunk/packages/dicomscope/trunk/debian/changelog
   trunk/packages/dicomscope/trunk/debian/patches/series
Log:
Fix bugs with openjdk-9

Modified: trunk/packages/dicomscope/trunk/debian/changelog
===================================================================
--- trunk/packages/dicomscope/trunk/debian/changelog	2017-08-22 19:30:50 UTC (rev 23915)
+++ trunk/packages/dicomscope/trunk/debian/changelog	2017-08-23 07:44:26 UTC (rev 23916)
@@ -1,3 +1,9 @@
+dicomscope (3.6.0-17) unstable; urgency=medium
+
+  * d/p/openjdk-9: compilate with odjk-9, Closes: #872945
+
+ -- Gert Wollny <gewo at debian.org>  Wed, 23 Aug 2017 07:43:11 +0000
+
 dicomscope (3.6.0-16) unstable; urgency=medium
 
   [ Mathieu Malaterre ]

Added: trunk/packages/dicomscope/trunk/debian/patches/openjdk-1.9.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/openjdk-1.9.patch	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/openjdk-1.9.patch	2017-08-23 07:44:26 UTC (rev 23916)
@@ -0,0 +1,38 @@
+Author: Gert Wollny <gewo at debian.org>
+Description: Make code compatible with java 1.7
+Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872945
+Last-Changed: 2017-08-23
+
+--- a/tkgui/CMakeLists.txt
++++ b/tkgui/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ 
+ add_custom_command(
+   OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
+-  COMMAND ${JAVA_COMPILE} ARGS -encoding Latin1 -d ../DICOMscope -classpath . -source 1.5 -target 1.5 dicomscope/DICOMscope.java
++  COMMAND ${JAVA_COMPILE} ARGS -encoding Latin1 -d ../DICOMscope -classpath . -source 1.7 -target 1.7  dicomscope/DICOMscope.java
+   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+   DEPENDS ${javafiles}
+   COMMENT "javac *.java"
+--- a/tkgui/processCommunication/ProcessTable.java
++++ b/tkgui/processCommunication/ProcessTable.java
+@@ -211,7 +211,7 @@
+         */
+         public void swapRows(int row1, int row2)
+         {
+-            Object dummy = dataVector.elementAt(row1);
++            Vector dummy = dataVector.elementAt(row1);
+             dataVector.setElementAt(dataVector.elementAt(row2), row1);
+             dataVector.setElementAt(dummy, row2);
+         }
+--- a/tkgui/viewer/sr/VerificationDialog.java
++++ b/tkgui/viewer/sr/VerificationDialog.java
+@@ -289,7 +289,7 @@
+         */
+         public void swapRows(int row1, int row2)
+         {
+-            Object dummy = dataVector.elementAt(row1);
++            Vector dummy = dataVector.elementAt(row1);
+             dataVector.setElementAt(dataVector.elementAt(row2), row1);
+             dataVector.setElementAt(dummy, row2);
+         }

Modified: trunk/packages/dicomscope/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/series	2017-08-22 19:30:50 UTC (rev 23915)
+++ trunk/packages/dicomscope/trunk/debian/patches/series	2017-08-23 07:44:26 UTC (rev 23916)
@@ -5,3 +5,5 @@
 cmakelists.txt.patch
 correct_status_returns.patch
 correct_include.patch
+openjdk-1.9.patch
+openjdk-1.9.patch