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

[Pierre Schmitz]

    Date: Tuesday, September 1, 2009 @ 11:05:19
  Author: pierre
Revision: 50784

Merged revisions 50092,50546 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdebase-workspace/trunk

........
  r50092 | pierre | 2009-08-21 07:11:45 +0200 (Fr, 21 Aug 2009) | 1 line
  
  add replaces to conflicts; FS#15805
........
  r50546 | pierre | 2009-08-29 22:10:59 +0200 (Sa, 29 Aug 2009) | 1 line
  
  prepare KDE 4.3.1; package cleanup
........

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

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-09-01 15:04:40 UTC (rev 50783)
+++ extra-i686/PKGBUILD	2009-09-01 15:05:19 UTC (rev 50784)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdebase-workspace
-pkgver=4.3.0
-pkgrel=2
+pkgver=4.3.1
+pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -16,7 +16,7 @@
 	 'libxss' 'lm_sensors' 'libxklavier' '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')
+conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde')
 optdepends=('kdebindings-python: plasma scriptengine for Python')
 install='kdebase-workspace.install'
 backup=('usr/share/config/kdm/kdmrc'
@@ -26,7 +26,7 @@
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
         'fixpath.patch')
-md5sums=('e56f8af44df7bc8bfbc1de1ff1bf4414'
+md5sums=('cf512fce3c8734078a89119334fd5a8a'
          '721e97031b62aee8914e8617e86f9235'
          '5d80164932e0d44d8b802d3929a004ab'
          '10a490653b002e6f9e7476ff9d37c011'