Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=73dfaee073d9ca2eeabb98bacacdebaa11de3d6a
commit 73dfaee073d9ca2eeabb98bacacdebaa11de3d6a Merge: 55b12f7 9522d11 Author: Baste <[email protected]> Date: Tue Apr 10 10:02:57 2012 +0200 Merge ../current Conflicts: source/gnome-extra/latexila/FrugalBuild source/lib/libgphoto2/FrugalBuild source/network/networkmanager/FrugalBuild source/xlib/frugalware-icon-theme/FrugalBuild diff --cc source/gnome-extra/latexila/FrugalBuild index 3975b55,612557a..1060304 --- a/source/gnome-extra/latexila/FrugalBuild +++ b/source/gnome-extra/latexila/FrugalBuild @@@ -22,3 -22,3 +22,4 @@@ build() Fbuild_gnome_scriptlet } # optimization OK ++ diff --cc source/kde-extra/okular/FrugalBuild index a5f056b,e498bc5..b4be85f --- a/source/kde-extra/okular/FrugalBuild +++ b/source/kde-extra/okular/FrugalBuild @@@ -8,9 -8,9 +8,9 @@@ groups=('kde-extra' 'kde-minimal' archs=('i686' 'x86_64') Finclude kde depends=("kdelibs-core>=$_F_kde_ver" "kdelibs-interfaces>=$_F_kde_ver" "libthreadweaver>=$_F_kde_ver" "libkdesu>=$_F_kde_ver" \ - 'attica>=0.2.0' "libkutils>=$_F_kde_ver" "libnepomuk>=$_F_kde_ver" 'qimageblitz>=0.0.4' \ + '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") diff --cc source/xlib/frugalware-icon-theme/FrugalBuild index 62bf7a3,8b2f3bf..1977eaa --- a/source/xlib/frugalware-icon-theme/FrugalBuild +++ b/source/xlib/frugalware-icon-theme/FrugalBuild @@@ -2,10 -2,10 +2,10 @@@ # Maintainer: Devil505 <[email protected]> pkgname=frugalware-icon-theme - pkgver=1.6.4 - pkgrel=3 + pkgver=1.7 + pkgrel=1 pkgdesc="Official Frugalware Icon Theme (for GNOME, XFCE4 and LXDE)" -depends=('librsvg' 'libpng') +depends=('librsvg>=2.35.1' 'libpng') url="http://ftp.frugalware.org/pub/other/artwork/$pkgname"; groups=('xlib') archs=('i686' 'x86_64') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
