[debian-edu-commits] debian-edu/ 03/13: tomcat-coyote too, but both in scope:provided

[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 69247636c2c5515144f6a0dbad88ae5729749da6
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Fri Oct 28 23:55:43 2016 +0200

    tomcat-coyote too, but both in scope:provided
    
    intimated by upstream in:
    https://glyptodon.org/jira/si/jira.issueviews:issue-html/GUAC-1343/GUAC-1343.html
---
 debian/patches/fix-java-build.patch | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/patches/fix-java-build.patch b/debian/patches/fix-java-build.patch
index a7c2557..80be130 100644
--- a/debian/patches/fix-java-build.patch
+++ b/debian/patches/fix-java-build.patch
@@ -2,7 +2,7 @@
 
 --- a/guacamole/pom.xml
 +++ b/guacamole/pom.xml
-@@ -334,6 +334,17 @@
+@@ -334,6 +334,24 @@
              <version>1.17.1</version>
          </dependency>
  
@@ -15,6 +15,13 @@
 +	    <groupId>org.apache.tomcat</groupId>
 +	    <artifactId>tomcat-catalina</artifactId>
 +	    <version>debian</version>
++            <scope>provided</scope>
++	</dependency>
++	<dependency>
++	    <groupId>org.apache.tomcat</groupId>
++	    <artifactId>tomcat-coyote</artifactId>
++	    <version>debian</version>
++            <scope>provided</scope>
 +	</dependency>
 +
      </dependencies>

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