Merge ~vpa1977/ubuntu/+source/jruby:2056521 into ubuntu/+source/jruby:debian/sid

[Vladimir Petko]

PPA: ppa:vpa1977/plusone[1]

Changes:
 - rebase Ubuntu changes, drop changes present upstream

Testing:
- ppa build[2]
- piuparts test
- autopkgtests:
 jruby/9.4.6.0+ds-1ubuntu1~ppa10
    + ✅ jruby on noble for amd64 @ 11.03.24 20:59:34 Log️ 🗒️ [3]
    + ✅ jruby on noble for arm64 @ 12.03.24 06:10:27 Log️ 🗒️ [4]
    + ✅ jruby on noble for armhf @ 11.03.24 19:26:31 Log️ 🗒️ [5]
    + ✅ jruby on noble for i386 @ 11.03.24 19:21:22 Log️ 🗒️ [6]
    + ✅ jruby on noble for ppc64el @ 11.03.24 19:28:41 Log️ 🗒️ [7]
    + ✅ jruby on noble for s390x @ 11.03.24 19:25:23 Log️ 🗒️ [8]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone/+sourcepub/15844176/+listing-archive-extra
[3] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/amd64/j/jruby/20240311_205934_87062@/log.gz
[4]https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/arm64/j/jruby/20240312_061027_ba89e@/log.gz
[5] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/armhf/j/jruby/20240311_192631_28a8f@/log.gz
[6] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/i386/j/jruby/20240311_192122_8f158@/log.gz
[7] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/ppc64el/j/jruby/20240311_192841_8e79d@/log.gz
[8] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/s390x/j/jruby/20240311_192523_0f98f@/log.gz

[Pushkar Kulkarni (pushkarnk)]

Compared with [1]. LGTM.

[1] https://code.launchpad.net/~vpa1977/ubuntu/+source/jruby/+git/jruby/+merge/461172

review: Approve

Unmerged commits

273dd1a... by Vladimir Petko on 2024-03-08

changelog

0c1eb0b... by Vladimir Petko on 2024-03-08

update-maintainer

0edf6df... by Vladimir Petko on 2024-03-08

reconstruct-changelog

b6f1492... by Vladimir Petko on 2024-03-08

merge-changelogs

09f1e51... by Vladimir Petko on 2024-02-25

set tests failing in CI as flaky

diff --git a/debian/changelog b/debian/changelog
index bf65885..5ecabf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+jruby (9.4.6.0+ds-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2056521). Remaining changes:
+    - d/t/control: mark mri-extra, spec-ruby, mri-stdlib as flaky. See
+      launchpad bug 2054943.
+  * Drop Changes:
+    - d/rules: copy jruby pom files so that they can by updated by
+      maven-install-plugin. Fixes ftbfs (launchpad bug 2054942). Fixed
+      in Debian bug 1064554.
+    - d/p/jruby-8081-invert-o-nonblock-flag.patch: apply upstream patch
+      to fix fcntl call. This allows workaround for launchpad
+      bug 2054943. Fixed upstream.
+
+ -- Vladimir Petko <[e-mail]>  Fri, 08 Mar 2024 20:55:39 +1300
+
 jruby (9.4.6.0+ds-1) unstable; urgency=medium
 
   * New upstream version 9.4.6.0+ds
@@ -12,6 +27,18 @@ jruby (9.4.6.0+ds-1) unstable; urgency=medium
 
  -- Jérôme Charaoui <[e-mail]>  Wed, 28 Feb 2024 19:39:52 -0500
 
+jruby (9.4.5.0+ds-1ubuntu1) noble; urgency=medium
+
+  * d/rules: copy jruby pom files so that they can by updated by
+    maven-install-plugin. Fixes ftbfs (LP: #2054942).
+  * d/t/control: mark mri-extra, spec-ruby, mri-stdlib as flaky. See
+    launchpad bug 2054943.
+  * d/p/jruby-8081-invert-o-nonblock-flag.patch: apply upstream patch
+    to fix fcntl call. This allows workaround for launchpad
+    bug 2054943.
+
+ -- Vladimir Petko <[e-mail]>  Mon, 26 Feb 2024 11:55:18 +1300
+
 jruby (9.4.5.0+ds-1) unstable; urgency=medium
 
   * Rebuild for unstable.
diff --git a/debian/control b/debian/control
index 21e0097..2ba7e82 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: jruby
 Section: ruby
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Thomas Goirand <[e-mail]>,
  Jérôme Charaoui <[e-mail]>,
diff --git a/debian/tests/control b/debian/tests/control
index 5d26b4d..4fa7fdb 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -112,7 +112,7 @@ Depends:
  ruby-rspec,
  ruby-test-unit,
  @,
-Restrictions: allow-stderr
+Restrictions: allow-stderr, flaky
 Architecture: amd64, arm64
 
 Tests: mri-core
@@ -140,7 +140,7 @@ Depends:
  ruby-rspec,
  ruby-test-unit,
  @,
-Restrictions: allow-stderr
+Restrictions: allow-stderr, flaky
 Architecture: amd64, arm64
 
 Tests: mri-stdlib
@@ -154,5 +154,5 @@ Depends:
  ruby-rspec,
  ruby-test-unit,
  @,
-Restrictions: allow-stderr
+Restrictions: allow-stderr, flaky
 Architecture: amd64, arm64