[Pkg-remote-team] [guacamole-client] 01/08: Do not link whole firectory.

Dominik George natureshadow-guest at moszumanska.debian.org
Sun Nov 27 13:16:55 UTC 2016


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 a04ad306726385ef1af71a746cc583e75479c781
Author: Dominik George <nik at naturalnet.de>
Date:   Sun Nov 27 13:23:18 2016 +0100

    Do not link whole firectory.
---
 debian/control         |  1 +
 debian/guacamole.links | 26 ++++++++++++++++++++++++++
 debian/rules           |  3 +--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 2c2ce6a..caabeda 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,7 @@ Depends:
  libjs-jquery,
  libjs-lodash,
  tomcat8,
+ ${maven:Depends},
  ${misc:Depends},
 Recommends:
  guacamole-auth-noauth,
diff --git a/debian/guacamole.links b/debian/guacamole.links
index 9aa151f..164add9 100644
--- a/debian/guacamole.links
+++ b/debian/guacamole.links
@@ -3,5 +3,31 @@
 /usr/share/javascript/jquery /usr/share/guacamole/guacamole/lib/jquery
 /usr/share/javascript/lodash.min.js /usr/share/guacamole/guacamole/lib/lodash.min.js
 
+# Java libraries
+/usr/share/java/aopalliance.jar /usr/share/guacamole/guacamole/WEB-INF/lib/aopalliance.jar
+/usr/share/java/commons-codec.jar /usr/share/guacamole/guacamole/WEB-INF/lib/commons-codec.jar
+/usr/share/java/guava.jar /usr/share/guacamole/guacamole/WEB-INF/lib/guava.jar
+/usr/share/java/guice.jar /usr/share/guacamole/guacamole/WEB-INF/lib/guice.jar
+/usr/share/java/guice-servlet.jar /usr/share/guacamole/guacamole/WEB-INF/lib/guice-servlet.jar
+/usr/share/java/istack-commons-runtime.jar /usr/share/guacamole/guacamole/WEB-INF/lib/istack-commons-runtime.jar
+/usr/share/java/jackson-core-asl.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jackson-core-asl.jar
+/usr/share/java/jackson-jaxrs.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jackson-jaxrs.jar
+/usr/share/java/jackson-mapper-asl.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jackson-mapper-asl.jar
+/usr/share/java/jackson-xc.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jackson-xc.jar
+/usr/share/java/javax.inject.jar /usr/share/guacamole/guacamole/WEB-INF/lib/javax.inject.jar
+/usr/share/java/javax.ws.rs-api.jar /usr/share/guacamole/guacamole/WEB-INF/lib/javax.ws.rs-api.jar
+/usr/share/java/jaxb-impl.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jaxb-impl.jar
+/usr/share/java/jersey-guice.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jersey-guice.jar
+/usr/share/java/jersey-json.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jersey-json.jar
+/usr/share/java/jersey-server.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jersey-server.jar
+/usr/share/java/jersey-servlet.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jersey-servlet.jar
+/usr/share/java/jettison.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jettison.jar
+/usr/share/java/logback-classic.jar /usr/share/guacamole/guacamole/WEB-INF/lib/logback-classic.jar
+/usr/share/java/logback-core.jar /usr/share/guacamole/guacamole/WEB-INF/lib/logback-core.jar
+/usr/share/java/slf4j-api.jar /usr/share/guacamole/guacamole/WEB-INF/lib/slf4j-api.jar
+/usr/share/java/stax-api.jar /usr/share/guacamole/guacamole/WEB-INF/lib/stax-api.jar
+/usr/share/java/txw2.jar /usr/share/guacamole/guacamole/WEB-INF/lib/txw2.jar
+
+# Config
 /etc/guacamole/guacamole.properties /usr/share/tomcat8/lib/guacamole.properties
 /etc/guacamole/tomcat.xml /etc/tomcat8/Catalina/localhost/guacamole.xml
diff --git a/debian/rules b/debian/rules
index 0f83066..4c5c9f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,4 @@ override_dh_auto_build:
 override_dh_install:
 	dh_install
 	mv debian/guacamole/usr/share/guacamole/guacamole/WEB-INF/lib/guacamole*.jar debian/guacamole/usr/share/java/
-	rm -rf debian/guacamole/usr/share/guacamole/guacamole/WEB-INF/lib/
-	ln -s /usr/share/java debian/guacamole/usr/share/guacamole/guacamole/WEB-INF/lib
+	rm -f debian/guacamole/usr/share/guacamole/guacamole/WEB-INF/lib/*

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



More information about the Pkg-remote-team mailing list