# HG changeset patch
# User Matthew Sheets <rcx@zoominternet.net>
# Date 1281822588 0
# Node ID d2cca572c2031c069a3d2ec2bc8f6a5ab1c81d0f
# Parent  2673de9a68f81d31f189e765e7b1851716cdbeda
icedtea6: Upgrade to 1.8.1

diff -r 2673de9a68f8 -r d2cca572c203 icedtea6-jdk/receipt
--- a/icedtea6-jdk/receipt	Sat Aug 14 21:42:26 2010 +0000
+++ b/icedtea6-jdk/receipt	Sat Aug 14 21:49:48 2010 +0000
@@ -2,7 +2,7 @@
 
 PACKAGE="icedtea6-jdk"
 SOURCE="icedtea6"
-VERSION="1.6.1"
+VERSION="1.8.1"
 CATEGORY="development"
 SHORT_DESC="A Free Software harness for OpenJDK."
 MAINTAINER="rcx@zoominternet.net"
@@ -23,9 +23,11 @@
 compile_rules()
 {
 	local JVM_PREFIX
-	JVM_PREFIX=/usr/lib/jvm/java-icedtea
+	JVM_PREFIX="/usr/lib/jvm/java-icedtea"
 	
 	# NOTE: This build does not seem to work with ECJ 3.5
+	local ECJ_VERSION
+	ECJ_VERSION="3.6"
 
 	cd $src
 	[ -L /usr/bin/diff ] && tazpkg get-install diffutils --forced
@@ -46,7 +48,7 @@
 		--disable-plugin \
 		--disable-docs \
 		--with-ecj \
-		--with-ecj-jar=/usr/share/java/ecj-3.4.2.jar \
+		--with-ecj-jar=/usr/share/java/ecj-$ECJ_VERSION.jar \
 		--with-gcj \
 		--with-gcj-home=/usr/lib/jvm/java-gcj \
 		--with-xalan2-jar=/usr/share/java/xalan.jar \
diff -r 2673de9a68f8 -r d2cca572c203 icedtea6-jre/receipt
--- a/icedtea6-jre/receipt	Sat Aug 14 21:42:26 2010 +0000
+++ b/icedtea6-jre/receipt	Sat Aug 14 21:49:48 2010 +0000
@@ -1,11 +1,11 @@
 # SliTaz package receipt.
 
 PACKAGE="icedtea6-jre"
-VERSION="1.6.1"
+VERSION="1.8.1"
 CATEGORY="development"
 SHORT_DESC="A Free Software harness for OpenJDK JRE."
 MAINTAINER="rcx@zoominternet.net"
-DEPENDS="glibc-base gcc-lib-base util-linux-ng-uuid alsa-lib freetype giflib jpeg libpng zlib \
+DEPENDS="glibc-base gcc-lib-base util-linux-ng-uuid alsa-lib freetype giflib libjpeg libpng zlib \
 xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \
 xorg-libXi xorg-libXrender xorg-libXtst"
 BUILD_DEPENDS=""