Merge ~pushkarnk/ubuntu/+source/pgpainless:fix-2044109 into ubuntu/+source/pgpainless:ubuntu/devel

[Pushkar Kulkarni]

[Pushkar Kulkarni (pushkarnk)]

Upstream has also removed the test on their dev branch.

https://github.com/pgpainless/pgpainless/commit/f4bfb9dc04ba511695403072650354aca4f66e5e

[Pushkar Kulkarni (pushkarnk)]

Tested a build in this PPA: https://launchpad.net/~pushkarnk/+archive/ubuntu/pgpainless-ppa/

[Pushkar Kulkarni (pushkarnk)]

Ran autopkgtests against the PPA:

autopkgtest \
  --apt-upgrade \
  --shell-fail \
   --output-dir pgpainless-output \
   --setup-commands="sudo add-apt-repository -y -u -s \
      ppa:pushkarnk/pgpainless-ppa" \
   --no-built-binaries \
   pgpainless \
   -- lxd ubuntu-daily:noble

Results:
------
...
autopkgtest [09:17:14]: @@@@@@@@@@@@@@@@@@@@ summary
upstream-core PASS
upstream-sop PASS
upstream-cli PASS
cli PASS
--------

[Vladimir Petko (vpa1977)]

Some minor comments:

- Closes: #XXXX tag applies to debian MPs. In Ubuntu the tag is LP: #xxxx
- The patch is not strictly necessary, we can append ' --exclude-classname=investigations.KleopatraCompatibilityTest' to JUNIT_OPTIONS in debian/rules to exclude the class from testing. This also might make it easier to submit to debian and reduce maintenance effort for the next release.

You will need a reviewer with upload rights, so I am marking this review as 'Abstain'

review: Abstain

6f989fb... by Pushkar Kulkarni on 2023-11-22

Exclude tests in KleopatraCompatibilityTests.java

The tests use a PGP key that expired on Oct 26, 2023.
Upstream has purged these tests on their current dev branch.

7ee1c95... by Pushkar Kulkarni on 2023-11-22

Update changelog

f7c3398... by Pushkar Kulkarni on 2023-11-22

Update maintainer

[Pushkar Kulkarni (pushkarnk)]

Reworking the patch based on Vladimir's sugestion.

[Pushkar Kulkarni (pushkarnk)]

Built and tested the new changes in a different PPA [1]

autopkgtest [16:08:03]: test cli: - - - - - - - - - - results - - - - - - - - - -
autopkgtest [16:08:03]: @@@@@@@@@@@@@@@@@@@@ summary
upstream-core PASS
upstream-sop PASS
upstream-cli PASS
cli PASS

[1] https://launchpad.net/~pushkarnk/+archive/ubuntu/pgpainless-test

[Simon Quigley (tsimonq2)]

        |
       / \
      / _ \
     |.o '.|
     |'._.'|
     | |
   ,'| | |`.
  / | | | \
  |,-'--|--'-.|

review: Approve

diff --git a/debian/changelog b/debian/changelog
index c315604..416ea4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pgpainless (1.3.16-1ubuntu1) noble; urgency=medium
+
+  * debian/rules: Exclude Kleopatra compatibility tests (LP: #2044109)
+
+ -- Pushkar Kulkarni <[e-mail]>  Wed, 22 Nov 2023 10:11:34 +0530
+
 pgpainless (1.3.16-1) unstable; urgency=medium
 
   * New upstream version 1.3.16
diff --git a/debian/control b/debian/control
index 24d0dd4..f40a316 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pgpainless
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Jérôme Charaoui <[e-mail]>,
 Build-Depends:
diff --git a/debian/rules b/debian/rules
index 2dcf1e6..53b933d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 TEST_CORE_CLASSPATH=/usr/share/java/bcpg.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/slf4j-simple.jar:pgpainless-core/build/libs/pgpainless-core.jar
 TEST_SOP_CLASSPATH=$(TEST_CORE_CLASSPATH):/usr/share/java/sop-java.jar:pgpainless-sop/build/libs/pgpainless-sop.jar
 TEST_CLI_CLASSPATH=$(TEST_SOP_CLASSPATH):/usr/share/java/sop-java-picocli.jar:/usr/share/java/junit5-system-exit.jar:pgpainless-cli/build/libs/pgpainless-cli.jar
-JUNIT_OPTIONS=--scan-classpath --fail-if-no-tests --disable-ansi-colors
+JUNIT_OPTIONS=--scan-classpath --fail-if-no-tests --disable-ansi-colors --exclude-classname=investigations.KleopatraCompatibilityTest
 
 BUILD_TASKS = jar
 
diff --git a/debian/tests/upstream-core b/debian/tests/upstream-core
index ac610e0..4a0d8d3 100755
--- a/debian/tests/upstream-core
+++ b/debian/tests/upstream-core
@@ -9,6 +9,7 @@ cd "$AUTOPKGTEST_TMP"
 java \
     -jar /usr/share/java/junit-platform-console-standalone.jar \
     -cp /usr/share/java/pgpainless-core-tests.jar \
+    --exclude-classname=investigations.KleopatraCompatibilityTest \
     --scan-classpath \
     --fail-if-no-tests \
     --disable-ansi-colors