Merge branch '2.4' into 2.5

This commit is contained in:
Juergen Daubert 2008-12-12 10:29:51 +01:00
commit 9e9466fbdf
8 changed files with 3598 additions and 3595 deletions

View File

@ -1,3 +1,3 @@
23bc5ff22fe4f9a208d65fbbfd489ad9 30-dbus.launch
2e643910a09f44b000a0d76038637999 dbus-1.2.4.tar.gz
5dedbe09d4d6a324518487c5277dfa50 dbus-1.2.6.tar.gz
dd882e45b9397a5dbf8650057ee9a340 rc.dbus

View File

@ -5,7 +5,7 @@
# Depends on: expat
name=dbus
version=1.2.4
version=1.2.6
release=1
source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \
rc.dbus 30-dbus.launch)

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
b70924c697584ab7955050d7a9b4de57 jdk-6u10-dlj-linux-i586.bin
e5eef98bc477675c66e053fc3635e645 jdk-6u11-dlj-linux-i586.bin

View File

@ -3,9 +3,9 @@
# URL: http://java.sun.com
name=jdk
version=1.6.0_10
version=1.6.0_11
release=1
source=(http://download.java.net/dlj/binaries/jdk-6u10-dlj-linux-i586.bin)
source=(http://download.java.net/dlj/binaries/jdk-6u11-dlj-linux-i586.bin)
build(){
mkdir -p $PKG/usr/lib; cd $PKG/usr/lib

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
b70924c697584ab7955050d7a9b4de57 jdk-6u10-dlj-linux-i586.bin
e5eef98bc477675c66e053fc3635e645 jdk-6u11-dlj-linux-i586.bin

View File

@ -3,9 +3,9 @@
# URL: http://java.sun.com
name=jre
version=1.6.0_10
version=1.6.0_11
release=1
source=(http://download.java.net/dlj/binaries/jdk-6u10-dlj-linux-i586.bin)
source=(http://download.java.net/dlj/binaries/jdk-6u11-dlj-linux-i586.bin)
build(){
sh $SRC/jdk-*.bin --accept-license --unpack