Author: malat-guest Date: 2009-01-09 09:16:48 +0000 (Fri, 09 Jan 2009) New Revision: 2932
Modified: trunk/packages/dicomscope/trunk/debian/control trunk/packages/dicomscope/trunk/debian/rules Log: Teach cmake about openjdk-6-jdk Modified: trunk/packages/dicomscope/trunk/debian/control =================================================================== --- trunk/packages/dicomscope/trunk/debian/control 2009-01-09 06:29:42 UTC (rev 2931) +++ trunk/packages/dicomscope/trunk/debian/control 2009-01-09 09:16:48 UTC (rev 2932) @@ -4,7 +4,7 @@ DM-Upload-Allowed: yes Uploaders: Mathieu Malaterre <[email protected]> Priority: extra -Build-Depends: debhelper (>= 4), cmake, libdcmtk1-dev, sun-java6-jdk | sun-java5-jdk, +Build-Depends: debhelper (>= 4), cmake, libdcmtk1-dev, sun-java6-jdk | sun-java5-jdk | openjdk-6-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, sun-java5-jre | sun-java6-jre + libxml2, sun-java5-jre | sun-java6-jre | 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-01-09 06:29:42 UTC (rev 2931) +++ trunk/packages/dicomscope/trunk/debian/rules 2009-01-09 09:16:48 UTC (rev 2932) @@ -19,7 +19,7 @@ # 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-1.5.0-sun /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-gcj +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) CFLAGS = -Wall -g _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
