upgpkg: caledonia-bundle 2.0-3

depend on our wallpaper package instead

2 files changed, 16 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86110bd69a66..d8f546683d20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = caledonia-bundle
 	pkgdesc = A bundle with all Caledonia customizations for KDE4
 	pkgver = 2.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://caledonia.sourceforge.net/
 	arch = any
 	license = CCPL:by-sa
 	depends = kdebase-workspace
-	source = Caledonia-2.0.tar.gz::http://sourceforge.net/projects/caledonia/files/Caledonia%20%28Plasma-KDE%20Theme%29/Caledonia-2.0.tar.gz
-	source = Caledonia-KDM-2.0.tar.gz::http://sourceforge.net/projects/caledonia/files/Caledonia%20KDM/Caledonia-KDM-2.0.tar.gz
-	source = Caledonia-KSplash-2.0.tar.gz::http://sourceforge.net/projects/caledonia/files/Caledonia%20KSplash/Caledonia-KSplash-2.0.tar.gz
-	source = Caledonia.colors::http://sourceforge.net/projects/caledonia/files/Caledonia%20Color%20Scheme/Caledonia.colors
-	source = Caledonia_Official_Wallpaper_Collection-2.0.tar.gz::http://sourceforge.net/projects/caledonia/files/Caledonia%20Official%20Wallpapers/Caledonia_Official_Wallpaper_Collection-2.0.tar.gz
+	depends = caledonia-wallpapers
+	source = http://sourceforge.net/projects/caledonia/files/Caledonia%20%28Plasma-KDE%20Theme%29/Caledonia-2.0.tar.gz
+	source = http://sourceforge.net/projects/caledonia/files/Caledonia%20KDM/Caledonia-KDM-2.0.tar.gz
+	source = http://sourceforge.net/projects/caledonia/files/Caledonia%20KSplash/Caledonia-KSplash-2.0.tar.gz
+	source = Caledonia-2.0.colors::http://sourceforge.net/projects/caledonia/files/Caledonia%20Color%20Scheme/Caledonia.colors
 	sha256sums = 3d855b7806d23ad3f748a30e9b0fa94c8ad7ec489fd19a4c026276b3045c5bcc
 	sha256sums = 5e6ebdefa7a7499173bbccb7f2d9a9ae7050dfe698bf02d72cb036117cde381d
 	sha256sums = 6b44c2a77bf2e56b2b48f535b3c3678328dcf826d2a558d319357d5fbd3c2c72
 	sha256sums = 455dc9cfe3071f2ade5447ef5cf25b287e75d7c0b3c51b56ed737e10a5639fb0
-	sha256sums = 42caaeff55359bb5789f2c624595a4d67011024ec5201d40212f381b82535e29
 
 pkgname = caledonia-bundle
 
diff --git a/PKGBUILD b/PKGBUILD
index 767b7e4dae3d..e5f81e4a8450 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,24 @@
-# Maintainier: FadeMind <fademind@gmail.com>
+# Maintainer: Peter Hoeg <first name at last name dot com>
+# Contributor: FadeMind <fademind@gmail.com>
 # Contributor: Tommaso Sardelli <lacapannadelloziotom [at] gmail [dot] com>
 
 pkgname=caledonia-bundle
 pkgver=2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A bundle with all Caledonia customizations for KDE4"
 arch=('any')
 url=('http://caledonia.sourceforge.net/')
 license=('CCPL:by-sa')
-depends=('kdebase-workspace')
-source=("Caledonia-${pkgver}.tar.gz::http://sourceforge.net/projects/caledonia/files/Caledonia%20%28Plasma-KDE%20Theme%29/Caledonia-${pkgver}.tar.gz"
-        "Caledonia-KDM-${pkgver}.tar.gz::http://sourceforge.net/projects/caledonia/files/Caledonia%20KDM/Caledonia-KDM-${pkgver}.tar.gz"
-        "Caledonia-KSplash-${pkgver}.tar.gz::http://sourceforge.net/projects/caledonia/files/Caledonia%20KSplash/Caledonia-KSplash-${pkgver}.tar.gz"
-        "Caledonia.colors::http://sourceforge.net/projects/caledonia/files/Caledonia%20Color%20Scheme/Caledonia.colors"
-        "Caledonia_Official_Wallpaper_Collection-${pkgver}.tar.gz::http://sourceforge.net/projects/caledonia/files/Caledonia%20Official%20Wallpapers/Caledonia_Official_Wallpaper_Collection-${pkgver}.tar.gz")
+depends=('kdebase-workspace' 'caledonia-wallpapers')
+source=("http://sourceforge.net/projects/caledonia/files/Caledonia%20%28Plasma-KDE%20Theme%29/Caledonia-${pkgver}.tar.gz"
+        "http://sourceforge.net/projects/caledonia/files/Caledonia%20KDM/Caledonia-KDM-${pkgver}.tar.gz"
+        "http://sourceforge.net/projects/caledonia/files/Caledonia%20KSplash/Caledonia-KSplash-${pkgver}.tar.gz"
+        "Caledonia-${pkgver}.colors::http://sourceforge.net/projects/caledonia/files/Caledonia%20Color%20Scheme/Caledonia.colors")
 
 sha256sums=('3d855b7806d23ad3f748a30e9b0fa94c8ad7ec489fd19a4c026276b3045c5bcc'
             '5e6ebdefa7a7499173bbccb7f2d9a9ae7050dfe698bf02d72cb036117cde381d'
             '6b44c2a77bf2e56b2b48f535b3c3678328dcf826d2a558d319357d5fbd3c2c72'
-            '455dc9cfe3071f2ade5447ef5cf25b287e75d7c0b3c51b56ed737e10a5639fb0'
-            '42caaeff55359bb5789f2c624595a4d67011024ec5201d40212f381b82535e29')
+            '455dc9cfe3071f2ade5447ef5cf25b287e75d7c0b3c51b56ed737e10a5639fb0')
 
 package() {
 	mkdir -p -m755 "${pkgdir}/usr/share/apps/kdm/themes" \
@@ -32,8 +31,4 @@ package() {
 	cp -r --no-preserve=mode Caledonia-KSplash "${pkgdir}/usr/share/apps/ksplash/Themes"
 	cp -rf --no-preserve=mode Caledonia        "${pkgdir}/usr/share/apps/desktoptheme"
 	cp --no-preserve=mode Caledonia.colors     "${pkgdir}/usr/share/apps/color-schemes"
-
-	cd Caledonia_Official_Wallpaper_Collection
-	rm README
-	cp -rf --no-preserve=mode * "${pkgdir}/usr/share/wallpapers"
-} 
+}