Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=2fe81a8438fb305178c6870a444effca25617883
commit 2fe81a8438fb305178c6870a444effca25617883
Merge: e672743 94ad88e
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Mon Feb 14 20:57:58 2011 +0100
Merge git.frugalware.org:/pub/frugalware/frugalware-current
Conflicts:
source/kde/kdelibs/FrugalBuild
source/kde/kdeutils/FrugalBuild
source/xlib/pyqt4/FrugalBuild
source/xlib/sip/FrugalBuild
diff --cc source/kde/kdeutils/FrugalBuild
index b4f81de,451c84e..6650649
--- a/source/kde/kdeutils/FrugalBuild
+++ b/source/kde/kdeutils/FrugalBuild
@@@ -39,7 -38,7 +39,7 @@@ subpkgs=("${subpkgs[@]}" "kwallet"
subdescs=("${subdescs[@]}" 'KDE Wallet Manager is a tool to manage the
passwords on your KDE system.')
subdepends=("${subdepends[@]}" "kdelibs>=${_F_kde_ver}")
subrodepends=("${subrodepends[@]}" "")
--subgroups=("${subgroups[@]}" 'kde')
++subgroups=("${subgroups[@]}" 'kde-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64')
rodepends=("${rodepends[@]}" "${subpkgs[@]}")
diff --cc source/xlib/pyqt4/FrugalBuild
index e0a1937,647d28f..3ed6c12
--- a/source/xlib/pyqt4/FrugalBuild
+++ b/source/xlib/pyqt4/FrugalBuild
@@@ -2,15 -2,16 +2,16 @@@
# Maintainer: crazy <cr...@frugalware.org>
pkgname=pyqt4
- origname=PyQt
+ _F_archive_name=PyQt-x11-gpl
pkgver=4.8.3
-pkgrel=1
+pkgrel=2
pkgdesc="PyQt4 is a set of Python bindings for the Qt4 toolkit."
-url="http://www.riverbankcomputing.co.uk";
+url="http://www.riverbankcomputing.co.uk/";
- depends=('libqtscripttools' 'libqttest' 'libqtopengl' 'libqtsvg'
'qt4-designer' 'libqthelp' \
- 'dbus-python' 'sip>=4.12.1' 'qscintilla2-qt4>=2.4.5' 'libqtdeclarative')
- up2date="lynx -dump
http://www.riverbankcomputing.co.uk/software/pyqt/download |grep
'PyQt-x11-gpl-4' |sed -ne 's/.*l-\(.*\).tar.gz .*/\1/;1 p'"
-
source=(http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/$origname-x11-gpl-$pkgver.tar.gz)
+ depends=('libqtdeclarative' 'libqthelp' 'libqtmultimedia' 'libqtopengl' \
+ 'libqtscripttools' 'libqtsvg' 'libqttest' 'qt4-designer' \
+ 'dbus-python' 'sip>=4.12.1' 'qscintilla2-qt4>=2.4.5')
+ up2date="Flasttar $url/software/pyqt/download"
+ source=("$url/static/Downloads/PyQt4/$_F_archive_name-$pkgver.tar.gz")
license="GPL"
groups=('xlib')
archs=('i686' 'x86_64' 'ppc')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
