summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-04-17 14:38:27 +0200
committertnut <thierryn1 at hispeed dot ch>2010-04-17 14:38:27 +0200
commitc49ad941bed7ecab5cd8a0b083020c3b5abe84e7 (patch)
treeb5fde00305958ac5a18de97eda6066783d2fa5ba
parent29552f71dc1528caa2e9114f0e32bf133cc2bb24 (diff)
parente8a23b8678208a09d3fbeb112c731c15e7d3f5aa (diff)
downloadnutyx-extra-c49ad941bed7ecab5cd8a0b083020c3b5abe84e7.tar.gz
nutyx-extra-c49ad941bed7ecab5cd8a0b083020c3b5abe84e7.tar.bz2
nutyx-extra-c49ad941bed7ecab5cd8a0b083020c3b5abe84e7.tar.xz
nutyx-extra-c49ad941bed7ecab5cd8a0b083020c3b5abe84e7.zip
Merge commit 'lesibel/master'
-rw-r--r--base/jdk/.md5sum2
-rw-r--r--base/jdk/Pkgfile2
-rw-r--r--extra/edelib/Pkgfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/base/jdk/.md5sum b/base/jdk/.md5sum
index c914a0fe3..9c1293486 100644
--- a/base/jdk/.md5sum
+++ b/base/jdk/.md5sum
@@ -1,3 +1,3 @@
94065b612df0046d9ae758943f9f6a75 construct.sh
-fb881b88b78770c519b4306ff1ead7a2 jdk-6u19-dlj-linux-i586.bin
+37afae8ef2481b85b4c9b0356c5d7b40 jdk-6u20-dlj-linux-i586.bin
c51e76d9742a5d3b0cd8b2394b881160 jdk.sh
diff --git a/base/jdk/Pkgfile b/base/jdk/Pkgfile
index 3de964ded..fe577cca0 100644
--- a/base/jdk/Pkgfile
+++ b/base/jdk/Pkgfile
@@ -4,7 +4,7 @@
# Packager: thierryn1 at hispeed dot ch
name=jdk
-version=6u19
+version=6u20
release=1
[ "`uname -m`" == "i686" ] && _ARCH=i586
[ "`uname -m`" == "x86_64" ] && _ARCH=amd64
diff --git a/extra/edelib/Pkgfile b/extra/edelib/Pkgfile
index cb4c72395..88c9fd092 100644
--- a/extra/edelib/Pkgfile
+++ b/extra/edelib/Pkgfile
@@ -2,7 +2,7 @@
# URL: http://equinox-project.org/
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on: xorg, jam, fltk1, efltk,doxygen
+# Depends on: xorg, jam, fltk1, efltk,doxygen, dbus
name=edelib
version=2.0-beta-2