From 183c253a1f76c25a440bd3ceb25b0f6504cc066e Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 25 Aug 2012 23:14:28 +0000 Subject: [PATCH] Fixed provides conflict --- kde-color-schemes-caledonia/PKGBUILD | 3 +-- kde-icon-themes-caledonia/PKGBUILD | 3 +-- kde-kdm-themes-caledonia/PKGBUILD | 5 ++--- kde-ksplash-themes-caledonia/PKGBUILD | 3 +-- wallpapers-caledonia/PKGBUILD | 3 +-- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/kde-color-schemes-caledonia/PKGBUILD b/kde-color-schemes-caledonia/PKGBUILD index 2140888dd..1f9adf76e 100644 --- a/kde-color-schemes-caledonia/PKGBUILD +++ b/kde-color-schemes-caledonia/PKGBUILD @@ -1,6 +1,6 @@ pkgname=kde-color-schemes-caledonia pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Color schemes for the Caledonia theme." arch=('any') url='http://malcer.deviantart.com/' @@ -8,7 +8,6 @@ license=('CC-BY-SA') groups=('caledonia') depends=('kde-workspace') conflicts=('caledonia-bundle') -provides=('caledonia-bundle') source=('https://opendesktop.org/CONTENT/content-files/146223-Caledonia.colors') md5sums=('7052da2c2cfa00b1f39f133a371dace1') diff --git a/kde-icon-themes-caledonia/PKGBUILD b/kde-icon-themes-caledonia/PKGBUILD index bf9ae8b58..fcec5085f 100644 --- a/kde-icon-themes-caledonia/PKGBUILD +++ b/kde-icon-themes-caledonia/PKGBUILD @@ -1,6 +1,6 @@ pkgname=kde-icon-themes-caledonia pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Icon theme for Caledonia." arch=('any') url='http://malcer.deviantart.com/' @@ -8,7 +8,6 @@ license=('CC-BY-SA') groups=('caledonia') depends=('kde-workspace') conflicts=('caledonia-bundle') -provides=('caledonia-bundle') source=('http://switch.dl.sourceforge.net/project/caledonia/Caledonia%20Icons/Caledonia-Icons.tar.gz') md5sums=('9a1daef4d47c85f5bf22d0ed0c524d3a') diff --git a/kde-kdm-themes-caledonia/PKGBUILD b/kde-kdm-themes-caledonia/PKGBUILD index 1cf838b7d..07f498f19 100644 --- a/kde-kdm-themes-caledonia/PKGBUILD +++ b/kde-kdm-themes-caledonia/PKGBUILD @@ -1,6 +1,6 @@ pkgname=kde-kdm-themes-caledonia pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDM theme for Caledonia." arch=('any') url='http://malcer.deviantart.com/' @@ -8,8 +8,7 @@ license=('CC-BY-SA') groups=('caledonia') depends=('kde-workspace') conflicts=('caledonia-bundle') -provides=('caledonia-bundle') -source('http://kde-look.org/CONTENT/content-files/143130-Caledonia-KDM.tar.gz') +source=('http://kde-look.org/CONTENT/content-files/143130-Caledonia-KDM.tar.gz') md5sums=('8dad3b0299bcc9029fdb3081f1c83826') package() { diff --git a/kde-ksplash-themes-caledonia/PKGBUILD b/kde-ksplash-themes-caledonia/PKGBUILD index 7141f872d..e5cc1edc8 100644 --- a/kde-ksplash-themes-caledonia/PKGBUILD +++ b/kde-ksplash-themes-caledonia/PKGBUILD @@ -1,6 +1,6 @@ pkgname=kde-ksplash-themes-caledonia pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="KSplash theme for Caledonia." arch=('any') url='http://malcer.deviantart.com/' @@ -8,7 +8,6 @@ license=('CC-BY-SA') groups=('caledonia') depends=('kde-workspace') conflicts=('caledonia-bundle') -provides=('caledonia-bundle') source=('http://kde-look.org/CONTENT/content-files/143576-Caledonia-KSplash.tar.gz') md5sums=('07462ebf696ffbfc44a8e29bc9eeab5f') diff --git a/wallpapers-caledonia/PKGBUILD b/wallpapers-caledonia/PKGBUILD index 52e68896a..7bc93066e 100644 --- a/wallpapers-caledonia/PKGBUILD +++ b/wallpapers-caledonia/PKGBUILD @@ -1,6 +1,6 @@ pkgname=wallpapers-caledonia pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Official wallpapers for the Caledonia theme." arch=('any') url='http://malcer.deviantart.com/' @@ -8,7 +8,6 @@ license=('CC-BY') groups=('caledonia') depends=('kde-workspace') conflicts=('caledonia-bundle') -provides=('caledonia-bundle') source=('http://www.deviantart.com/download/220705168/caledonia_official_wallpapers_by_malcer-d3neh74.zip') md5sums=('cc8e3c369fa81ec14405eb8470e192f8')