[med-svn] r3601 - trunk/packages/dicomscope/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2009-07-09 12:25:46 +0000 (Thu, 09 Jul 2009)
New Revision: 3601

Modified:
   trunk/packages/dicomscope/trunk/debian/control
   trunk/packages/dicomscope/trunk/debian/rules
Log:
cleanup java mess

Modified: trunk/packages/dicomscope/trunk/debian/control
===================================================================
--- trunk/packages/dicomscope/trunk/debian/control	2009-07-08 15:04:02 UTC (rev 3600)
+++ trunk/packages/dicomscope/trunk/debian/control	2009-07-09 12:25:46 UTC (rev 3601)
@@ -4,7 +4,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Priority: extra
-Build-Depends: debhelper (>= 5), cmake, libdcmtk1-dev, openjdk-6-jdk | sun-java6-jdk | sun-java5-jdk,
+Build-Depends: debhelper (>= 5), cmake, libdcmtk1-dev, default-jdk,
  libssl-dev, libxml2-dev, tofrodos, quilt
 Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dicomscope/trunk/?rev=0&sc=0
@@ -14,7 +14,7 @@
 Package: dicomscope
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, tk8.3 | tk8.4, libdcmtk1, libssl0.9.8,
- libxml2, openjdk-6-jdk | sun-java5-jre | sun-java6-jre | java2-runtime 
+ libxml2, java-gcj-compat | java1-runtime | java2-runtime
 Description: The OFFIS DICOM Viewer
  DICOMscope is a free DICOM viewer which can display uncompressed,
  monochrome DICOM images from all modalities and which supports

Modified: trunk/packages/dicomscope/trunk/debian/rules
===================================================================
--- trunk/packages/dicomscope/trunk/debian/rules	2009-07-08 15:04:02 UTC (rev 3600)
+++ trunk/packages/dicomscope/trunk/debian/rules	2009-07-09 12:25:46 UTC (rev 3601)
@@ -15,10 +15,8 @@
 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, sun-java6-jdk:
-# this is needed for cmake 2.6.0 to do a proper system inspection
-JAVA_HOME_DIRS=/usr/lib/jvm/java-6-openjdk /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)
+# 
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))