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

Proposed by Pushkar Kulkarni
Status: Needs review
Proposed branch: ~pushkarnk/ubuntu/+source/tycho:ubuntu/devel
Merge into: ubuntu/+source/tycho:ubuntu/devel
Diff against target: 65 lines (+31/-1)
4 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/0006-define-getCompilerId-JDTCompiler.patch (+21/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Simon Quigley (community) Approve
git-ubuntu import Pending
Review via email: mp+477250@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Pushkar Kulkarni (pushkarnk) wrote :

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

Revision history for this message
Simon Quigley (tsimonq2) wrote :

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

review: Approve

Unmerged commits

fc9bb39... by Pushkar Kulkarni

update maintainer

4368eba... by Pushkar Kulkarni

update changelog

e5da72d... by Pushkar Kulkarni

d/patches: define newly inherited abstract method

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index a740bce..1acc791 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1tycho (2.7.5-1ubuntu1) plucky; urgency=medium
2
3 * d/patches: Add patch adding a getCompilerId()
4 implementation to JDTCompiler (LP: #2089702)
5
6 -- Pushkar Kulkarni <pushkar.kulkarni@canonical.com> Wed, 27 Nov 2024 00:02:42 +0530
7
1tycho (2.7.5-1) unstable; urgency=medium8tycho (2.7.5-1) unstable; urgency=medium
29
3 * Team upload.10 * Team upload.
diff --git a/debian/control b/debian/control
index 81b60fd..8296569 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
1Source: tycho1Source: tycho
2Section: java2Section: java
3Priority: optional3Priority: optional
4Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
5Uploaders:6Uploaders:
6 Luca Vercelli <luca.vercelli.to@gmail.com>7 Luca Vercelli <luca.vercelli.to@gmail.com>
7Build-Depends:8Build-Depends:
diff --git a/debian/patches/0006-define-getCompilerId-JDTCompiler.patch b/debian/patches/0006-define-getCompilerId-JDTCompiler.patch
8new file mode 1006449new file mode 100644
index 0000000..d74f79c
--- /dev/null
+++ b/debian/patches/0006-define-getCompilerId-JDTCompiler.patch
@@ -0,0 +1,21 @@
1Subject: Define new abstract method getCompilerId()
2 The org.codehaus.plexus.compiler.AbstractCompiler class added a
3 new abstract method String getCompilerId(). The JDTCompiler needs
4 to define this method.
5Origin: upstream, https://github.com/eclipse-tycho/tycho/commit/5e6eecad
6Forwarded: not-needed
7Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tycho/+bug/2089702
8Bug-Debian: http://bugs.debian.org/1086322
9
10--- a/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java
11+++ b/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java
12@@ -602,4 +602,9 @@
13
14 }
15
16+ @Override
17+ public String getCompilerId() {
18+ return "tycho-jdt";
19+ }
20+
21 }
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
70003-plexus-archiver-compatibility.patch70003-plexus-archiver-compatibility.patch
80004-bouncycastle-compatibility.patch80004-bouncycastle-compatibility.patch
90005-bnd-compatibility.patch90005-bnd-compatibility.patch
100006-define-getCompilerId-JDTCompiler.patch

Subscribers

People subscribed via source and target branches