[debian-edu-commits] debian-edu/ 01/13: jax-rs is packaged weirdly

[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 92d1c3e7a24cbe2ac8e0216556ce80a5350171bc
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Fri Oct 28 22:56:49 2016 +0200

    jax-rs is packaged weirdly
---
 debian/maven.rules                  |  2 +-
 debian/patches/fix-java-build.patch | 16 ++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/maven.rules b/debian/maven.rules
index 0ee60d8..a905543 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -10,4 +10,4 @@ javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/
 javax.websocket javax.websocket-api jar s/.*/1.0/
 org.apache.tomcat tomcat-catalina jar s/.*/8.x/
 org.apache.tomcat tomcat-coyote jar s/.*/8.x/
-javax.ws rs jar debian
+javax.ws.rs javax.ws.rs-api jar debian
diff --git a/debian/patches/fix-java-build.patch b/debian/patches/fix-java-build.patch
new file mode 100644
index 0000000..1a76089
--- /dev/null
+++ b/debian/patches/fix-java-build.patch
@@ -0,0 +1,16 @@
+# DP: add jaxrs to build
+
+--- a/guacamole/pom.xml
++++ b/guacamole/pom.xml
+@@ -334,6 +334,11 @@
+             <version>1.17.1</version>
+         </dependency>
+ 
++	<dependency>
++	    <groupId>javax.ws.rs</groupId>
++	    <artifactId>javax.ws.rs-api</artifactId>
++	    <version>debian</version>
++	</dependency>
+     </dependencies>
+ 
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
index c2377f4..cf8e32c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-js-build.patch
+fix-java-build.patch

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