[debian-edu-commits] debian-edu/ 01/02: Unpack and remove WAR file; symlink JS libraries.

[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 5116faf25f9e74c6d88291de5e48c823154784b9
Author: Dominik George <nik at naturalnet.de>
Date:   Wed Nov 9 16:56:47 2016 +0100

    Unpack and remove WAR file; symlink JS libraries.
---
 debian/control         | 4 ++++
 debian/guacamole.links | 6 +++++-
 debian/rules           | 9 +++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index fb75607..725171d 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Build-Depends:
  libslf4j-java,
  maven-debian-helper,
  po-debconf,
+ unzip,
 Standards-Version: 3.9.8
 Section: net
 Homepage: http://guacamole.incubator.apache.org/
@@ -39,6 +40,9 @@ Architecture: all
 Depends:
  debconf,
  guacd,
+ libjs-angularjs,
+ libjs-jquery,
+ libjs-lodash,
  tomcat8,
  ${misc:Depends},
 Recommends:
diff --git a/debian/guacamole.links b/debian/guacamole.links
index 22a73b6..695f873 100644
--- a/debian/guacamole.links
+++ b/debian/guacamole.links
@@ -1,2 +1,6 @@
+# Stripped JavaScript libraries
+/usr/share/javascript/angular.js /usr/share/guacamole/lib/angular
+/usr/share/javascript/jquery /usr/share/guacamole/lib/jquery
+/usr/share/javascript/lodash /usr/share/guacamole/lib/lodash
+
 /etc/guacamole/guacamole.properties /usr/share/tomcat8/lib/guacamole.properties
-/var/lib/guacamole/guacamole.war /var/lib/tomcat8/webapps/guacamole.war
diff --git a/debian/rules b/debian/rules
index ce76676..250a339 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,12 @@ export JAVA_HOME = /usr/lib/jvm/default-java
 
 override_dh_auto_build:
 	dh_auto_build -- install
+
+override_dh_auto_install:
+	dh_auto_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/debian-edu/pkg-team/guacamole-client.git