Merge branch '2.4' into 2.5
This commit is contained in:
commit
9e9466fbdf
@ -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
|
||||
|
@ -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)
|
||||
|
5573
jdk/.footprint
5573
jdk/.footprint
File diff suppressed because it is too large
Load Diff
@ -1 +1 @@
|
||||
b70924c697584ab7955050d7a9b4de57 jdk-6u10-dlj-linux-i586.bin
|
||||
e5eef98bc477675c66e053fc3635e645 jdk-6u11-dlj-linux-i586.bin
|
||||
|
@ -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
|
||||
|
1604
jre/.footprint
1604
jre/.footprint
File diff suppressed because it is too large
Load Diff
@ -1 +1 @@
|
||||
b70924c697584ab7955050d7a9b4de57 jdk-6u10-dlj-linux-i586.bin
|
||||
e5eef98bc477675c66e053fc3635e645 jdk-6u11-dlj-linux-i586.bin
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user