[arch-commits] Commit in jdk/repos (3 files)

[Eric Belanger]

    Date: Saturday, July 5, 2008 @ 01:25:44
  Author: eric
Revision: 4202

Merged revisions 2-4201 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/jdk/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1500 | jason | 2008-05-12 00:30:12 -0400 (Mon, 12 May 2008) | 1 line
  
  updated jdk to 6u6
........
  r4132 | eduardo | 2008-07-04 01:01:07 -0400 (Fri, 04 Jul 2008) | 1 line
........
  r4149 | eduardo | 2008-07-04 12:12:19 -0400 (Fri, 04 Jul 2008) | 1 line
  
  upgpkg: jdk 6u6-1
........
  r4201 | eric | 2008-07-05 01:25:23 -0400 (Sat, 05 Jul 2008) | 2 lines
  
  upgpkg: jdk 6u6-1
      updated md5sums for x86_64
........

Modified:
  jdk/repos/extra-x86_64/	(properties)
  jdk/repos/extra-x86_64/PKGBUILD
  jdk/repos/extra-x86_64/jdk.profile

-------------+
 PKGBUILD    |    9 ++++++---
 jdk.profile |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)


Property changes on: jdk/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /jdk/trunk:1
   + /jdk/trunk:1-4201

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-05 05:25:23 UTC (rev 4201)
+++ extra-x86_64/PKGBUILD	2008-07-05 05:25:44 UTC (rev 4202)
@@ -2,7 +2,7 @@
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=jdk
-pkgver=6u5
+pkgver=6u6
 pkgrel=1
 pkgdesc="Sun's Java Development Kit"
 arch=(i686 x86_64)
@@ -14,9 +14,12 @@
 source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${ARCH}.bin
         https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh
 	jdk.profile)
-md5sums=('958f0b7e7465346e164770d360e60dd6'
+  [ "${CARCH}" = "i686" ]   && md5sums=('0efe7120ffb9a3379bc66d993056d80d'
          '94065b612df0046d9ae758943f9f6a75'
-         'cf7a5c21439ecb409811481ebb9952f8')
+         '7b042ff5baaf44d23a9686a043540a2b')
+  [ "${CARCH}" = "x86_64" ] && md5sums=('6f3036a444ff0015d1f2db4fd0db1951'
+         '94065b612df0046d9ae758943f9f6a75'
+         '7b042ff5baaf44d23a9686a043540a2b')
 [ "${CARCH}" = "x86_64" ] && md5sums=('16d8c5cf8dc705cbb04334aff9592aa1'
          '94065b612df0046d9ae758943f9f6a75'
          'cf7a5c21439ecb409811481ebb9952f8')

Modified: extra-x86_64/jdk.profile
===================================================================
--- extra-x86_64/jdk.profile	2008-07-05 05:25:23 UTC (rev 4201)
+++ extra-x86_64/jdk.profile	2008-07-05 05:25:44 UTC (rev 4202)
@@ -1,4 +1,4 @@
 export J2SDKDIR=/opt/java
 export PATH=$PATH:$J2SDKDIR/bin
-export JDK_HOME=/opt/java
+export JAVA_HOME=/opt/java
 export CLASSPATH=$CLASSPATH:$J2SDKDIR/lib