bumped to version 2.2.0

4 files changed, 20 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9df80e7ff331..8d4636c90310 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Jul  1 14:43:19 UTC 2017
+# Fri Dec 22 16:06:54 UTC 2017
 pkgbase = openhab2
 	pkgdesc = openHAB2 open source home automation software
-	pkgver = 2.1.0
+	pkgver = 2.2.0
 	pkgrel = 1
 	url = http://www.openhab.org/
 	install = openhab2.install
@@ -11,19 +11,19 @@ pkgbase = openhab2
 	depends = java-runtime-headless>=8
 	conflicts = openhab-runtime
 	conflicts = openhab-addons
-	noextract = openhab-2.1.0.tar.gz
+	noextract = openhab-2.2.0.tar.gz
 	backup = etc/openhab2/services/addons.cfg
 	backup = etc/openhab2/services/runtime.cfg
-	source = openhab-2.1.0.tar.gz::https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F2.1.0%2Fopenhab-2.1.0.tar.gz
+	source = openhab-2.2.0.tar.gz::https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F2.2.0%2Fopenhab-2.2.0.tar.gz
 	source = openhab2.service
 	source = openhab2.default
 	source = openhab2.install
 	source = openhab2.patch
-	sha256sums = 19a5f7dd5a130392b79bcd7348c0b1e54bf4d8a4d0cf4398b56a561f15e213f1
-	sha256sums = c1774dc42bbc1b166fc3823351c1d73edf1a40dae628aa33400f585cdd6487ad
+	sha256sums = 8e48357dd6f4b9c0e496dd8ff2b12f25441039e3a4ef71d56e07cf14aa5c4ff3
+	sha256sums = f01ea4cd08608fa0230e13dda23ec9f0b363a1ba417a78908866083a03ab9e0c
 	sha256sums = b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7
 	sha256sums = a5ef3d048ab20e73bbb2684fcb3a8b64f9fd1d437bde54b7e51b379d1dacd79e
-	sha256sums = 188ae4cc4e519fbbf5c370cf39bc2a7788d5ab2aab5d766e2adf1b84aeedd9e9
+	sha256sums = f91b9a38165a4ab3b50e43ac67a1ea77bb29c1747e7153be16f02be8167be0df
 
 pkgname = openhab2
 
diff --git a/PKGBUILD b/PKGBUILD
index db56932de9bd..27ea89c5c8a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Christoph Scholz <christoph.scholz@gmail.com>
 pkgname=openhab2
-pkgver=2.1.0
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="openHAB2 open source home automation software"
 arch=('any')
@@ -22,11 +22,11 @@ source=("openhab-${pkgver}.tar.gz::https://bintray.com/openhab/mvn/download_file
 
 noextract=("openhab-${pkgver}.tar.gz")
 
-sha256sums=('19a5f7dd5a130392b79bcd7348c0b1e54bf4d8a4d0cf4398b56a561f15e213f1'
-  	'c1774dc42bbc1b166fc3823351c1d73edf1a40dae628aa33400f585cdd6487ad'
+sha256sums=('8e48357dd6f4b9c0e496dd8ff2b12f25441039e3a4ef71d56e07cf14aa5c4ff3'
+  	'f01ea4cd08608fa0230e13dda23ec9f0b363a1ba417a78908866083a03ab9e0c'
 	'b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7'
 	'a5ef3d048ab20e73bbb2684fcb3a8b64f9fd1d437bde54b7e51b379d1dacd79e'
-	'188ae4cc4e519fbbf5c370cf39bc2a7788d5ab2aab5d766e2adf1b84aeedd9e9')
+	'f91b9a38165a4ab3b50e43ac67a1ea77bb29c1747e7153be16f02be8167be0df')
 
 prepare() {
 	mkdir ${srcdir}/openhab2
diff --git a/openhab2.patch b/openhab2.patch
index 806ecbe390e2..160d3f6cf184 100644
--- a/openhab2.patch
+++ b/openhab2.patch
@@ -1,6 +1,6 @@
 diff -ura openhab2.orig/runtime/bin/oh2_dir_layout openhab2.new/runtime/bin/oh2_dir_layout
---- openhab2.orig/runtime/bin/oh2_dir_layout	2017-06-27 23:14:06.000000000 +0200
-+++ openhab2.new/runtime/bin/oh2_dir_layout	2017-07-01 14:54:58.966716130 +0200
+--- openhab2.orig/runtime/bin/oh2_dir_layout	2017-12-18 11:24:01.000000000 +0100
++++ openhab2.new/runtime/bin/oh2_dir_layout	2017-12-22 16:10:03.211873815 +0100
 @@ -6,7 +6,7 @@
  export OPENHAB_HOME=`cd "$DIRNAME/../.."; pwd`
  
@@ -23,4 +23,4 @@ diff -ura openhab2.orig/runtime/bin/oh2_dir_layout openhab2.new/runtime/bin/oh2_
 +    export OPENHAB_LOGDIR="/var/log/openhab2"
  fi
  
- # Make sure the tmp folder exists as Karaf requires it
+ if [ -z ${OPENHAB_BACKUP} ]; then
diff --git a/openhab2.service b/openhab2.service
index 8cd50ecf5a66..e0e0102a070f 100644
--- a/openhab2.service
+++ b/openhab2.service
@@ -1,20 +1,17 @@
 [Unit]
-Description=openHAB 2 - empowering the smart home
+Description=The openHAB 2 Home Automation Bus Solution
 Documentation=http://docs.openhab.org
-Documentation=https://community.openhab.org
-After=syslog.target network.target
+Wants=network-online.target
+After=network-online.target
 
 [Service]
-EnvironmentFile=/etc/default/openhab2
+Type=simple
 User=openhab
 Group=openhab
 WorkingDirectory=/usr/share/openhab2
-#PermissionsStartOnly=true
-#ExecStartPre=/usr/share/openhab/bin/setpermissions.sh
+EnvironmentFile=/etc/default/openhab2
 ExecStart=/usr/share/openhab2/start.sh server
-ExecStop=/usr/share/openhab2/runtime/bin/stop
-# Shutdown delay in seconds, before process is tried to be killed with KILL (if configured)
-TimeoutStopSec=120
+ExecStop=/bin/kill -SIGINT $MAINPID
 Restart=on-failure
 
 [Install]