[Git][debian-gis-team/osmpbf][master] 2 commits: Add patch to set Java version to 1.8 for ant build to match Maven build.

[Bas Couwenberg (@sebastic)]

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


Commits:
787763b6 by Bas Couwenberg at 2026-03-10T19:41:20+01:00
Add patch to set Java version to 1.8 for ant build to match Maven build.

- - - - -
369999f8 by Bas Couwenberg at 2026-03-10T19:42:05+01:00
Set distribution to unstable.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- − debian/libosmpbf-java.lintian-overrides
- + debian/patches/java-version.patch
- + debian/patches/series
- debian/tests/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+osmpbf (1.6.1-4) unstable; urgency=medium
+
+  * Add patch to set Java version to 1.8 for ant build to match Maven build.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 10 Mar 2026 19:41:24 +0100
+
 osmpbf (1.6.1-3) unstable; urgency=medium
 
   * Require default-jdk-headless (>= 2:1.25) for autopkgtest.


=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 13),
                dh-sequence-pkgkde-symbolshelper,
                ant,
                cmake,
-               default-jdk-headless | java6-sdk-headless,
+               default-jdk-headless | java8-sdk-headless,
                libprotobuf-dev (>= 3.21.9),
                libprotobuf-java (>= 3.21.9),
                protobuf-compiler (>= 3.21.9),


=====================================
debian/libosmpbf-java.lintian-overrides deleted
=====================================
@@ -1,3 +0,0 @@
-# Lintian doesn't know about OpenJDK 25 yet
-unknown-java-class-version *
-


=====================================
debian/patches/java-version.patch
=====================================
@@ -0,0 +1,15 @@
+Description: Set Java version to 1.8 to match Maven build.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/openstreetmap/OSM-binary/pull/93
+
+--- a/build.xml
++++ b/build.xml
+@@ -21,7 +21,7 @@
+ 		<exec executable="/bin/sh">
+ 			<arg value="./build.sh"/>
+ 		</exec>
+-		<javac includeantruntime="false" destdir="${build.dir}">
++		<javac includeantruntime="false" destdir="${build.dir}" source="1.8" target="1.8">
+ 			<src path="${src.dir}"/>
+ 			<src path="${src.generated.dir}"/>
+ 			<classpath>


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+java-version.patch


=====================================
debian/tests/control
=====================================
@@ -1,6 +1,6 @@
 Tests: java
 Depends: ca-certificates,
-         default-jdk-headless (>= 2:1.25),
+         default-jdk-headless,
          libosmpbf-java,
          wget
 Restrictions: needs-internet



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmpbf/-/compare/b1784fdf637563637f857f175a0ac4a6c69f78ae...369999f8feb9b62a875b7796aac6a7aa1be71e8a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmpbf/-/compare/b1784fdf637563637f857f175a0ac4a6c69f78ae...369999f8feb9b62a875b7796aac6a7aa1be71e8a
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/20260310/7406619e/attachment-0001.htm>