[med-svn] r3535 - trunk/packages/gdcm/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2009-06-24 13:22:00 +0000 (Wed, 24 Jun 2009)
New Revision: 3535

Modified:
   trunk/packages/gdcm/trunk/debian/control
   trunk/packages/gdcm/trunk/debian/rules
Log:
reproduce bug from Andreas. copy some info from charva package

Modified: trunk/packages/gdcm/trunk/debian/control
===================================================================
--- trunk/packages/gdcm/trunk/debian/control	2009-06-24 10:59:22 UTC (rev 3534)
+++ trunk/packages/gdcm/trunk/debian/control	2009-06-24 13:22:00 UTC (rev 3535)
@@ -12,7 +12,7 @@
  swig, cmake, libvtk5-dev (>= 5.2.1-4) [i386] | libvtk5-dev (>= 5.2.1),
  python-vtk, libpng12-dev | libpng-dev,
  libjpeg62-dev, libtiff4-dev, libfreetype6-dev, libopenjpeg-dev, graphviz,
- libxext-dev, libxss-dev, libxft-dev, default-jdk, 
+ libxext-dev, libxss-dev, libxft-dev, default-jdk-builddep
  libpoppler-dev, libssl-dev
 Build-Depends-Indep:  cli-common-dev (>= 0.5.7),
  mono-devel (>= 2.0) [!mipsel]
@@ -87,7 +87,8 @@
 Package: libgdcm-java
 Section: java
 Architecture: any
-Depends: ${shlibs:Depends}, ${java:Depends}, libgdcm2.0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${java:Depends}, java-gcj-compat | java1-runtime | java2-runtime,
+Suggests: java-virtual-machine
 Description: Grassroots DICOM Java bindings
  Grassroots DiCoM is a C++ library for DICOM medical files. It is
  automatically wrapped to python/C#/Java (using swig). It supports

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2009-06-24 10:59:22 UTC (rev 3534)
+++ trunk/packages/gdcm/trunk/debian/rules	2009-06-24 13:22:00 UTC (rev 3535)
@@ -48,8 +48,8 @@
         JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
-# FIXME
-export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj-4.3-1.5.0.0/
+# export JAVA_HOME because upstream CMake uses it
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 SRC	:= $(CURDIR)
 BUILD	:= $(CURDIR)/debian/build