[med-svn] r3549 - trunk/packages/imagej/trunk/debian

[Andreas Tille]

Author: tille
Date: 2009-06-24 20:54:42 +0000 (Wed, 24 Jun 2009)
New Revision: 3549

Modified:
   trunk/packages/imagej/trunk/debian/changelog
   trunk/packages/imagej/trunk/debian/control
   trunk/packages/imagej/trunk/debian/rules
Log:
some enhancements for future packaging

Modified: trunk/packages/imagej/trunk/debian/changelog
===================================================================
--- trunk/packages/imagej/trunk/debian/changelog	2009-06-24 16:57:42 UTC (rev 3548)
+++ trunk/packages/imagej/trunk/debian/changelog	2009-06-24 20:54:42 UTC (rev 3549)
@@ -1,3 +1,14 @@
+imagej (1.43b-2) UNRELEASED; urgency=low
+
+  * debian/control
+    - Depends ${java:Depends}
+    - Depends java-gcj-compat instead of gij
+    - Suggests: java-virtual-machine
+  * debian/rules: Added comment to possibly use
+    export JAVA_HOME=/usr/lib/jvm/default-java
+
+ -- Andreas Tille <tille at debian.org>  Wed, 24 Jun 2009 15:35:51 +0200
+
 imagej (1.43b-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/imagej/trunk/debian/control
===================================================================
--- trunk/packages/imagej/trunk/debian/control	2009-06-24 16:57:42 UTC (rev 3548)
+++ trunk/packages/imagej/trunk/debian/control	2009-06-24 20:54:42 UTC (rev 3549)
@@ -13,8 +13,8 @@
 
 Package: imagej
 Architecture: all
-Depends: gij | java2-runtime, ${misc:Depends}
-Suggests: java2-compiler
+Depends: ${java:Depends}, ${misc:Depends}, java-gcj-compat | java2-runtime,
+Suggests: java-virtual-machine
 Description: Image processing program inspired by NIH Image for the Macintosh
  It can display, edit, analyze, process, save and print 8-bit, 16-bit and
  32-bit images. It can read many image formats including TIFF, GIF, JPEG,

Modified: trunk/packages/imagej/trunk/debian/rules
===================================================================
--- trunk/packages/imagej/trunk/debian/rules	2009-06-24 16:57:42 UTC (rev 3548)
+++ trunk/packages/imagej/trunk/debian/rules	2009-06-24 20:54:42 UTC (rev 3549)
@@ -9,6 +9,9 @@
 # include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # when open_jdk will be jpeg compliant i will use /usr/lib/jvm/java-6-openjdk/
+# Perhaps trying
+#     export JAVA_HOME=/usr/lib/jvm/default-java
+# is the best way to do -> just verify Java policy
  JAVA_HOME		:= $(shell /usr/sbin/update-java-alternatives -l | head -1 | cut -d' ' -f 3)
 # JAVA_HOME		:= $(shell /usr/sbin/update-java-alternatives -l | grep -vw sun | head -1 | cut -d' ' -f 3)
 # Use gcj as java home or search for other installed JVM