diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 19:55:24 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 19:55:24 -0300 |
commit | e2a2cddf54e26ab2f6551c9d27b997472e5f4d45 (patch) | |
tree | 506c782411889ae8fe218db16eee680c7ae5e0e2 /extra/amarok | |
parent | 7927a6b6296eecd09c8d2f70e593a378768deabe (diff) | |
parent | 5e8a6a470237711ad18f12dde87deea6f2b8b0e0 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gtk2hs-cairo/PKGBUILD
community/gtk2hs-glib/PKGBUILD
community/gtk2hs-gtk/PKGBUILD
community/gtk2hs-pango/PKGBUILD
community/haskell-dbus/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/kvirc/PKGBUILD
community/perl-gtk2-trayicon/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/krusader/PKGBUILD
extra/libproxy/PKGBUILD
extra/libreoffice/PKGBUILD
extra/openal/PKGBUILD
extra/postgresql/PKGBUILD
extra/razor/PKGBUILD
extra/subversion/PKGBUILD
extra/swt/PKGBUILD
extra/valgrind/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
kde-unstable/kdepim-runtime/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/git/PKGBUILD
testing/graphviz/PKGBUILD
testing/graphviz/install
testing/perl-xml-parser/PKGBUILD
Diffstat (limited to 'extra/amarok')
-rw-r--r-- | extra/amarok/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index fe6d67a7f..987b412c3 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122696 2011-05-06 06:26:05Z andrea $ +# $Id: PKGBUILD 129446 2011-06-27 20:27:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.4.1 -pkgrel=1 +pkgrel=3 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org" |