[arch-commits] Commit in kde-meta/repos (extra-any extra-any/PKGBUILD)

[Pierre Schmitz]

    Date: Tuesday, August 4, 2009 @ 04:16:20
  Author: pierre
Revision: 49158

Merged revisions 49157 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/kde-meta/trunk

........
  r49157 | pierre | 2009-08-04 10:14:10 +0200 (Di, 04 Aug 2009) | 1 line
  
  OK, I have no idea what pacman does here
........

Modified:
  kde-meta/repos/extra-any/	(properties)
  kde-meta/repos/extra-any/PKGBUILD

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


Property changes on: kde-meta/repos/extra-any
___________________________________________________________________
Modified: svnmerge-integrated
   - /kde-meta/trunk:1-49154
   + /kde-meta/trunk:1-49157

Modified: extra-any/PKGBUILD
===================================================================
--- extra-any/PKGBUILD	2009-08-04 08:14:10 UTC (rev 49157)
+++ extra-any/PKGBUILD	2009-08-04 08:16:20 UTC (rev 49158)
@@ -19,7 +19,7 @@
          'kde-meta-kdeutils'
          'kde-meta-kdewebdev')
 pkgver=4.3
-pkgrel=4
+pkgrel=5
 arch=('any')
 url='http://www.archlinux.org'
 license=('GPL')
@@ -298,16 +298,8 @@
 	         'kdeplasma-addons-wallpapers-pattern'
 	         'kdeplasma-addons-wallpapers-virus'
 	         'kdeplasma-addons-wallpapers-weather')
-	replaces=('kdeplasma-addons'
-	          'kdeplasma-addons-applets'
-	          'kdeplasma-addons-dataengines'
-	          'kdeplasma-addons-runners'
-	          'kdeplasma-addons-wallpapers')
-	conflicts=('kdeplasma-addons'
-	           'kdeplasma-addons-applets'
-	           'kdeplasma-addons-dataengines'
-	           'kdeplasma-addons-runners'
-	           'kdeplasma-addons-wallpapers')
+	replaces=('kdeplasma-addons')
+	conflicts=('kdeplasma-addons')
 }
 
 package_kde-meta-kdesdk() {