[arch-commits] Commit in qt/trunk (PKGBUILD)

[Andrea Scarpino]

    Date: Sunday, February 24, 2013 @ 21:02:02
  Author: andrea
Revision: 178509

This doesn't conflict anymore with qtwebkit

Modified:
  qt/trunk/PKGBUILD

----------+
 PKGBUILD |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-24 19:42:59 UTC (rev 178508)
+++ PKGBUILD	2013-02-24 20:02:02 UTC (rev 178509)
@@ -9,7 +9,7 @@
          'qt5-tools'
          'qt5-webkit')
 pkgver=5.0.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -132,7 +132,7 @@
 package_qt5-addons() {
   pkgdesc=('A cross-platform application and UI framework (Qt Add-ons Modules)')
   depends=('qt5-webkit' 'libtiff')
-  conflicts=('qt' 'qtwebkit')
+  conflicts=('qt')
 
   cd ${_pkgfqn}/qtgraphicaleffects
   make INSTALL_ROOT="${pkgdir}" install
@@ -158,7 +158,7 @@
   pkgdesc=('A cross-platform application and UI framework (Development Tools)')
   depends=('qt5-webkit' 'desktop-file-utils')
   optdepends=('qt5-doc: documentation')
-  conflicts=('qt' 'qtwebkit')
+  conflicts=('qt')
   install='qt5-tools.install'
 
   cd ${_pkgfqn}/qttools