diff -Nru lwjgl-2.9.3+dfsg/debian/changelog lwjgl-2.9.3+dfsg/debian/changelog --- lwjgl-2.9.3+dfsg/debian/changelog 2018-12-28 21:35:13.000000000 +0000 +++ lwjgl-2.9.3+dfsg/debian/changelog 2022-05-23 11:37:39.000000000 +0000 @@ -1,3 +1,12 @@ +lwjgl (2.9.3+dfsg-6) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with Java 17 (Closes: #1011167) + * Standards-Version updated to 4.6.1 + * Switch to debhelper level 13 + + -- Emmanuel Bourg Mon, 23 May 2022 13:37:39 +0200 + lwjgl (2.9.3+dfsg-5) unstable; urgency=medium * Team upload. diff -Nru lwjgl-2.9.3+dfsg/debian/compat lwjgl-2.9.3+dfsg/debian/compat --- lwjgl-2.9.3+dfsg/debian/compat 2018-12-28 21:35:13.000000000 +0000 +++ lwjgl-2.9.3+dfsg/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru lwjgl-2.9.3+dfsg/debian/control lwjgl-2.9.3+dfsg/debian/control --- lwjgl-2.9.3+dfsg/debian/control 2018-12-28 21:35:13.000000000 +0000 +++ lwjgl-2.9.3+dfsg/debian/control 2022-05-23 11:35:48.000000000 +0000 @@ -8,7 +8,7 @@ Build-Depends: ant, ant-optional, - debhelper (>= 11), + debhelper-compat (= 13), default-jdk, default-jdk-doc, javahelper, @@ -17,7 +17,7 @@ libxrandr-dev, libxt-dev, libxxf86vm-dev -Standards-Version: 4.3.0 +Standards-Version: 4.6.1 Vcs-Git: https://salsa.debian.org/java-team/lwjgl.git Vcs-Browser: https://salsa.debian.org/java-team/lwjgl Homepage: https://www.lwjgl.org diff -Nru lwjgl-2.9.3+dfsg/debian/patches/java17-compatibility.patch lwjgl-2.9.3+dfsg/debian/patches/java17-compatibility.patch --- lwjgl-2.9.3+dfsg/debian/patches/java17-compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ lwjgl-2.9.3+dfsg/debian/patches/java17-compatibility.patch 2022-05-23 11:35:13.000000000 +0000 @@ -0,0 +1,90 @@ +Description: Drops pack200 compression support to build with OpenJDK 17 +Author: Emmanuel Bourg +Forwarded: not-needed +--- a/src/java/org/lwjgl/util/applet/AppletLoader.java ++++ b/src/java/org/lwjgl/util/applet/AppletLoader.java +@@ -85,7 +85,6 @@ + import java.util.jar.JarEntry; + import java.util.jar.JarFile; + import java.util.jar.JarOutputStream; +-import java.util.jar.Pack200; + import java.util.zip.CRC32; + import java.util.zip.CheckedInputStream; + import java.util.zip.GZIPInputStream; +@@ -374,14 +373,6 @@ + } catch (Throwable e) { + /* no lzma support */ + } +- +- // check pack200 support +- try { +- java.util.jar.Pack200.class.getSimpleName(); +- pack200Supported = true; +- } catch (Throwable e) { +- /* no pack200 support */ +- } + } + + /** +@@ -1674,29 +1665,6 @@ + } + + /** +- * Extract Pack File +- * @param in Input path to pack file +- * @param out output path to resulting file +- * @throws Exception if any errors occur +- */ +- protected void extractPack(String in, String out) throws Exception { +- File f = new File(in); +- FileOutputStream fostream = new FileOutputStream(out); +- JarOutputStream jostream = new JarOutputStream(fostream); +- +- try { +- Pack200.Unpacker unpacker = Pack200.newUnpacker(); +- unpacker.unpack(f, jostream); +- } finally { +- jostream.close(); +- fostream.close(); +- } +- +- // delete pack file as its no longer needed +- f.delete(); +- } +- +- /** + * Extract all jars from any lzma/gz/pack files + * + * @param path output path +@@ -1715,30 +1683,7 @@ + percentage = 55 + (int) (increment * (i+1)); + String filename = getFileName(urlList[i]); + +- if (filename.endsWith(".pack.lzma")) { +- subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".lzma", ""); +- debug_sleep(1000); +- extractLZMA(path + filename, path + replaceLast(filename, ".lzma", "")); +- +- subtaskMessage = "Extracting: " + replaceLast(filename, ".lzma", "") + " to " + replaceLast(filename, ".pack.lzma", ""); +- debug_sleep(1000); +- extractPack(path + replaceLast(filename, ".lzma", ""), path + replaceLast(filename, ".pack.lzma", "")); +- } +- else if (filename.endsWith(".pack.gz")) { +- subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".gz", ""); +- debug_sleep(1000); +- extractGZip(path + filename, path + replaceLast(filename, ".gz", "")); +- +- subtaskMessage = "Extracting: " + replaceLast(filename, ".gz", "") + " to " + replaceLast(filename, ".pack.gz", ""); +- debug_sleep(1000); +- extractPack(path + replaceLast(filename, ".gz", ""), path + replaceLast(filename, ".pack.gz", "")); +- } +- else if (filename.endsWith(".pack")) { +- subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".pack", ""); +- debug_sleep(1000); +- extractPack(path + filename, path + replaceLast(filename, ".pack", "")); +- } +- else if (filename.endsWith(".lzma")) { ++ if (filename.endsWith(".lzma")) { + subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".lzma", ""); + debug_sleep(1000); + extractLZMA(path + filename, path + replaceLast(filename, ".lzma", "")); diff -Nru lwjgl-2.9.3+dfsg/debian/patches/series lwjgl-2.9.3+dfsg/debian/patches/series --- lwjgl-2.9.3+dfsg/debian/patches/series 2018-12-28 21:35:13.000000000 +0000 +++ lwjgl-2.9.3+dfsg/debian/patches/series 2022-05-23 11:21:53.000000000 +0000 @@ -10,3 +10,4 @@ annotation-processor-workaround.patch javah.patch add-missing-symbols-in-native-lib-v2.patch +java17-compatibility.patch