[arch-commits] Commit in (kdebase-workspace/trunk/PKGBUILD kdelibs/trunk/PKGBUILD)

[Andrea Scarpino]

    Date: Thursday, May 3, 2012 @ 02:38:01
  Author: andrea
Revision: 158124

Remove old replaces/conflicts

Modified:
  kdebase-workspace/trunk/PKGBUILD
  kdelibs/trunk/PKGBUILD

----------------------------------+
 kdebase-workspace/trunk/PKGBUILD |    4 ----
 kdelibs/trunk/PKGBUILD           |    3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

Modified: kdebase-workspace/trunk/PKGBUILD
===================================================================
--- kdebase-workspace/trunk/PKGBUILD	2012-05-03 06:25:20 UTC (rev 158123)
+++ kdebase-workspace/trunk/PKGBUILD	2012-05-03 06:38:01 UTC (rev 158124)
@@ -21,10 +21,6 @@
          'xorg-xrandr' 'xorg-xmessage')
 makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
 optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
-          'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde'
-           'kdebase-kinfocenter')
 install="${pkgname}.install"
 backup=('usr/share/config/kdm/kdmrc'
         'etc/pam.d/kde'

Modified: kdelibs/trunk/PKGBUILD
===================================================================
--- kdelibs/trunk/PKGBUILD	2012-05-03 06:25:20 UTC (rev 158123)
+++ kdelibs/trunk/PKGBUILD	2012-05-03 06:38:01 UTC (rev 158124)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -14,7 +14,6 @@
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
         'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
-replaces=('kdelibs-experimental')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch' 'archlinux-menu.patch'