[Git][debian-gis-team/mapserver][master] 3 commits: Bump Standards-Version to 4.1.3, no changes.

[Sebastiaan Couwenberg]

Sebastiaan Couwenberg pushed to branch master at Debian GIS Project / mapserver


Commits:
07904d22 by Bas Couwenberg at 2018-02-09T12:51:56+01:00
Bump Standards-Version to 4.1.3, no changes.

- - - - -
f2fc594a by Bas Couwenberg at 2018-02-09T13:12:58+01:00
Strip trailing whitespace from changelog file.

- - - - -
7ef8c8ce by Bas Couwenberg at 2018-02-09T13:39:08+01:00
Add patch to exclude .java files from mapscript.jar.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/jar-contains-source.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 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
 
@@ -503,7 +505,7 @@ mapserver (6.0.1-2) unstable; urgency=low
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 23 Dec 2011 14:02:06 +0100
 
 mapserver (6.0.1-1) unstable; urgency=low
-	
+
   [ Alan Boudreault ]
   * New upstream release.
 
@@ -552,7 +554,7 @@ mapserver (5.6.5-2) unstable; urgency=high
 
   * Fix Validation of symbol index values (CVE-2010-1678)
     [http://trac.osgeo.org/mapserver/ticket/3641]
-	
+
  -- Alan Boudreault <aboudreault at mapgears.com>  Thu, 06 Jan 2011 11:18:29 -0500
 
 mapserver (5.6.5-1.1) unstable; urgency=low
@@ -618,7 +620,7 @@ mapserver (5.6.1-1) unstable; urgency=low
   * New upstream release, with a few important bug fixes.
   * Modified ruby mapscript package to use ruby 1.9.1 instead of 1.9.0.
     (closes: #565831)
-	
+
   [ Francesco Paolo Lovergine ]
   * Removed Fabio Tranchitella from Uploaders.
 


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Build-Depends: debhelper (>= 9),
                docbook-xml,
                xsltproc
 Build-Conflicts: libcurl3-openssl-dev
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mapserver.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapserver.git
 Homepage: http://www.mapserver.org


=====================================
debian/patches/jar-contains-source.patch
=====================================
--- /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"
+                       )
+ 


=====================================
debian/patches/series
=====================================
--- 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



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/compare/94c84df7b900cc60e6d7d93f71a43b1da71593cf...7ef8c8ce1a1f11499d92d09e5ffb57636b2a72ad

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/compare/94c84df7b900cc60e6d7d93f71a43b1da71593cf...7ef8c8ce1a1f11499d92d09e5ffb57636b2a72ad
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180209/c0088235/attachment-0001.html>