adopt package | conflict full version | optdepend jack (as jack2

provides jack) | HiDPI Icons | unified package base

2 files changed, 20 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac538f9cedec..7d89cd2c6886 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Jan 25 10:56:57 UTC 2016
 pkgbase = renoise3-demo
 	pkgdesc = A music composition program
 	pkgver = 3.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.renoise.com
 	arch = i686
 	arch = x86_64
@@ -13,10 +11,10 @@ pkgbase = renoise3-demo
 	depends = libx11
 	depends = gcc-libs
 	optdepends = jack: For JACK audio support
-	optdepends = jack2: For JACK2 audio support
+	conflicts = renoise
 	options = !strip
-	source = http://files.renoise.com/demo/Renoise_3_1_0_Demo_x86.tar.bz2
-	md5sums = 923e2dc22ad895e474a4dbb9da216b2b
+	source = http://files.renoise.com/demo/Renoise_3_1_0_Demo_x86_64.tar.bz2
+	md5sums = 563585735b7bb8db2b3a974d4263aa2a
 
 pkgname = renoise3-demo
 
diff --git a/PKGBUILD b/PKGBUILD
index ca7c6ddc3db4..80dc9066133a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,36 @@
-# Maintainer: Samæ <eeva.samæ@marvid.fr>
-# Previous maintainer: Kristaps Karlsons <kristaps.karlsons@gmail.com>
+# Maintainer: Jack Random <jack (at) random.to>
 
 # Original contributors (renoise-demo):
+# Samæ <eeva.samæ@marvid.fr>
+# Kristaps Karlsons <kristaps.karlsons@gmail.com>
 # Max Pray a.k.a. Synthead <synthead@gmail.com>
 # berkus <berkus@madfire.net>
 # hm_b <holger@music-nerds.net>
 
 pkgname="renoise3-demo"
 pkgver="3.1.0"
-pkgrel="1"
+pkgrel="2"
 pkgdesc="A music composition program"
 arch=("i686" "x86_64")
 url="http://www.renoise.com"
 license=("custom:renoise")
 depends=("alsa-lib" "libx11" "gcc-libs")
-optdepends=("jack: For JACK audio support"
-            "jack2: For JACK2 audio support")
+optdepends=("jack: For JACK audio support")
 makedepends=("xdg-utils")
 options=("!strip")
+conflicts=("renoise")
 
 # This blurb checks if the host machine is x86 or x86_64,
 # then declares the $md5sums and $source arrays accordingly.
 if [[ $CARCH = "x86_64" ]]; then
-    if64="_64"
-    md5sums=('563585735b7bb8db2b3a974d4263aa2a')
+  if64="_64"
+  md5sums=('563585735b7bb8db2b3a974d4263aa2a')
 else
-    md5sums=('923e2dc22ad895e474a4dbb9da216b2b')
+  md5sums=('923e2dc22ad895e474a4dbb9da216b2b')
 fi
 source=("http://files.renoise.com/demo/Renoise_${pkgver//./_}_Demo_x86$if64.tar.bz2")
 
+
 package() {
     cd "$srcdir/Renoise_${pkgver//./_}_Demo_x86$if64"
 
@@ -36,7 +38,12 @@ package() {
     cp -r "Resources"/* "$pkgdir/usr/share/renoise-$pkgver"
 
     install -Dm 755 "renoise" "$pkgdir/usr/bin/renoise3"
-    install -Dm 644 "Installer/renoise.png" "$pkgdir/usr/share/icons/hicolor/48x48/apps/renoise3.png"
+    install -Dm 644 "Resources/Skin/Icons/WindowIcon16.png" "$pkgdir/usr/share/icons/hicolor/16x16/apps/renoise3.png"
+    install -Dm 644 "Resources/Skin/Icons/WindowIcon32.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/renoise3.png"
+    install -Dm 644 "Resources/Skin/Icons/WindowIcon48.png" "$pkgdir/usr/share/icons/hicolor/48x48/apps/renoise3.png"
+    install -Dm 644 "Resources/Skin/Icons/WindowIcon128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/renoise3.png"
+    install -Dm 644 "Resources/Skin/Icons/WindowIcon256.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/renoise3.png"
+    
     install -Dm 644 "Installer/renoise.desktop" "$pkgdir/usr/share/applications/renoise3.desktop"
     sed -i 's/=renoise/=renoise3/g' "$pkgdir/usr/share/applications/renoise3.desktop"
     install -Dm 644 "Installer/renoise.1.gz" "$pkgdir/usr/share/man/man1/renoise3.1.gz"