[debian-edu-commits] debian-edu/ 13/13: easiest way to appease lintian is to merge the patches

[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 c3bdfcefafbd5b29f89cafe7f800ef305ac3556d
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Sat Oct 29 01:41:59 2016 +0200

    easiest way to appease lintian is to merge the patches
    
    I: guacamole-client source: quilt-patch-missing-description 0001-guacamole-maven-debian-helper.patch
---
 debian/patches/0001-guacamole-maven-debian-helper.patch | 13 -------------
 debian/patches/fix-java-build.patch                     | 14 ++++++++++++--
 debian/patches/fix-js-build.patch                       |  2 +-
 debian/patches/series                                   |  1 -
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/debian/patches/0001-guacamole-maven-debian-helper.patch b/debian/patches/0001-guacamole-maven-debian-helper.patch
deleted file mode 100644
index 42ad15a..0000000
--- a/debian/patches/0001-guacamole-maven-debian-helper.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/guacamole/pom.xml
-+++ b/guacamole/pom.xml
-@@ -48,6 +48,10 @@
-     </properties>
- 
-     <build>
-+
-+        <!-- guacamole.war -->
-+        <finalName>guacamole</finalName>
-+
-         <plugins>
- 
-             <!-- Written for 1.6 -->
diff --git a/debian/patches/fix-java-build.patch b/debian/patches/fix-java-build.patch
index 8205324..53684c0 100644
--- a/debian/patches/fix-java-build.patch
+++ b/debian/patches/fix-java-build.patch
@@ -1,10 +1,20 @@
+# DP: first hunk is from original Debian package to fix .war file name
 # DP: packages never use -Werror, that's for upstream
 # DP: add various dependencies to build
 # DP: remove extensions we cannot possibly build, for now
 
 --- a/guacamole/pom.xml
 +++ b/guacamole/pom.xml
-@@ -64,7 +64,6 @@
+@@ -48,6 +48,8 @@
+     </properties>
+ 
+     <build>
++        <!-- guacamole.war -->
++        <finalName>guacamole</finalName>
+         <plugins>
+ 
+             <!-- Written for 1.6 -->
+@@ -60,7 +62,6 @@
                      <target>1.6</target>
                      <compilerArgs>
                          <arg>-Xlint:all</arg>
@@ -12,7 +22,7 @@
                      </compilerArgs>
                      <fork>true</fork>
                  </configuration>
-@@ -338,6 +337,24 @@
+@@ -334,6 +335,24 @@
              <version>1.17.1</version>
          </dependency>
  
diff --git a/debian/patches/fix-js-build.patch b/debian/patches/fix-js-build.patch
index 73e4224..a729674 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
-@@ -179,6 +179,7 @@
+@@ -175,6 +175,7 @@
                                  <jsSourceExclude>**/*.test.js</jsSourceExclude>
                              </jsSourceExcludes>
                              <jsEngine>CLOSURE</jsEngine>
diff --git a/debian/patches/series b/debian/patches/series
index 4ae1157..765dea0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-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