[debian-edu-commits] debian-edu/ 05/13: the Java™ craziness continues…

[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 ddd15b3db91e4252126b17351095194ed638c88c
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Sat Oct 29 00:15:23 2016 +0200

    the Java™ craziness continues…
---
 debian/patches/fix-java-build.patch | 10 +++++++++-
 debian/patches/fix-java-code.patch  | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/patches/fix-java-build.patch b/debian/patches/fix-java-build.patch
index 80be130..0cf1bf5 100644
--- a/debian/patches/fix-java-build.patch
+++ b/debian/patches/fix-java-build.patch
@@ -2,7 +2,15 @@
 
 --- a/guacamole/pom.xml
 +++ b/guacamole/pom.xml
-@@ -334,6 +334,24 @@
+@@ -60,7 +60,6 @@
+                     <target>1.6</target>
+                     <compilerArgs>
+                         <arg>-Xlint:all</arg>
+-                        <arg>-Werror</arg>
+                     </compilerArgs>
+                     <fork>true</fork>
+                 </configuration>
+@@ -334,6 +333,24 @@
              <version>1.17.1</version>
          </dependency>
  
diff --git a/debian/patches/fix-java-code.patch b/debian/patches/fix-java-code.patch
index 22cc836..829bea1 100644
--- a/debian/patches/fix-java-code.patch
+++ b/debian/patches/fix-java-code.patch
@@ -11,7 +11,15 @@
  import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
  import org.glyptodon.guacamole.net.basic.TunnelRequestService;
  
-@@ -69,4 +71,14 @@ public class BasicGuacamoleWebSocketCrea
+@@ -51,7 +53,6 @@ public class BasicGuacamoleWebSocketCrea
+         this.tunnelRequestService = tunnelRequestService;
+     }
+ 
+-    @Override
+     public Object createWebSocket(UpgradeRequest request, UpgradeResponse response) {
+ 
+         // Validate and use "guacamole" subprotocol
+@@ -69,4 +70,14 @@ public class BasicGuacamoleWebSocketCrea
  
      }
  

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