Date: Thursday, February 14, 2013 @ 00:00:26 Author: andrea Revision: 178035
Do not replace the qt package Modified: qt/kde-unstable/PKGBUILD ----------+ PKGBUILD | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-02-13 22:51:38 UTC (rev 178034) +++ PKGBUILD 2013-02-13 23:00:26 UTC (rev 178035) @@ -1,9 +1,7 @@ # $Id: PKGBUILD 172119 2012-11-29 17:17:54Z andrea $ # Maintainer: Andrea Scarpino <[email protected]> -# Contributor: Pierre Schmitz <[email protected]> pkgbase=qt -pkgname=('qt') pkgname=('qtbase' 'qtdeclarative' 'qtmultimedia' @@ -78,7 +76,6 @@ 'libmysqlclient: MySQL driver' 'unixodbc: ODBC driver' 'libfbclient: Firebird/iBase driver') - replaces=('qt') conflicts=('qt' 'qt-private-headers') install='qtbase.install' @@ -102,7 +99,7 @@ package_qtdeclarative() { pkgdesc=('A cross-platform application and UI framework (Qt QML)') - depends=('qtbase' 'qt-addons') + depends=('qtbase') conflicts=('qt' 'qt-private-headers') cd ${_pkgfqn}/qtdeclarative @@ -116,6 +113,7 @@ package_qtmultimedia() { pkgdesc=('A cross-platform application and UI framework (Qt Multimedia)') depends=('qtbase' 'libpulse' 'gstreamer0.10-base' 'qtdeclarative') + conflicts=('qt') cd ${_pkgfqn}/qtmultimedia make INSTALL_ROOT="${pkgdir}" install @@ -190,7 +188,7 @@ package_qtwebkit() { pkgdesc=('An open source web browser engine (Qt port of WebKit)') - depends=('qtbase' 'qtdeclarative' 'gstreamer0.10-base' 'icu') + depends=('qtbase' 'gstreamer0.10-base' 'icu') cd ${_pkgfqn}/qtwebkit make INSTALL_ROOT="${pkgdir}" install
