summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2009-12-17 21:50:28 +0100
committertnut <thierryn1 at hispeed dot ch>2009-12-17 21:50:28 +0100
commita45257f55bb4800d739a3aecf764c4feda4d5440 (patch)
treea12121d36513b0ce86534ba82061599fd1454b6e
parent88e496f0c91a277802b0b955a6e15778db38c53d (diff)
parent7b759aaf75463d53038359de6ad3fa70bec82c97 (diff)
downloadnutyx-pakxe-a45257f55bb4800d739a3aecf764c4feda4d5440.tar.gz
nutyx-pakxe-a45257f55bb4800d739a3aecf764c4feda4d5440.tar.bz2
nutyx-pakxe-a45257f55bb4800d739a3aecf764c4feda4d5440.tar.xz
nutyx-pakxe-a45257f55bb4800d739a3aecf764c4feda4d5440.zip
Merge commit 'lesibel/master'
-rw-r--r--extra/google-chrome/.md5sum2
-rw-r--r--extra/google-chrome/Pkgfile2
-rw-r--r--kde/amarok/.footprint5
-rw-r--r--kde/amarok/.md5sum2
-rwxr-xr-xkde/amarok/Pkgfile4
5 files changed, 10 insertions, 5 deletions
diff --git a/extra/google-chrome/.md5sum b/extra/google-chrome/.md5sum
index 95f3f4771..8be599660 100644
--- a/extra/google-chrome/.md5sum
+++ b/extra/google-chrome/.md5sum
@@ -1 +1 @@
-7dfceaf0822c029159327f78c3242147 google-chrome-beta_current_i386.deb
+b5d44f74288fa52613e420c741c9f350 google-chrome-beta_current_i386.deb
diff --git a/extra/google-chrome/Pkgfile b/extra/google-chrome/Pkgfile
index b757be787..692cf2b11 100644
--- a/extra/google-chrome/Pkgfile
+++ b/extra/google-chrome/Pkgfile
@@ -5,7 +5,7 @@
# Depends on: xz-utils
name=google-chrome
-version=4.0.249.30
+version=4.0.249.43
release=1
if [ "`uname -m`" = 'x86_64' ]; then
ARCH='amd64'
diff --git a/kde/amarok/.footprint b/kde/amarok/.footprint
index 37211018d..3b89820d3 100644
--- a/kde/amarok/.footprint
+++ b/kde/amarok/.footprint
@@ -94,6 +94,7 @@ drwxr-xr-x root/root opt/kde/share/apps/amarok/icons/hicolor/16x16/actions/
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/16x16/actions/favorite-genres-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/16x16/actions/filename-album-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/16x16/actions/filename-artist-amarok.png
+-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/16x16/actions/filename-bpm-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/16x16/actions/filename-comment-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/16x16/actions/filename-composer-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/16x16/actions/filename-dash-amarok.png
@@ -167,6 +168,7 @@ drwxr-xr-x root/root opt/kde/share/apps/amarok/icons/hicolor/22x22/actions/
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/22x22/actions/edit-redo-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/22x22/actions/edit-undo-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/22x22/actions/emblem-favorite-amarok.png
+-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/22x22/actions/filename-bpm-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/22x22/actions/internet-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/22x22/actions/love-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/22x22/actions/media-album-cover-manager-amarok.png
@@ -218,6 +220,7 @@ drwxr-xr-x root/root opt/kde/share/apps/amarok/icons/hicolor/32x32/actions/
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/32x32/actions/edit-redo-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/32x32/actions/edit-undo-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/32x32/actions/emblem-favorite-amarok.png
+-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/32x32/actions/filename-bpm-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/32x32/actions/love-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/32x32/actions/media-album-cover-manager-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/32x32/actions/media-album-cover.png
@@ -271,6 +274,7 @@ drwxr-xr-x root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/emblem-favorite-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-album-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-artist-amarok.png
+-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-bpm-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-comment-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-composer-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-dash-amarok.png
@@ -284,6 +288,7 @@ drwxr-xr-x root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-ignore-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-initial-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-last-played.png
+-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-moodbar.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-sample-rate.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-slash-amarok.png
-rw-r--r-- root/root opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/filename-space-amarok.png
diff --git a/kde/amarok/.md5sum b/kde/amarok/.md5sum
index 4ba33cd36..95ee8613c 100644
--- a/kde/amarok/.md5sum
+++ b/kde/amarok/.md5sum
@@ -1 +1 @@
-4f6f45f0c25f85f2a2a1fff169ac7193 amarok-2.2.1.tar.bz2
+0fb6c98618c91159a26e3f2e837ef132 amarok-2.2.1.90.tar.bz2
diff --git a/kde/amarok/Pkgfile b/kde/amarok/Pkgfile
index 0e31a40a0..f9ce14809 100755
--- a/kde/amarok/Pkgfile
+++ b/kde/amarok/Pkgfile
@@ -5,9 +5,9 @@
# Depends on: kdebase-runtime, qtscriptgenerator, taglib-extras
name=amarok
-version=2.2.1
+version=2.2.1.90
release=1
-source=(http://download.kde.org/download.php?url=stable/$name/$version/src/$name-$version.tar.bz2)
+source=(http://download.kde.org/download.php?url=unstable/$name/$version/src/$name-$version.tar.bz2)
build() {
cd $name-$version