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

commit 6f1ebf1ba1b2b8541e46cb259dc0cd50fbf7e6d6
Merge: 7ab3880 ca61c07
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Thu Sep 2 02:22:21 2010 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current:

Conflicts:
source/xapps-extra/rrdtool/FrugalBuild
source/xmultimedia-extra/gereqi/FrugalBuild

diff --cc source/xapps-extra/rrdtool/FrugalBuild
index a5885c7,0ab1ac3..78e8d75
--- a/source/xapps-extra/rrdtool/FrugalBuild
+++ b/source/xapps-extra/rrdtool/FrugalBuild
@@@ -2,12 -2,12 +2,12 @@@
# Maintainer: Krisztian VASAS <i...@frugalware.org>

pkgname=rrdtool
- pkgver=1.4.3
- pkgrel=4
+ pkgver=1.4.4
-pkgrel=1
++pkgrel=2
sbu=1
pkgdesc="a program to generate fancy graphs from network usage or from any 
thing is able to meter"
url="http://oss.oetiker.ch/$pkgname/pub";
--depends=('gd' 'cgilib' 'libart_lgpl' 'pango' 'libpng>=1.4')
++depends=('gd' 'cgilib' 'libart_lgpl' 'pango' 'libpng>=1.4' 'python>=2.7')
makedepends=('tcl')
groups=('xapps-extra')
archs=('i686' 'x86_64')
diff --cc source/xmultimedia-extra/gereqi/FrugalBuild
index eabc86b,7c51647..126a1c4
--- a/source/xmultimedia-extra/gereqi/FrugalBuild
+++ b/source/xmultimedia-extra/gereqi/FrugalBuild
@@@ -3,10 -3,10 +3,10 @@@
# Contributor: centuri0 <achevaux @ gmail dot com>

pkgname=gereqi
- pkgver=0.4.0
+ pkgver=0.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="A music organiser and player, clone of Amarok-1.4"
--depends=('gst-python' 'mutagen' 'lxml' 'pyinotify' 'pyqt4')
++depends=('gst-python' 'mutagen' 'lxml' 'pyinotify' 'pyqt4>=4.7-3')
groups=('xmultimedia-extra')
archs=('i686')
Finclude googlecode
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to