[mapserver] 03/03: Add patch to exclude .java files from mapscript.jar.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapserver.

commit 7ef8c8ce1a1f11499d92d09e5ffb57636b2a72ad
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 9 13:19:38 2018 +0100

    Add patch to exclude .java files from mapscript.jar.
---
 debian/changelog                         |  1 +
 debian/patches/jar-contains-source.patch | 15 +++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d0b12aa..fc45a22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mapserver (7.0.7-2) UNRELEASED; urgency=medium
 
   * Update copyright-format URL to use HTTPS.
   * Bump Standards-Version to 4.1.3, no changes.
+  * Add patch to exclude .java files from mapscript.jar.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 20 Jan 2018 22:17:20 +0100
 
diff --git a/debian/patches/jar-contains-source.patch b/debian/patches/jar-contains-source.patch
new file mode 100644
index 0000000..a09988b
--- /dev/null
+++ b/debian/patches/jar-contains-source.patch
@@ -0,0 +1,15 @@
+Description: Exclude .java files from jar.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/mapserver/mapserver/pull/5545
+
+--- a/mapscript/java/CMakeLists.txt
++++ b/mapscript/java/CMakeLists.txt
+@@ -38,7 +38,7 @@ ADD_CUSTOM_COMMAND(TARGET javamapscript
+                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                       POST_BUILD
+                       COMMAND ${Java_JAVAC_EXECUTABLE} edu/umn/gis/mapscript/*.java
+-                      COMMAND ${Java_JAR_EXECUTABLE} cf mapscript.jar edu
++                      COMMAND ${Java_JAR_EXECUTABLE} cf mapscript.jar edu/umn/gis/mapscript/*.class
+                       COMMENT "Compiling java source files, creating mapscript.jar"
+                       )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 78cc1a1..4dbfd94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ hardening.patch
 perl-mapscript-install.patch
 ruby-mapscript-install.patch
 java-hardening.patch
+jar-contains-source.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git