[electric] 07/19: electric 8.07-2

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository electric.

commit 668683e29780a6c1217dd39ac436f9a389b091bf
Author: Onkar Shinde <onkarshinde at ubuntu.com>
Date:   Sat Nov 8 11:50:40 2008 +0000

    electric 8.07-2
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index daa726c..76183b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ electric (8.07-2) unstable; urgency=low
     - 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
diff --git a/debian/rules b/debian/rules
index 9b2fc4a..c2d42c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/electric.git