Merge ~vpa1977/ubuntu/+source/android-platform-external-nist-sip:ubuntu/devel into ubuntu/+source/android-platform-external-nist-sip:ubuntu/devel

[Vladimir Petko]

This MP resolves ftbfs due to Java 21 API changes

PPA: ppa:vpa1977/plusone [1]

Changes:
 - Change method signatures to conform to Java 21 API specification for java.util.List.

Testing:
 - package builds[2]
 - piuparts test [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone/+sourcepub/15839824/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/android-platform-external-nist-sip/+bug/2056086/comments/1

[Zixing Liu (liushuyu-011)]

Looks good to me.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 80c7c8a..505499b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+android-platform-external-nist-sip (9.0.0+r35-1.1ubuntu1) noble; urgency=medium
+
+  * d/p/java21-update-list-api.patch: add patch to workaround Java 21
+    java.util.List API changes (LP: #2056086).
+
+ -- Vladimir Petko <[e-mail]>  Wed, 06 Mar 2024 14:00:01 +1300
+
 android-platform-external-nist-sip (9.0.0+r35-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 11dc1d5..141f8bc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: android-platform-external-nist-sip
 Section: java
 Priority: optional
-Maintainer: Android Tools Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Android Tools Maintainers <[e-mail]>
 Uploaders: Katerina <[e-mail]>
 Build-Depends: debhelper (>=12),
                default-jdk-headless,
diff --git a/debian/patches/java21-update-list-api.patch b/debian/patches/java21-update-list-api.patch
new file mode 100644
index 0000000..9e7be2d
--- /dev/null
+++ b/debian/patches/java21-update-list-api.patch
@@ -0,0 +1,55 @@
+Description: workaround java.util.List changes in Java 21
+ Java 21 adds removeFirst()/removeLast() and getFirst()/getLast() methods
+ that are also defined in the class SIPHeader. Update method signatures
+ to match Java 21 API.
+Author: Vladimir Petko <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/android-platform-external-nist-sip/+bug/2056086
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1065522
+Frwarded: not-needed
+Last-Update: 2024-03-06
+
+--- a/java/gov/nist/javax/sip/header/SIPHeaderList.java
++++ b/java/gov/nist/javax/sip/header/SIPHeaderList.java
+@@ -208,7 +208,7 @@
+      *
+      * @return SIPHeader first element of the list.
+      */
+-    public Header getFirst() {
++    public HDR getFirst() {
+         if (hlist == null || hlist.isEmpty())
+             return null;
+         else
+@@ -220,7 +220,7 @@
+      *
+      * @return SIPHeader last element of the list.
+      */
+-    public Header getLast() {
++    public HDR getLast() {
+         if (hlist == null || hlist.isEmpty())
+             return null;
+         return  hlist.get(hlist.size() - 1);
+@@ -277,18 +277,19 @@
+     /**
+      * Remove the first element of this list.
+      */
+-    public void removeFirst() {
++    public HDR removeFirst() {
+         if (hlist.size() != 0)
+-            hlist.remove(0);
+-
++            return hlist.remove(0);
++        return null;
+     }
+
+     /**
+      * Remove the last element of this list.
+      */
+-    public void removeLast() {
++    public HDR removeLast() {
+         if (hlist.size() != 0)
+-            hlist.remove(hlist.size() - 1);
++            return hlist.remove(hlist.size() - 1);
++        return null;
+     }
+
+     /**
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9589098
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+java21-update-list-api.patch