svn commit: r718657 - in /ofbiz/trunk/debian: control ofbiz-framework.ofbiz.init ofbiz-framework.postinst rules

[doogie-3]

Author: doogie
Date: Tue Nov 18 09:18:56 2008
New Revision: 718657

URL: http://svn.apache.org/viewvc?rev=718657&view=rev
Log:
Depend on openjdk-6-jdk, instead of the sun variant; these packages
could now go into main.

Modified:
    ofbiz/trunk/debian/control
    ofbiz/trunk/debian/ofbiz-framework.ofbiz.init
    ofbiz/trunk/debian/ofbiz-framework.postinst
    ofbiz/trunk/debian/rules

Modified: ofbiz/trunk/debian/control
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/control?rev=718657&r1=718656&r2=718657&view=diff
==============================================================================
--- ofbiz/trunk/debian/control (original)
+++ ofbiz/trunk/debian/control Tue Nov 18 09:18:56 2008
@@ -21,11 +21,11 @@
 Origin: brainfood
 Bugs: mozilla://bugs.brainfood.com
 Standards-Version: 3.8.0
-Build-Depends: sun-java6-jdk, debhelper (>= 5), po-debconf
+Build-Depends: openjdk-6-jdk, debhelper (>= 5), po-debconf
 
 Package: ofbiz-framework
 Architecture: all
-Depends: dbconfig-common (>= 1.8.38), xalan, ${misc:Depends}, ucf, sun-java6-jdk | j2sdk1.5, libpg-java, libmysql-java, jsvc, adduser
+Depends: dbconfig-common (>= 1.8.38), xalan, ${misc:Depends}, ucf, openjdk-6-jdk, libpg-java, libmysql-java, jsvc, adduser
 Recommends: postgresql-8.1 | postgresql-7.5 | mysql-server
 Description: An Open Source E-Commerce System
  The Apache Open For Business Project is an open source enterprise

Modified: ofbiz/trunk/debian/ofbiz-framework.ofbiz.init
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/ofbiz-framework.ofbiz.init?rev=718657&r1=718656&r2=718657&view=diff
==============================================================================
--- ofbiz/trunk/debian/ofbiz-framework.ofbiz.init (original)
+++ ofbiz/trunk/debian/ofbiz-framework.ofbiz.init Tue Nov 18 09:18:56 2008
@@ -27,7 +27,7 @@
 # set defaults
 DEFAULT=/etc/default/ofbiz
 JAVA_HOME=""
-JAVA_HOMES="/usr/lib/jvm/java-6-sun /usr/lib/j2sdk1.5"
+JAVA_HOMES="/usr/lib/jvm/java-6-openjdk"
 MEMIF=""
 UMASK=002
 

Modified: ofbiz/trunk/debian/ofbiz-framework.postinst
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/ofbiz-framework.postinst?rev=718657&r1=718656&r2=718657&view=diff
==============================================================================
--- ofbiz/trunk/debian/ofbiz-framework.postinst (original)
+++ ofbiz/trunk/debian/ofbiz-framework.postinst Tue Nov 18 09:18:56 2008
@@ -20,7 +20,7 @@
 
 : "$0" "$@"
 JAVA_HOME=""
-JAVA_HOMES="/usr/lib/jvm/java-6-sun /usr/lib/j2sdk1.5"
+JAVA_HOMES="/usr/lib/jvm/java-6-openjdk"
 for possible in $JAVA_HOMES; do
  if [ -e "$possible/bin/java" ]; then
  JAVA_HOME="$possible"

Modified: ofbiz/trunk/debian/rules
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/rules?rev=718657&r1=718656&r2=718657&view=diff
==============================================================================
--- ofbiz/trunk/debian/rules (original)
+++ ofbiz/trunk/debian/rules Tue Nov 18 09:18:56 2008
@@ -21,7 +21,7 @@
 
 export DH_VERBOSE
 
-JAVA_HOME := /usr/lib/jvm/java-6-sun
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 JAVAC := $(JAVA_HOME)/bin/javac
 JAVA := $(JAVA_HOME)/bin/java