[Git][debian-gis-team/mapserver][master] 2 commits: Re-instate MapScript Java bindings.

[Bas Couwenberg (@sebastic)]

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


Commits:
717c9d2f by Bas Couwenberg at 2023-06-21T05:35:07+02:00
Re-instate MapScript Java bindings.

Revert "Drop MapScript Java bindings, ca-certificates-java fails to install."

This reverts commit c6b09618fb5f4cf5aee519d33cf07aa8863097d8.

- - - - -
1a935e0b by Bas Couwenberg at 2023-07-22T12:01:53+02:00
Export DEB_PYTHON_INSTALL_LAYOUT=deb_system instead of patching `setup.py install` to use --install-layout=deb.

- - - - -


7 changed files:

- debian/changelog
- debian/control
- + debian/libmapscript-java.install
- + debian/libmapscript-java.lintian-overrides
- debian/patches/series
- − debian/patches/setuptools.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+mapserver (8.0.1-3) UNRELEASED; urgency=medium
+
+  * Re-instate MapScript Java bindings.
+  * Export DEB_PYTHON_INSTALL_LAYOUT=deb_system instead of patching
+    `setup.py install` to use --install-layout=deb.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 21 Jun 2023 05:34:24 +0200
+
 mapserver (8.0.1-2) unstable; urgency=medium
 
   * Don't run dh_python3 on example scripts.


=====================================
debian/control
=====================================
@@ -11,6 +11,8 @@ Build-Depends: debhelper-compat (= 13),
                dpkg-dev (>= 1.16.1.1),
                cmake (>= 3.0),
                chrpath,
+               default-jdk,
+               ant,
                libcairo2-dev,
                libcurl4-gnutls-dev | libcurl-ssl-dev,
                libfcgi-dev,
@@ -189,3 +191,16 @@ Description: Python library for MapServer
  .
  MapServer is a CGI-based framework for Internet map services which
  supports Open Geospatial Consortium (OGC) standards.
+
+Package: libmapscript-java
+Architecture: any
+Section: java
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Suggests: mapserver-bin,
+          mapserver-doc
+Description: Java library for MapServer
+ Java MapScript provides MapServer functions for Java applications.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.


=====================================
debian/libmapscript-java.install
=====================================
@@ -0,0 +1,2 @@
+usr/lib/jni/libjavamapscript.so
+usr/share/java/mapscript.jar


=====================================
debian/libmapscript-java.lintian-overrides
=====================================
@@ -0,0 +1,6 @@
+# Not a problem
+bad-jar-name *
+
+# Cannot easily be fixed
+file-references-package-build-path [usr/lib/jni/libjavamapscript.so]
+


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
 perl-mapscript-install.patch
 java-hardening.patch
-setuptools.patch
 spelling-errors.patch


=====================================
debian/patches/setuptools.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Fix installation with setuptools 65.3.0.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/mapscript/python/CMakeLists.txt
-+++ b/mapscript/python/CMakeLists.txt
-@@ -130,7 +130,7 @@ install(
-     endif()
- 
-     execute_process(
--      COMMAND ${Python_EXECUTABLE} setup.py install \${PYTHON_ROOT} \${PYTHON_PREFIX}
-+      COMMAND ${Python_EXECUTABLE} setup.py install --install-layout=deb \${PYTHON_ROOT} \${PYTHON_PREFIX}
-       WORKING_DIRECTORY ${OUTPUT_FOLDER}
-     )
-   "


=====================================
debian/rules
=====================================
@@ -11,6 +11,8 @@ export DH_OPTIONS
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+export DEB_PYTHON_INSTALL_LAYOUT=deb_system
+
 include /usr/share/dpkg/pkg-info.mk
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -78,7 +80,7 @@ override_dh_auto_configure:
 	                     -DWITH_PHPNG=1 \
 	                     -DWITH_PERL=1 \
 	                     -DWITH_RUBY=0 \
-	                     -DWITH_JAVA=0 \
+	                     -DWITH_JAVA=1 \
 	                     -DWITH_CSHARP=0
 
 override_dh_auto_build:



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/4283240e311a955abf34a2bcf35ef69b2e2eae71...1a935e0bd6b0c939dde8c245147483893dafc234

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/4283240e311a955abf34a2bcf35ef69b2e2eae71...1a935e0bd6b0c939dde8c245147483893dafc234
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20230722/e572fa47/attachment-0001.htm>