[Frugalware-git] frugalware-current: Merge remote-tracking branch 'current/master'

Melko melko at frugalware.org
Wed Apr 11 21:18:26 CEST 2012


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=52e067f328531754b09eae2e4cd460c46bcf89f6

commit 52e067f328531754b09eae2e4cd460c46bcf89f6
Merge: 780e97c a2b731f
Author: Melko <melko at frugalware.org>
Date:   Wed Apr 11 20:57:38 2012 +0200

Merge remote-tracking branch 'current/master'

Conflicts:
source/kde-extra/okular/FrugalBuild

diff --cc source/kde-extra/okular/FrugalBuild
index 3374928,b4be85f..829331b
--- a/source/kde-extra/okular/FrugalBuild
+++ b/source/kde-extra/okular/FrugalBuild
@@@ -2,7 -2,7 +2,7 @@@
# Maintainer: centuri0 <achevaux at gmail dot com>

pkgname=okular
--pkgrel=2
++pkgrel=3
pkgdesc="KDE universal document viewer."
groups=('kde-extra' 'kde-minimal')
archs=('i686' 'x86_64')
@@@ -10,7 -10,8 +10,7 @@@ Finclude kd
depends=("kdelibs-core>=$_F_kde_ver" "kdelibs-interfaces>=$_F_kde_ver" "libthreadweaver>=$_F_kde_ver" "libkdesu>=$_F_kde_ver" \
'attica>=0.3.0' "libkutils>=$_F_kde_ver" "libnepomuk>=$_F_kde_ver" 'qimageblitz>=0.0.4' \
"libkhtml>=$_F_kde_ver" 'ebook-tools>=0.2.1' 'qca>=2.0.3' 'chmlib>=0.40' 'libspectre>=0.2.6' \
- 	'poppler-qt4>=0.18.0' 'djvulibre>=3.5.24')
+ 	'poppler-qt4>=0.18.1' 'djvulibre>=3.5.24')
-makedepends=("${makedepends[@]}" "kdebase-workspace-compiletime>=$_F_kde_ver" \
-	"ksgmltools2>=$_F_kde_ver" "kdelibs>=$_F_kde_ver" "libkdeclarative>=$_F_kde_ver")
+makedepends=("${makedepends[@]}" "kdebase-workspace-compiletime>=$_F_kde_ver" "kdelibs>=$_F_kde_ver")

# optimization OK


More information about the Frugalware-git mailing list