[Frugalware-git] wipv: Merge branch 'master' of git://git.frugalware.org/pub/other/people/voroskoi/wipv

[VÖRÖSKŐI András]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=77e9ace3e7a454a437f5f9ecb0c1800924faaba4

commit 77e9ace3e7a454a437f5f9ecb0c1800924faaba4
Merge: 0ac1b1d 06f183a
Author: VÖRÖSKŐI András <voros...@frugalware.org>
Date:   Mon Jul 5 23:54:26 2010 +0200

Merge branch 'master' of git://git.frugalware.org/pub/other/people/voroskoi/wipv

Conflicts:
source/kde-extra/amarok/FrugalBuild
Merge in the openssl bump repo

diff --cc source/kde-extra/amarok/FrugalBuild
index 47f667d,5f40db7..c2c6918
--- a/source/kde-extra/amarok/FrugalBuild
+++ b/source/kde-extra/amarok/FrugalBuild
@@@ -2,10 -2,12 +2,10 @@@
# Maintainer: DeX77 <d...@dragonslave.de>

pkgname=amarok
-pkgver=2.3.0
+pkgver=2.3.1
- pkgrel=1
+ pkgrel=2
pkgdesc="amaroK is a music player for Linux and Unix with an intuitive 
interface"
_F_cmakekde_final=OFF
-_F_kde_no_auto_docs=1
-_F_kde_no_compiletime=1
Finclude kde
depends=("kdelibs>=$_F_kde_ver" 'taglib-extras>=1.0' 'qtscriptgenerator' 
'libgpod' 'libmtp'\
'curl' 'liblastfm' 'loudmouth' 'libmysqld>=5.1.39' 'libstrigiqtdbusclient' \

_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git