summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-01-23 21:28:41 +0100
committertnut <thierryn1 at hispeed dot ch>2010-01-23 21:28:41 +0100
commit6029b06b10a3ab107e69104f574f5e0677f328a9 (patch)
tree27847492831b2a48a79a508d312dbb40bce4df97
parent7bfb49c1e6d1db85d5538c0b3ba7d6d492e9c1eb (diff)
parent4bd6c63699c9064575de59a097fcdc181162a767 (diff)
downloadnutyx-pakxe-6029b06b10a3ab107e69104f574f5e0677f328a9.tar.gz
nutyx-pakxe-6029b06b10a3ab107e69104f574f5e0677f328a9.tar.bz2
nutyx-pakxe-6029b06b10a3ab107e69104f574f5e0677f328a9.tar.xz
nutyx-pakxe-6029b06b10a3ab107e69104f574f5e0677f328a9.zip
Merge remote branch 'lesibel/master'
-rw-r--r--base/file/.md5sum2
-rwxr-xr-xbase/file/Pkgfile2
-rw-r--r--extra/flashplayer/.md5sum2
-rw-r--r--extra/flashplayer/Pkgfile6
4 files changed, 6 insertions, 6 deletions
diff --git a/base/file/.md5sum b/base/file/.md5sum
index f23bacb1c..cd5480d0c 100644
--- a/base/file/.md5sum
+++ b/base/file/.md5sum
@@ -1 +1 @@
-d05f08a53e5c2f51f8ee6a4758c0cc53 file-5.03.tar.gz
+d41fdbedc74656d601b5681c5c928204 file-5.04.tar.gz
diff --git a/base/file/Pkgfile b/base/file/Pkgfile
index e3cbae049..57ff92db3 100755
--- a/base/file/Pkgfile
+++ b/base/file/Pkgfile
@@ -5,7 +5,7 @@
# Depends on:
name=file
-version=5.03
+version=5.04
release=1
source=(ftp://ftp.fu-berlin.de/unix/tools/file/$name-$version.tar.gz)
diff --git a/extra/flashplayer/.md5sum b/extra/flashplayer/.md5sum
index 0b3715795..8f12e8fef 100644
--- a/extra/flashplayer/.md5sum
+++ b/extra/flashplayer/.md5sum
@@ -1 +1 @@
-6306980e40a3266b4b6c173bfcfdc946 install_flash_player_10_linux.tar.gz
+aa694c7392d4519e4ef7812fd2922730 install_flash_player_10_linux.tar.gz
diff --git a/extra/flashplayer/Pkgfile b/extra/flashplayer/Pkgfile
index 8dff030a2..9e9438873 100644
--- a/extra/flashplayer/Pkgfile
+++ b/extra/flashplayer/Pkgfile
@@ -5,12 +5,12 @@
# Depends on: firefox
name=flashplayer
-version=10.0.32.18
+version=10.0.42.34
release=1
source=(http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_${version%%.*}_linux.tar.gz)
build() {
- install -D -m 0755 install_flash_player_${version%%.*}_linux/libflashplayer.so \
- $PKG/usr/lib/firefox/plugins/libflashplayer.so
+# install -D -m 0755 install_flash_player_${version%%.*}_linux/libflashplayer.so \
+ install -D -m 0755 $SRC/libflashplayer.so $PKG/usr/lib/firefox/plugins/libflashplayer.so
}