Merge ~vpa1977/ubuntu/+source/procyon:merge-lp-2064898 into ubuntu/+source/procyon:debian/sid

[Vladimir Petko]

Changes:
 - rebase on new debian release.

PPA: ppa:vpa1977/plusone[1]

Testing:
 - ppa build [2]
 - piuparts [3]
[1] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone/+sourcepub/16121979/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/procyon/+bug/2064898/comments/1

[Zixing Liu (liushuyu-011)]

LGTM

review: Approve

Unmerged commits

7b011a7... by Vladimir Petko on 2024-05-06

changelog

af50231... by Vladimir Petko on 2024-05-06

update-maintainer

99fef21... by Vladimir Petko on 2024-05-06

reconstruct-changelog

98ad7f8... by Vladimir Petko on 2024-05-06

merge-changelogs

1b7ad73... by Vladimir Petko on 2024-05-06

    - d/p/03-java21-disable-failing-tests.patch: disable tests failing
      with Java 21 (LP: 2054251). The decompiler still produces reasonable
      code, just not what the tests expect.

diff --git a/debian/changelog b/debian/changelog
index e1f0a2b..445e18f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,26 @@
+procyon (0.6.0-2ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2064898). Remaining changes:
+    - d/p/03-java21-disable-failing-tests.patch: disable tests failing
+      with Java 21 (LP 2054251). The decompiler still produces reasonable
+      code, just not what the tests expect.
+
+ -- Vladimir Petko <[e-mail]>  Mon, 06 May 2024 18:00:06 +1200
+
 procyon (0.6.0-2) unstable; urgency=medium
 
   * Prevent untrusted code execution from the command line (Closes: #1068463)
 
  -- Emmanuel Bourg <[e-mail]>  Sat, 06 Apr 2024 10:46:00 +0200
 
+procyon (0.6.0-1ubuntu1) noble; urgency=medium
+
+  * d/p/03-java21-disable-failing-tests.patch: disable tests failing
+    with Java 21 (LP: #2054251). The decompiler still produces reasonable
+    code, just not what the tests expect.
+
+ -- Vladimir Petko <[e-mail]>  Mon, 19 Feb 2024 11:55:04 +1300
+
 procyon (0.6.0-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 7592a06..cb175ef 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: procyon
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Emmanuel Bourg <[e-mail]>
 Build-Depends:
  debhelper-compat (= 13),
diff --git a/debian/patches/03-java21-disable-failing-tests.patch b/debian/patches/03-java21-disable-failing-tests.patch
 new file mode 100644
index 0000000..e3fc36f
--- /dev/null
+++ b/debian/patches/03-java21-disable-failing-tests.patch
@@ -0,0 +1,96 @@
+Description: disable tests failing with Java 21
+ - SwitchTests.testEnumSwitch - enum switch was decompiled as an ordinal switch.
+ - ThirdPartyTests.testUnboxToNumber - decompiled code contains Constable,
+   not Number.
+ - ThirdPartyTests.testLiteralAssignments - test specifies float numbers with
+   excess precision,  Java truncates those since 19.
+ - ThirdPartyTests.testOptimizedVariables, testSwitchKrakatau,
+   testWhileLoopsKrakatau - decompiled variable does not match ('b' vs 'x')
+Author: Vladimir Petko <[e-mail]>
+Bug: https://github.com/mstrobel/procyon/issues/71
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057532
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/procyon/+bug/2054251
+Last-Update: 2024-02-02
+--- a/Procyon.CompilerTools/src/test/java/com/strobel/decompiler/DecompilerTest.java
++++ b/Procyon.CompilerTools/src/test/java/com/strobel/decompiler/DecompilerTest.java
+@@ -157,4 +157,14 @@
+ 
+         return CompilerTarget.DEFAULT;
+     }
++    
++    protected static boolean specificationVersionLessThan21() {
++        try {
++            return Integer.parseInt(System.getProperty("java.specification.version")) < 21 ;
++        }
++        catch (NumberFormatException e) {
++        // will fail for 1.8  earlier
++        }
++        return true;
++    }
+ }
+--- a/Procyon.CompilerTools/src/test/java/com/strobel/decompiler/SwitchTests.java
++++ b/Procyon.CompilerTools/src/test/java/com/strobel/decompiler/SwitchTests.java
+@@ -13,6 +13,7 @@
+ 
+ package com.strobel.decompiler;
+ 
++import org.junit.Assume;
+ import org.junit.Test;
+ 
+ public class SwitchTests extends DecompilerTest {
+@@ -254,6 +255,8 @@
+ 
+     @Test
+     public void testEnumSwitch() {
++        Assume.assumeTrue("Java 21: enum switch was decompiled as an ordinal switch",
++            specificationVersionLessThan21());
+         verifyOutput(
+             SwitchTests$D.class,
+             createSettings(OPTION_EXCLUDE_NESTED | OPTION_FLATTEN_SWITCH_BLOCKS),
+--- a/Procyon.CompilerTools/src/test/java/com/strobel/decompiler/ThirdPartyTests.java
++++ b/Procyon.CompilerTools/src/test/java/com/strobel/decompiler/ThirdPartyTests.java
+@@ -20,6 +20,8 @@
+ 
+     @Test
+     public void testOptimizedVariables() throws Throwable {
++        Assume.assumeTrue("Java 21: decompiled variable does not match ('b' vs 'x')",
++            specificationVersionLessThan21());
+         assumePreJdk9();
+         verifyOutput(
+             Class.forName("SootOptimizationTest"),
+@@ -97,6 +99,8 @@
+ 
+     @Test
+     public void testSwitchKrakatau() throws Throwable {
++        Assume.assumeTrue("Java 21: decompiled variable does not match ('b' vs 'x')",
++            specificationVersionLessThan21());
+         assumePreJdk9();
+         verifyOutput(
+             Class.forName("Switch"),
+@@ -147,6 +151,8 @@
+ 
+     @Test
+     public void testWhileLoopsKrakatau() throws Throwable {
++        Assume.assumeTrue("Java 21: decompiled variable does not match ('b' vs 'x')",
++            specificationVersionLessThan21());
+         assumePreJdk9();
+         verifyOutput(
+             Class.forName("WhileLoops"),
+@@ -283,6 +289,8 @@
+ 
+     @Test
+     public void testUnboxToNumber() throws Throwable {
++        Assume.assumeTrue("Java 21: decompiled code contains Constable, not Number",
++            specificationVersionLessThan21());
+         assumePreJdk9();
+         verifyOutput(
+             Class.forName("UnboxToNumber"),
+@@ -307,6 +315,8 @@
+ 
+     @Test
+     public void testLiteralAssignments() {
++        Assume.assumeTrue("Java 21 truncates floats specified with excess precision",
++            specificationVersionLessThan21());
+         verifyOutput(
+             "LiteralAssignments",
+             defaultSettings(),
diff --git a/debian/patches/series b/debian/patches/series
index 481a8ee..fee79c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 02-cli-program-name.patch
+03-java21-disable-failing-tests.patch