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

[doogie-3]

Author: doogie
Date: Wed May 26 20:05:35 2010
New Revision: 948563

URL: http://svn.apache.org/viewvc?rev=948563&view=rev
Log:
Remove use of openjdk-6-jdk, instead sun-java6-jdk; it doesn't compile
some things correctly(generics markup), and has issues with some https
urls.

Modified:
    ofbiz/trunk/debian/changelog
    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/changelog
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/changelog?rev=948563&r1=948562&r2=948563&view=diff
==============================================================================
--- ofbiz/trunk/debian/changelog (original)
+++ ofbiz/trunk/debian/changelog Wed May 26 20:05:35 2010
@@ -8,6 +8,8 @@ ofbiz (UNRELEASED) unstable; urgency=low
   * Fix bashism in /etc/init.d/ofbiz.
   * Create runtime/uploads correctly.
   * Bump Standards-Version to 3.8.3.
+  * Remove use of openjdk, it has issues compiling some things(generics
+    markup), and doesn't handle all https urls.
 
  -- Adam Heath <[hidden email]>  Fri, 04 Sep 2009 16:41:32 -0500
 

Modified: ofbiz/trunk/debian/control
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/control?rev=948563&r1=948562&r2=948563&view=diff
==============================================================================
--- ofbiz/trunk/debian/control (original)
+++ ofbiz/trunk/debian/control Wed May 26 20:05:35 2010
@@ -21,11 +21,11 @@ Maintainer: Adam Heath <doogie@brainfood
 Origin: brainfood
 Bugs: mozilla://bugs.brainfood.com
 Standards-Version: 3.8.3
-Build-Depends: openjdk-6-jdk, debhelper (>= 5), po-debconf
+Build-Depends: sun-java6-jdk, debhelper (>= 5), po-debconf
 
 Package: ofbiz-framework
 Architecture: all
-Depends: dbconfig-common (>= 1.8.38), xalan, ${misc:Depends}, ucf, openjdk-6-jdk, libpg-java, libmysql-java, jsvc, adduser
+Depends: dbconfig-common (>= 1.8.38), xalan, ${misc:Depends}, ucf, sun-java6-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=948563&r1=948562&r2=948563&view=diff
==============================================================================
--- ofbiz/trunk/debian/ofbiz-framework.ofbiz.init (original)
+++ ofbiz/trunk/debian/ofbiz-framework.ofbiz.init Wed May 26 20:05:35 2010
@@ -37,7 +37,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 # set defaults
 DEFAULT=/etc/default/ofbiz
 JAVA_HOME=""
-JAVA_HOMES="/usr/lib/jvm/java-6-openjdk"
+JAVA_HOMES="/usr/lib/jvm/java-6-sun"
 MEMIF=""
 UMASK=002
 

Modified: ofbiz/trunk/debian/ofbiz-framework.postinst
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/ofbiz-framework.postinst?rev=948563&r1=948562&r2=948563&view=diff
==============================================================================
--- ofbiz/trunk/debian/ofbiz-framework.postinst (original)
+++ ofbiz/trunk/debian/ofbiz-framework.postinst Wed May 26 20:05:35 2010
@@ -20,7 +20,7 @@ set -e
 
 : "$0" "$@"
 JAVA_HOME=""
-JAVA_HOMES="/usr/lib/jvm/java-6-openjdk"
+JAVA_HOMES="/usr/lib/jvm/java-6-sun"
 OFBIZ_HOME="/usr/share/ofbiz"
 for possible in $JAVA_HOMES; do
  if [ -e "$possible/bin/java" ]; then

Modified: ofbiz/trunk/debian/rules
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/rules?rev=948563&r1=948562&r2=948563&view=diff
==============================================================================
--- ofbiz/trunk/debian/rules (original)
+++ ofbiz/trunk/debian/rules Wed May 26 20:05:35 2010
@@ -21,7 +21,7 @@ SHELL := /bin/bash -O extglob
 
 export DH_VERBOSE
 
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME := /usr/lib/jvm/java-6-sun
 JAVAC := $(JAVA_HOME)/bin/javac
 JAVA := $(JAVA_HOME)/bin/java