[debian-edu-commits] debian-edu/ 11/13: refresh the patch series

[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 95b69fc29631a9beba43d3ba94931cab5419b860
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Sat Oct 29 00:51:59 2016 +0200

    refresh the patch series
---
 .../patches/0001-guacamole-maven-debian-helper.patch  | 19 ++++---------------
 debian/patches/fix-java-build.patch                   |  4 ++--
 debian/patches/fix-js-build.patch                     |  2 +-
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/debian/patches/0001-guacamole-maven-debian-helper.patch b/debian/patches/0001-guacamole-maven-debian-helper.patch
index 336a8e6..42ad15a 100644
--- a/debian/patches/0001-guacamole-maven-debian-helper.patch
+++ b/debian/patches/0001-guacamole-maven-debian-helper.patch
@@ -1,24 +1,13 @@
 --- a/guacamole/pom.xml
 +++ b/guacamole/pom.xml
-@@ -48,8 +48,11 @@
+@@ -48,6 +48,10 @@
      </properties>
  
      <build>
--        <plugins>
- 
++
 +        <!-- guacamole.war -->
 +        <finalName>guacamole</finalName>
 +
-+        <plugins>
-             <!-- Written for 1.6 -->
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-@@ -64,6 +67,8 @@
-                     </compilerArgs>
-                     <fork>true</fork>
-                 </configuration>
-+                <groupId>org.apache.maven.plugins</groupId>
-+                <artifactId>maven-war-plugin</artifactId>
-             </plugin>
+         <plugins>
  
-             <plugin>
+             <!-- Written for 1.6 -->
diff --git a/debian/patches/fix-java-build.patch b/debian/patches/fix-java-build.patch
index 6335a5e..8205324 100644
--- a/debian/patches/fix-java-build.patch
+++ b/debian/patches/fix-java-build.patch
@@ -4,7 +4,7 @@
 
 --- a/guacamole/pom.xml
 +++ b/guacamole/pom.xml
-@@ -60,7 +60,6 @@
+@@ -64,7 +64,6 @@
                      <target>1.6</target>
                      <compilerArgs>
                          <arg>-Xlint:all</arg>
@@ -12,7 +12,7 @@
                      </compilerArgs>
                      <fork>true</fork>
                  </configuration>
-@@ -334,6 +333,24 @@
+@@ -338,6 +337,24 @@
              <version>1.17.1</version>
          </dependency>
  
diff --git a/debian/patches/fix-js-build.patch b/debian/patches/fix-js-build.patch
index a729674..73e4224 100644
--- a/debian/patches/fix-js-build.patch
+++ b/debian/patches/fix-js-build.patch
@@ -10,7 +10,7 @@
                              <jsTargetDir>/</jsTargetDir>
 --- a/guacamole/pom.xml
 +++ b/guacamole/pom.xml
-@@ -175,6 +175,7 @@
+@@ -179,6 +179,7 @@
                                  <jsSourceExclude>**/*.test.js</jsSourceExclude>
                              </jsSourceExcludes>
                              <jsEngine>CLOSURE</jsEngine>

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