[Git][java-team/libusb-java][master] 4 commits: Use java_compat_level variable provided by java-common to adjust...

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / libusb-java


Commits:
e523b54e by Vladimir Petko at 2024-01-30T15:20:56+13:00
Use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java.

- - - - -
ee4d7cb0 by Vladimir Petko at 2024-01-30T15:22:32+13:00
changelog

- - - - -
5cc30aad by Tony Mancill at 2024-02-02T06:27:05+00:00
Merge branch 'master' into 'master'

# Conflicts:
#   debian/changelog
- - - - -
4f7a6fc9 by Tony Mancill at 2024-02-02T06:29:31+00:00
Merge branch 'master' into 'master'

Resolve Java 21 ftbfs

See merge request java-team/libusb-java!3
- - - - -


3 changed files:

- debian/changelog
- debian/patches/java-compat.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,16 @@
 libusb-java (0.8+ztex20090101-10) UNRELEASED; urgency=medium
 
+  [ Vladimir Petko ]
+  * d/rules, d/p/java-compat.patch: use java_compat_level variable provided
+    by java-common to adjust -source/-target level to the minimum required
+    by the default Java (Closes: #1057523).
+
+  [ Debian Janitor ]
   * Trim trailing whitespace.
   * Use versioned copyright format URI.
   * Update standards version to 4.6.1, no changes needed.
 
- -- Debian Janitor <janitor at jelmer.uk>  Thu, 22 Dec 2022 12:45:34 -0000
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Tue, 30 Jan 2024 15:21:25 +1300
 
 libusb-java (0.8+ztex20090101-9) unstable; urgency=medium
 


=====================================
debian/patches/java-compat.patch
=====================================
@@ -10,7 +10,7 @@ Forwarded: no
  STRIP=strip
  CHMOD=chmod -x
 -JAVAC=javac
-+JAVAC=javac -source 7 -target 7 -encoding ISO-8859-1
++JAVAC=javac -source $(JAVA_COMPAT_LEVEL) -target $(JAVA_COMPAT_LEVEL) -encoding ISO-8859-1
  RM=rm -f
  INSTALL=install
  INSTALLDIR=$(INSTALL) -d


=====================================
debian/rules
=====================================
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+include /usr/share/java/java_defaults.mk
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -19,10 +20,10 @@ override_dh_auto_build-arch:
 	touch build-arch-stamp
 
 override_dh_auto_build-indep:
-	$(MAKE) STRIP="# not stripping: " classes
+	$(MAKE) JAVA_COMPAT_LEVEL=$(java_compat_level) STRIP="# not stripping: " classes
 	jar cf libusb.jar `find ch -name "*.class"`
 	[ -d $(DOCPATH) ] || mkdir -p $(DOCPATH)
-	javadoc -Xdoclint:none -source 1.7 -encoding ISO-8859-1 -classpath . -d $(DOCPATH) ch.ntb.usb
+	javadoc -Xdoclint:none -source $(java_compat_level) -encoding ISO-8859-1 -classpath . -d $(DOCPATH) ch.ntb.usb
 	touch build-indep-stamp
 
 LIBPACKAGE=libusb-java-lib



View it on GitLab: https://salsa.debian.org/java-team/libusb-java/-/compare/3e9804bc81cb8ba3da82337001b363ad162e5357...4f7a6fc96d965f856f75f9b96fb51ba5cb7187e4

-- 
View it on GitLab: https://salsa.debian.org/java-team/libusb-java/-/compare/3e9804bc81cb8ba3da82337001b363ad162e5357...4f7a6fc96d965f856f75f9b96fb51ba5cb7187e4
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/20240202/6794a7db/attachment.htm>