[arch-commits] Commit in openjdk6/repos (testing-x86_64 testing-x86_64/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, May 30, 2009 @ 05:38:08
  Author: andyrtr
Revision: 40701

Merged revisions 40699 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/openjdk6/trunk

........
  r40699 | andyrtr | 2009-05-30 09:08:39 +0000 (Sa, 30 Mai 2009) | 2 lines
  
  upgpkg: openjdk6 1.5-2
      added force option
........

Modified:
  openjdk6/repos/testing-x86_64/	(properties)
  openjdk6/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: openjdk6/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openjdk6/trunk:1-40691
   + /openjdk6/trunk:1-40700

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-05-30 09:09:15 UTC (rev 40700)
+++ testing-x86_64/PKGBUILD	2009-05-30 09:38:08 UTC (rev 40701)
@@ -8,7 +8,7 @@
 pkgver=1.5
 _hgver=926c38e2b283 # =hg rc3 tagged, see http://icedtea.classpath.org/hg/icedtea6/summary
 _icedteaver=1.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@
             'giflib: for gif format support')
 conflicts=('java-environment' 'java-runtime')
 provides=('java-environment=6' 'java-runtime=6')
-options=('!emptydirs')
+options=('!emptydirs' 'force')
 install=openjdk6.install
 source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
 	#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2