Merge ~pushkarnk/ubuntu/+source/tycho:ubuntu/devel into ubuntu/+source/tycho:ubuntu/devel

[Pushkar Kulkarni]

[Pushkar Kulkarni (pushkarnk)]

I did a test build in ppa:pushkarnk/plusone and here are the autopkgtest results

* Results:
  - tycho: plucky/tycho/2.7.5-1ubuntu1 [amd64]
    + ✅ tycho on plucky for amd64 @ 28.11.24 05:00:20
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/amd64/t/tycho/20241128_050020_5c203@/log.gz
  - tycho: plucky/tycho/2.7.5-1ubuntu1 [arm64]
    + ✅ tycho on plucky for arm64 @ 28.11.24 04:44:45
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/arm64/t/tycho/20241128_044445_e08a3@/log.gz
  - tycho: plucky/tycho/2.7.5-1ubuntu1 [armhf]
    + ✅ tycho on plucky for armhf @ 28.11.24 04:46:51
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/armhf/t/tycho/20241128_044651_890e4@/log.gz
  - tycho: plucky/tycho/2.7.5-1ubuntu1 [i386]
    + ✅ tycho on plucky for i386 @ 28.11.24 05:00:30
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/i386/t/tycho/20241128_050030_d367d@/log.gz
  - tycho: plucky/tycho/2.7.5-1ubuntu1 [ppc64el]
    + ✅ tycho on plucky for ppc64el @ 28.11.24 05:16:12
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/ppc64el/t/tycho/20241128_051612_17a1d@/log.gz
  - tycho: plucky/tycho/2.7.5-1ubuntu1 [s390x]
    + ✅ tycho on plucky for s390x @ 28.11.24 04:45:10
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/s390x/t/tycho/20241128_044510_82367@/log.gz

[Simon Quigley (tsimonq2)]

In the future, this should be handled directly in Debian as an NMU.

review: Approve

Unmerged commits

fc9bb39... by Pushkar Kulkarni on 2024-11-26

update maintainer

4368eba... by Pushkar Kulkarni on 2024-11-26

update changelog

e5da72d... by Pushkar Kulkarni on 2024-11-26

d/patches: define newly inherited abstract method

diff --git a/debian/changelog b/debian/changelog
index a740bce..1acc791 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tycho (2.7.5-1ubuntu1) plucky; urgency=medium
+
+  * d/patches: Add patch adding a getCompilerId()
+    implementation to JDTCompiler (LP: #2089702)
+
+ -- Pushkar Kulkarni <[e-mail]>  Wed, 27 Nov 2024 00:02:42 +0530
+
 tycho (2.7.5-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 81b60fd..8296569 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: tycho
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Luca Vercelli <[e-mail]>
 Build-Depends:
diff --git a/debian/patches/0006-define-getCompilerId-JDTCompiler.patch b/debian/patches/0006-define-getCompilerId-JDTCompiler.patch
new file mode 100644
index 0000000..d74f79c
--- /dev/null
+++ b/debian/patches/0006-define-getCompilerId-JDTCompiler.patch
@@ -0,0 +1,21 @@
+Subject: Define new abstract method getCompilerId()
+  The org.codehaus.plexus.compiler.AbstractCompiler class added a
+  new abstract method String getCompilerId(). The JDTCompiler needs
+  to define this method.
+Origin: upstream, https://github.com/eclipse-tycho/tycho/commit/5e6eecad
+Forwarded: not-needed
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tycho/+bug/2089702
+Bug-Debian: http://bugs.debian.org/1086322
+
+--- a/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java
++++ b/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java
+@@ -602,4 +602,9 @@
+ 
+     }
+ 
++    @Override
++    public String getCompilerId() {
++        return "tycho-jdt";
++    }
++
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 7f8490c..a1513ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ remove_dependency.patch
 0003-plexus-archiver-compatibility.patch
 0004-bouncycastle-compatibility.patch
 0005-bnd-compatibility.patch
+0006-define-getCompilerId-JDTCompiler.patch