[pkg-java] r7256 - trunk/electric/debian

[onkarshinde-guest at alioth.debian.org]

Author: onkarshinde-guest
Date: 2008-11-08 11:50:40 +0000 (Sat, 08 Nov 2008)
New Revision: 7256

Modified:
   trunk/electric/debian/changelog
   trunk/electric/debian/rules
Log:
electric 8.07-2

Modified: trunk/electric/debian/changelog
===================================================================
--- trunk/electric/debian/changelog	2008-11-08 11:38:51 UTC (rev 7255)
+++ trunk/electric/debian/changelog	2008-11-08 11:50:40 UTC (rev 7256)
@@ -4,6 +4,8 @@
     - Remove Sun JDK from build dependencies.
     - Add hard dependency on OpenJDK JRE as the program does not run with GCJ.
     - Remove default-jre from runtime dependencies. (Closes: #503780)
+  * debian/rules
+    - Remove Sun JDK home directories.
   * debian/wrappers/electric
     - Use java binary from OpenJDK so the program has no problems launching
       when more than one JRE are present. This is similar to how it is done

Modified: trunk/electric/debian/rules
===================================================================
--- trunk/electric/debian/rules	2008-11-08 11:38:51 UTC (rev 7255)
+++ trunk/electric/debian/rules	2008-11-08 11:50:40 UTC (rev 7256)
@@ -6,7 +6,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS			:= /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-1.5.0-sun /usr/lib/jvm/java-6-sun
+JAVA_HOME			:= /usr/lib/jvm/java-6-openjdk
 DEB_JARS			:= bsh
 DEB_INSTALL_CHANGELOGS_ALL	:= ChangeLog.txt