[debian-edu-commits] debian-edu/ 10/13: Revert "Remove all patches."

Dominik George natureshadow-guest at moszumanska.debian.org
Mon Oct 31 21:51:55 UTC 2016


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 06ffa49071f5762b982ec6058a32cf6372188e30
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Sat Oct 29 00:50:06 2016 +0200

    Revert "Remove all patches."
    
    This reverts commit 653a89109c7ac3f7fa04333ac9f475f0331c38d2.
---
 .../0001-guacamole-maven-debian-helper.patch       | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/0001-guacamole-maven-debian-helper.patch b/debian/patches/0001-guacamole-maven-debian-helper.patch
new file mode 100644
index 0000000..336a8e6
--- /dev/null
+++ b/debian/patches/0001-guacamole-maven-debian-helper.patch
@@ -0,0 +1,24 @@
+--- a/guacamole/pom.xml
++++ b/guacamole/pom.xml
+@@ -48,8 +48,11 @@
+     </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>
+ 
+             <plugin>
diff --git a/debian/patches/series b/debian/patches/series
index 765dea0..4ae1157 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0001-guacamole-maven-debian-helper.patch
 fix-js-build.patch
 fix-java-build.patch
 fix-java-code.patch

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



More information about the debian-edu-commits mailing list