[Pkg-remote-team] [guacamole-client] 01/02: Directly install webapp directory.

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository guacamole-client.

commit d4ba31b608507456fea0e9c69a28c5806cda5ce8
Author: Dominik George <nik at naturalnet.de>
Date:   Sat Nov 26 19:31:31 2016 +0100

    Directly install webapp directory.
---
 debian/etc/tomcat.xml    | 4 ++--
 debian/guacamole.dirs    | 2 +-
 debian/guacamole.install | 2 +-
 debian/rules             | 9 ---------
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/debian/etc/tomcat.xml b/debian/etc/tomcat.xml
index ff1c5dc..16ee38c 100644
--- a/debian/etc/tomcat.xml
+++ b/debian/etc/tomcat.xml
@@ -1,3 +1,3 @@
-<Context path="/guacamole" docBase="/usr/share/guacamole">
- <Resources allowLinking="true"/>
+<Context path="/guacamole" docBase="/usr/share/guacamole/guacamole">
+ <Resources allowLinking="true" />
 </Context>
diff --git a/debian/guacamole.dirs b/debian/guacamole.dirs
index fd797ea..ecc804d 100644
--- a/debian/guacamole.dirs
+++ b/debian/guacamole.dirs
@@ -1,2 +1,2 @@
 /etc/guacamole
-/var/lib/guacamole
+/usr/share/guacamole
diff --git a/debian/guacamole.install b/debian/guacamole.install
index 5447b70..d526824 100644
--- a/debian/guacamole.install
+++ b/debian/guacamole.install
@@ -1,2 +1,2 @@
 debian/etc/* /etc/guacamole
-guacamole/target/*.war /var/lib/guacamole
+guacamole/target/guacamole /usr/share/guacamole
diff --git a/debian/rules b/debian/rules
index b39b160..ce76676 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,12 +7,3 @@ export JAVA_HOME = /usr/lib/jvm/default-java
 
 override_dh_auto_build:
 	dh_auto_build -- install
-
-override_dh_install:
-	dh_install
-
-	# Unpack WAR file to simple directory
-	cd debian/guacamole/; \
-	    mkdir -p usr/share/guacamole/; \
-	    unzip -d usr/share/guacamole/ var/lib/guacamole/guacamole.war; \
-	    rm -rf var/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/packages/guacamole-client.git