Adjust deployment based on new application layout

Change-Id: I5ffe53b7e419b71eaf557313e74bf7ecf277190a

2 files changed, 17 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a17a0961b661..94996159bf90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 # Generated by mksrcinfo v8
-# Mon Jun  5 08:08:42 UTC 2017
+# Tue Jun 13 03:33:57 UTC 2017
 pkgbase = artriculate
 	pkgdesc = QML box2d application for displaying artwork
-	pkgver = 0.3.8
+	pkgver = 0.4
 	pkgrel = 1
 	url = https://github.com/sirspudd/artriculate
 	arch = any
 	license = GPL3
+	makedepends = qt-sdk-raspberry-pi
 	depends = qt-sdk-raspberry-pi-target-libs
 	options = !strip
-	source = git://github.com/sirspudd/artriculate#tag=0.3.8
+	source = git://github.com/sirspudd/artriculate#tag=0.4
 	sha256sums = SKIP
 
 pkgname = artriculate
diff --git a/PKGBUILD b/PKGBUILD
index 80442651882d..59ea0d314078 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,18 +8,19 @@ if [[ -z $_piver ]] && [[ -n $LOCAL_PI_VER ]]; then
 fi
 
 if [[ -n "$_piver" ]]; then
-  _qmake="/opt/qt-sdk-minimal-raspberry-pi${_piver}/bin/qmake"
+  _qmake="/opt/qt-sdk-raspberry-pi${_piver}/bin/qmake"
 fi
 
 # Uncomment for a debug build
 #_qmake_args="CONFIG+=debug"
 pkgname=artriculate
-pkgver=0.3.8
+pkgver=0.4
 pkgrel=1
 pkgdesc='QML box2d application for displaying artwork'
 arch=('any')
 url='https://github.com/sirspudd/artriculate'
 license=('GPL3')
+makedepends=("qt-sdk-raspberry-pi${_piver}")
 depends=('qt-sdk-raspberry-pi-target-libs')
 source=("git://github.com/sirspudd/artriculate#tag=${pkgver}")
 sha256sums=('SKIP')
@@ -32,11 +33,16 @@ build() {
 }
 
 package() {
-  local repo_src=${srcdir}/${pkgname}
-  local systemd_deploy_path=${pkgdir}/usr/lib/systemd/system
-  mkdir -p $systemd_deploy_path
-  cp ${repo_src}/resources/*.service ${systemd_deploy_path}
+  local _repo_src=${srcdir}/${pkgname}
+  local _systemd_deploy_path=${pkgdir}/usr/lib/systemd/system
+  local _qml_deploy_path=${pkgdir}/usr/share/${pkgname}
+  local _bin_path=${pkgdir}/usr/bin
 
-  cd ${repo_src}
+  mkdir -p $_systemd_deploy_path $_qml_deploy_path $_bin_path
+  cp ${_repo_src}/artriculate $_bin_path
+  cp ${_repo_src}/src/resources/*.service ${_systemd_deploy_path}
+  cp -r ${_repo_src}/qml ${_qml_deploy_path}
+
+  cd ${_repo_src}
   INSTALL_ROOT="$pkgdir" make install
 }