[debian-edu-commits] debian-edu/ 02/13: tomcat7 has the APIs we need, not tomcat8

[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 60462584d5c84956c2e732ceda77459abb196d1a
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Fri Oct 28 23:39:37 2016 +0200

    tomcat7 has the APIs we need, not tomcat8
---
 debian/control                      |  2 +-
 debian/maven.rules                  |  4 ++--
 debian/patches/fix-java-build.patch | 10 ++++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 341819c..f0945b8 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends:
  libminify-maven-plugin-java,
  libservlet3.1-java,
  libslf4j-java,
- libtomcat8-java,
+ libtomcat7-java,
  maven-debian-helper,
  po-debconf,
 Standards-Version: 3.9.8
diff --git a/debian/maven.rules b/debian/maven.rules
index a905543..c755a11 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -8,6 +8,6 @@ org.glyptodon.guacamole guacamole-common-js zip *
 junit junit jar s/4\..*/4.x/ * *
 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/
+org.apache.tomcat tomcat-catalina jar s/.*/debian/
+org.apache.tomcat tomcat-coyote jar s/.*/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
index 1a76089..a7c2557 100644
--- a/debian/patches/fix-java-build.patch
+++ b/debian/patches/fix-java-build.patch
@@ -1,8 +1,8 @@
-# DP: add jaxrs to build
+# DP: add various dependencies to build
 
 --- a/guacamole/pom.xml
 +++ b/guacamole/pom.xml
-@@ -334,6 +334,11 @@
+@@ -334,6 +334,17 @@
              <version>1.17.1</version>
          </dependency>
  
@@ -11,6 +11,12 @@
 +	    <artifactId>javax.ws.rs-api</artifactId>
 +	    <version>debian</version>
 +	</dependency>
++	<dependency>
++	    <groupId>org.apache.tomcat</groupId>
++	    <artifactId>tomcat-catalina</artifactId>
++	    <version>debian</version>
++	</dependency>
++
      </dependencies>
  
  </project>

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