[Git][java-team/javamorph][master] 7 commits: Support compilation with JDK 21

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / javamorph


Commits:
5b65f963 by vinay-keshava at 2023-11-10T23:46:27+05:30
Support compilation with JDK 21

- - - - -
f1681062 by vinay-keshava at 2023-11-10T23:50:15+05:30
Update d/changelog

- - - - -
28cd92b9 by Vinay Keshava at 2023-11-24T10:07:59+05:30
update d/rules

- - - - -
05f35e68 by Vinay Keshava at 2023-11-24T13:19:27+05:30
Bump Standards-Version to 4.6.2 (no changes needed)

- - - - -
51e3a48c by Vinay Keshava at 2023-11-24T13:24:51+05:30
update d/changelog

- - - - -
9cf81813 by Tony Mancill at 2023-12-20T04:19:16+00:00
Remove build-dep on default-jre, since default-jdk already depends on it
- - - - -
4f2bf133 by Tony Mancill at 2023-12-20T04:23:58+00:00
Merge branch 'master' into 'master'

Add Compilation support with JDK 21

See merge request java-team/javamorph!2
- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+javamorph (0.0.20100201-4) UNRELEASED; urgency=medium
+
+  * update d/rules
+  * Bump Standards-Version to 4.6.2 (no changes needed)
+  * Support compilation with JDK 21
+
+ -- Vinay Keshava <vinaykeshava at disroot.org>  Fri, 24 Nov 2023 13:21:15 +0530
+
 javamorph (0.0.20100201-3) unstable; urgency=medium
 
   * Rework wrapper script for JVM detection and xdg-open


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Claus Wimmer <claus.erhard.wimmer at googlemail.com>, tony mancill <tmancill at debian.org>
 Build-Depends: debhelper-compat (= 13), default-jdk
-Standards-Version: 4.5.1
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/javamorph.git
 Vcs-Browser: https://salsa.debian.org/java-team/javamorph
 Homepage: http://code.google.com/p/javamorph/


=====================================
debian/rules
=====================================
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
+include /usr/share/java/java_defaults.mk
 
 %:
 	dh $@
 
 override_dh_auto_build:
-	javac -source 7 -target 7 -d . javamorph/*.java
+	javac -source $(java_compat_level) -target $(java_compat_level) -d . javamorph/*.java
 	jar -cmf META-INF/MANIFEST.MF javamorph.jar input javamorph/*.class mesh polygon JavaMorph.png



View it on GitLab: https://salsa.debian.org/java-team/javamorph/-/compare/d3c21bdfc6ee1b2350fdaacd05cdbf5fba4082c2...4f2bf13349091eaa7cb5261253482882fbb5589a

-- 
View it on GitLab: https://salsa.debian.org/java-team/javamorph/-/compare/d3c21bdfc6ee1b2350fdaacd05cdbf5fba4082c2...4f2bf13349091eaa7cb5261253482882fbb5589a
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-java-commits/attachments/20231220/6bc0e567/attachment.htm>