Merge ~vpa1977/ubuntu/+source/cava:ubuntu/devel into ubuntu/+source/cava:ubuntu/devel

[Vladimir Petko]

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/gettext [1]

Changes:
 - Suppress obsolete release level warning

Testing:
 - rebuild in default Java 21 ppa[2]
 - piuparts test [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15779302/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/cava/+bug/2052754/comments/1

[Julian Andres Klode (juliank)]

Sponsored, thank you.

diff --git a/debian/changelog b/debian/changelog
index 239ff7f..06850d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cava (0.6.0-1.1ubuntu1) noble; urgency=medium
+
+  [ Pushkar Kulkarni ]
+  * d/p/gradle-build.patch: Avoid source/target obsolete warnings
+    (LP: #2052754).
+
+ -- Vladimir Petko <[e-mail]>  Fri, 09 Feb 2024 14:03:38 +1300
+
 cava (0.6.0-1.1) unstable; urgency=medium
 
   * Non maintainer upload by the Reproducible Builds team.
diff --git a/debian/control b/debian/control
index 3249e97..2a0a8db 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: cava
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Hans-Christoph Steiner <[e-mail]>
 Build-Depends: debhelper (>= 11~),
                antlr4,
diff --git a/debian/patches/gradle-build.patch b/debian/patches/gradle-build.patch
index a945907..6805874 100644
--- a/debian/patches/gradle-build.patch
+++ b/debian/patches/gradle-build.patch
@@ -133,8 +133,11 @@
    tasks.withType(JavaCompile) {
      options.compilerArgs += [
        '-Xlint:unchecked',
-@@ -179,48 +101,6 @@
+@@ -177,50 +99,9 @@
+       '-Xlint:divzero',
+       '-Xlint:finally',
        '-Xlint:static',
++      '-Xlint:-options',
        '-Werror'
      ]
 -
@@ -182,7 +185,7 @@
    }
  
  
-@@ -243,13 +123,6 @@
+@@ -243,13 +124,6 @@
      from javadoc.destinationDir
    }
  
@@ -196,7 +199,7 @@
    //////
    // Packaging and deployment
  
-@@ -272,126 +145,6 @@
+@@ -272,126 +146,6 @@
          archives jar
          archives sourcesJar
        }
@@ -323,7 +326,7 @@
      }
  
      tasks.withType(Sign) {
-@@ -399,49 +152,6 @@
+@@ -399,49 +153,6 @@
          System.getenv('ENABLE_SIGNING') == 'true'
        }
      }
@@ -373,7 +376,7 @@
    }
  }
  
-@@ -475,44 +185,3 @@
+@@ -475,44 +186,3 @@
      classpath += it.javadoc.classpath
    }
  }