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

[malat-guest at alioth.debian.org]

Author: malat-guest
Date: 2008-12-29 10:49:59 +0000 (Mon, 29 Dec 2008)
New Revision: 2869

Modified:
   trunk/packages/dicomscope/trunk/debian/control
   trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
   trunk/packages/dicomscope/trunk/debian/rules
Log:
add support for jdk6

Modified: trunk/packages/dicomscope/trunk/debian/control
===================================================================
--- trunk/packages/dicomscope/trunk/debian/control	2008-12-29 01:08:30 UTC (rev 2868)
+++ trunk/packages/dicomscope/trunk/debian/control	2008-12-29 10:49:59 UTC (rev 2869)
@@ -4,7 +4,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Priority: extra
-Build-Depends: debhelper (>= 4), cmake, libdcmtk1-dev, sun-java5-jdk
+Build-Depends: debhelper (>= 4), cmake, libdcmtk1-dev, sun-java5-jdk | sun-java6-jdk
 Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dicomscope/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/dicomscope/trunk/

Modified: trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch	2008-12-29 01:08:30 UTC (rev 2868)
+++ trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch	2008-12-29 10:49:59 UTC (rev 2869)
@@ -2499,7 +2499,7 @@
  import java.net.*;
  
 -import DICOMscope;
-+import DICOMscope.*;
++import DICOMscope.DICOMscope;
  
  import jToolkit.gui.*;
  import java.util.*;
@@ -2511,7 +2511,7 @@
  
  import J2Ci.*;
 -import DICOMscope;
-+import DICOMscope.*;
++import DICOMscope.DICOMscope;
  import viewer.main.*;
  import jToolkit.gui.*;
  import main.*;

Modified: trunk/packages/dicomscope/trunk/debian/rules
===================================================================
--- trunk/packages/dicomscope/trunk/debian/rules	2008-12-29 01:08:30 UTC (rev 2868)
+++ trunk/packages/dicomscope/trunk/debian/rules	2008-12-29 10:49:59 UTC (rev 2869)
@@ -17,10 +17,10 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# tested with sun-java5-jdk:
+# tested with sun-java5-jdk, sun-java6-jdk:
 # this is needed for cmake 2.6.0 to do a proper system inspection
-JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun/
-export JAVA_HOME
+JAVA_HOME_DIRS=/usr/lib/jvm/java-1.5.0-sun /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-gcj
+export JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do [ -d "$$j" ] && echo $$j && exit 0; done)
 
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))