Merge ~vpa1977/ubuntu/+source/byte-buddy:update-to-1.14.11 into ubuntu/+source/byte-buddy:ubuntu/devel

Proposed by Vladimir Petko
Status: Merged
Merge reported by: Vladimir Petko
Merged at revision: 056c6d919b9286f999aba988b6938c03b51d5af3
Proposed branch: ~vpa1977/ubuntu/+source/byte-buddy:update-to-1.14.11
Merge into: ubuntu/+source/byte-buddy:ubuntu/devel
Prerequisite: ~vpa1977/ubuntu/+source/byte-buddy:1.14.11
Diff against target: 117 lines (+20/-9)
4 files modified
debian/changelog (+9/-0)
debian/control (+4/-3)
debian/copyright (+1/-0)
debian/patches/plugin-dependency.patch (+6/-6)
Reviewer Review Type Date Requested Status
Dan Bungert Pending
git-ubuntu import Pending
Review via email: mp+459686@code.launchpad.net

Description of the change

Changes:
  - new upstream release
  - update repack rules to exclude .so file
  - require asm-java that supports Java 21

PPA: ppa:vpa1977/gettext[1]

Testing:
 - piuparts install/upgrade/purge test (ok) [2]
 - rebuild reverse build depends in a ppa against updated version [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://bugs.launchpad.net/ubuntu/+source/byte-buddy/+bug/2051752/comments/1
[3] https://launchpad.net/~vpa1977/+archive/ubuntu/byte-buddy-rdep/+packages

To post a comment you must log in.
Revision history for this message
Dan Bungert (dbungert) wrote :

Already uploaded

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 6e4fc0f..b07ff04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
1byte-buddy (1.14.11~us1-0ubuntu1) noble; urgency=medium
2
3 * New upstream release (LP: #2051752):
4 - Refreshed the patches.
5 - d/control: depend on asm (>= 9.6~).
6 - d/copyright: exclude .so files.
7
8 -- Vladimir Petko <vladimir.petko@canonical.com> Thu, 04 Jan 2024 10:39:14 +1300
9
1byte-buddy (1.12.23-1) unstable; urgency=medium10byte-buddy (1.12.23-1) unstable; urgency=medium
211
3 * Team upload.12 * Team upload.
diff --git a/debian/control b/debian/control
index 9f80819..edf3805 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
1Source: byte-buddy1Source: byte-buddy
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 Ying-Chun Liu (PaulLiu) <paulliu@debian.org>,7 Ying-Chun Liu (PaulLiu) <paulliu@debian.org>,
7 Felix Natter <fnatter@gmx.net>8 Felix Natter <fnatter@gmx.net>
@@ -9,7 +10,7 @@ Build-Depends:
9 debhelper-compat (= 13),10 debhelper-compat (= 13),
10 default-jdk,11 default-jdk,
11 junit4,12 junit4,
12 libasm-java (>= 7.1),13 libasm-java (>= 9.6~),
13 libbuild-helper-maven-plugin-java,14 libbuild-helper-maven-plugin-java,
14 libbyte-buddy-java (>= 1.11.22),15 libbyte-buddy-java (>= 1.11.22),
15 libfindbugs-annotations-java,16 libfindbugs-annotations-java,
@@ -32,7 +33,7 @@ Rules-Requires-Root: no
32Package: libbyte-buddy-java33Package: libbyte-buddy-java
33Architecture: all34Architecture: all
34Depends:35Depends:
35 libasm-java (>= 7.0),36 libasm-java (>= 9.6~),
36 libmaven3-core-java (>= 3.5.0),37 libmaven3-core-java (>= 3.5.0),
37 ${misc:Depends}38 ${misc:Depends}
38Suggests: ${maven:OptionalDepends}39Suggests: ${maven:OptionalDepends}
diff --git a/debian/copyright b/debian/copyright
index e47214a..8e705ca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,7 @@ Files-Excluded: .mvn/*
7 byte-buddy-gradle-plugin/gradle/*/gradle-*.zip7 byte-buddy-gradle-plugin/gradle/*/gradle-*.zip
8 *.class8 *.class
9 *.dll9 *.dll
10 *.so
1011
11Files: *12Files: *
12Copyright: 2014-2017 Rafael Winterhalter <rafael.wth@gmail.com>13Copyright: 2014-2017 Rafael Winterhalter <rafael.wth@gmail.com>
diff --git a/debian/patches/plugin-dependency.patch b/debian/patches/plugin-dependency.patch
index 8e4c023..e44da75 100644
--- a/debian/patches/plugin-dependency.patch
+++ b/debian/patches/plugin-dependency.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
8 <plugin>8 <plugin>
9 <groupId>net.bytebuddy</groupId>9 <groupId>net.bytebuddy</groupId>
10- <artifactId>byte-buddy-maven-plugin</artifactId>10- <artifactId>byte-buddy-maven-plugin</artifactId>
11- <version>1.12.22</version>11- <version>1.14.10</version>
12+ <artifactId>byte-buddy-previous-maven-plugin</artifactId>12+ <artifactId>byte-buddy-previous-maven-plugin</artifactId>
13+ <version>previous</version>13+ <version>previous</version>
14 <executions>14 <executions>
@@ -18,7 +18,7 @@ Forwarded: not-needed
18 <transformation>18 <transformation>
19 <groupId>net.bytebuddy</groupId>19 <groupId>net.bytebuddy</groupId>
20 <artifactId>byte-buddy</artifactId>20 <artifactId>byte-buddy</artifactId>
21- <version>1.12.22</version>21- <version>1.14.10</version>
22+ <version>debian</version>22+ <version>debian</version>
23 <plugin>net.bytebuddy.build.HashCodeAndEqualsPlugin$WithNonNullableFields</plugin>23 <plugin>net.bytebuddy.build.HashCodeAndEqualsPlugin$WithNonNullableFields</plugin>
24 <arguments>24 <arguments>
@@ -27,14 +27,14 @@ Forwarded: not-needed
27 <transformation>27 <transformation>
28 <groupId>net.bytebuddy</groupId>28 <groupId>net.bytebuddy</groupId>
29 <artifactId>byte-buddy</artifactId>29 <artifactId>byte-buddy</artifactId>
30- <version>1.12.22</version>30- <version>1.14.10</version>
31+ <version>debian</version>31+ <version>debian</version>
32 <plugin>net.bytebuddy.build.CachedReturnPlugin</plugin>32 <plugin>net.bytebuddy.build.CachedReturnPlugin</plugin>
33 </transformation>33 </transformation>
34 <transformation>34 <transformation>
35 <groupId>net.bytebuddy</groupId>35 <groupId>net.bytebuddy</groupId>
36 <artifactId>byte-buddy</artifactId>36 <artifactId>byte-buddy</artifactId>
37- <version>1.12.22</version>37- <version>1.14.10</version>
38+ <version>debian</version>38+ <version>debian</version>
39 <plugin>net.bytebuddy.build.AccessControllerPlugin</plugin>39 <plugin>net.bytebuddy.build.AccessControllerPlugin</plugin>
40 <arguments>40 <arguments>
@@ -43,14 +43,14 @@ Forwarded: not-needed
43 <transformation>43 <transformation>
44 <groupId>net.bytebuddy</groupId>44 <groupId>net.bytebuddy</groupId>
45 <artifactId>byte-buddy</artifactId>45 <artifactId>byte-buddy</artifactId>
46- <version>1.12.22</version>46- <version>1.14.10</version>
47+ <version>debian</version>47+ <version>debian</version>
48 <plugin>net.bytebuddy.build.DispatcherAnnotationPlugin</plugin>48 <plugin>net.bytebuddy.build.DispatcherAnnotationPlugin</plugin>
49 </transformation>49 </transformation>
50 <transformation>50 <transformation>
51 <groupId>net.bytebuddy</groupId>51 <groupId>net.bytebuddy</groupId>
52 <artifactId>byte-buddy</artifactId>52 <artifactId>byte-buddy</artifactId>
53- <version>1.12.22</version>53- <version>1.14.10</version>
54+ <version>debian</version>54+ <version>debian</version>
55 <plugin>net.bytebuddy.build.RepeatedAnnotationPlugin</plugin>55 <plugin>net.bytebuddy.build.RepeatedAnnotationPlugin</plugin>
56 </transformation>56 </transformation>

Subscribers

People subscribed via source and target branches