[arch-commits] Commit in kdebase-workspace/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, October 11, 2009 @ 17:41:10
  Author: jgc
Revision: 55045

Fix conflict

Modified:
  kdebase-workspace/repos/extra-i686/	(properties)
  kdebase-workspace/repos/extra-i686/PKGBUILD	(contents, properties)

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


Property changes on: kdebase-workspace/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /kdebase-workspace/trunk:1-50783
   + /kdebase-workspace/trunk:1-55044

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-11 21:39:42 UTC (rev 55044)
+++ extra-i686/PKGBUILD	2009-10-11 21:41:10 UTC (rev 55045)
@@ -1,9 +1,9 @@
-# $Id: $
+# $Id$
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdebase-workspace
 pkgver=4.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -13,7 +13,7 @@
 # 	not detected by namcap because libgl depends on it
 #	but nvidia providing libgl does not depend on libxdamage
 depends=('kdelibs-experimental' 'kdepimlibs' 'kdebase-runtime' 'libxxf86misc' 'libxcomposite'
-	 'libxss' 'lm_sensors' 'libxklavier' 'qimageblitz' 'polkit-qt' 'libxft' 'libxdamage')
+	 'libxss' 'lm_sensors' 'libxklavier>=4.0' 'qimageblitz' 'polkit-qt' 'libxft' 'libxdamage')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 'kdebindings-python')
 replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde')
 conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde')


Property changes on: kdebase-workspace/repos/extra-i686/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + id