Merge ~vpa1977/ubuntu/+source/openjdk-21:ubuntu1-upload into ubuntu/+source/openjdk-21:ubuntu/devel

[Vladimir Petko]

Changes:
 - enable jtreg tests.

PPA: ppa:vpa1977/bootstrap-openjdk-lts [1]

Tests:
 - package build.
Note:
 - jtreg jpackage tests fail
 - i386 build fails due to the missing dependencies.

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/bootstrap-openjdk-lts/+packages

diff --git a/debian/changelog b/debian/changelog
index fd78188..b497863 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openjdk-21 (21.0.3+9-1ubuntu1) noble; urgency=medium
+
+  * d/rules: enable jtreg tests.
+  * Regenerate control files.
+
+ -- Vladimir Petko <[e-mail]>  Tue, 23 Apr 2024 07:35:05 +1200
+
 openjdk-21 (21.0.3+9-1) unstable; urgency=high
 
   * OpenJDK 21.0.3 release, build 9.
diff --git a/debian/control b/debian/control
index cf0d93d..6029fd5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: openjdk-21
 Section: java
 Priority: optional
-Maintainer: OpenJDK Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: OpenJDK Team <[e-mail]>
 Uploaders: Matthias Klose <[e-mail]>
 Build-Depends: debhelper (>= 11),
   m4, lsb-release, zip, unzip,
   sharutils, gawk, cpio, pkg-config, procps, wdiff, fastjar (>= 2:0.96-0ubuntu2),
   time, strip-nondeterminism, debugedit (>= 4.16),
-  file,
+  jtreg7 (>= 7.3.1+1~) <!nocheck>, libtestng7-java <!nocheck>, xvfb <!nocheck>, xauth <!nocheck>, xfonts-base <!nocheck>, libgl1-mesa-dri [!x32] <!nocheck>, xfwm4 <!nocheck>, x11-xkb-utils <!nocheck>, dbus-x11 <!nocheck>, libasmtools-java <!nocheck>, xvfb  <!nocheck>,
   autoconf, automake, autotools-dev, ant, ant-optional,
   g++-13 <!cross>,
   openjdk-21-jdk-headless:native | openjdk-20-jdk-headless:native,
diff --git a/debian/rules b/debian/rules
index a495ce5..c42c925 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,7 +182,7 @@ with_docs = $(if $(findstring nodoc, $(DEB_BUILD_OPTIONS)),,yes)
 ifneq (,$(filter $(distrel), precise trusty))
   with_docs =
 endif
-with_check = disabled for this upload
+#with_check = disabled for this upload
 
 with_wqy_zenhai = $(if $(filter $(distrel),lenny),,yes)
 
diff --git a/debian/watch b/debian/watch
index 13c244e..545015a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,6 @@
 version=4
 opts=\
-repack,repacksuffix=ea,oversionmangle=s/\+(\d+)/\~$1/,dversionmangle=s/\~(\d*)ea$/\+$1/,\
+repack,\
 compression=xz, \
     https://github.com/openjdk/jdk21u/tags \
     (?:.*?/)?jdk-(21[\+\.\d]*)\.tar\.gz