Merge ~vpa1977/ubuntu/+source/byte-buddy:fix-bytebuddy-depends into ubuntu/+source/byte-buddy:ubuntu/devel

[Vladimir Petko]

This MP fixes too strict version dependency on byte-buddy generated by maven-debian-helper.

Changes:
 - Replace pom version in debian.originalVersion with changelog upstream version including repack suffix.

PPA: ppa:vpa1977/byte-buddy-fix[1]

Testing:
 - piuparts test for the package itself [2]
 - rebuild easymock and check libbyte-buddy-java version in control file depends field.
'Depends: libasm-java (>= 9.6~us1), libbyte-buddy-java (>= 1.14.11~us1), libobjenesis-java (>= 3.3)'
 - build libgoby-java (build depends on easymock) [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/byte-buddy-fix
[2] https://bugs.launchpad.net/ubuntu/+source/byte-buddy/+bug/2054488/comments/2
[3] https://launchpadlibrarian.net/715490126/buildlog_ubuntu-noble-amd64.libgoby-java_3.3.1+dfsg2-10build1~ppa1_BUILDING.txt.gz

[Vladimir Petko (vpa1977)]

Pushed separator change suggested by liushuyu-011, retested - the dependency for easymock is created correctly -
'Depends: libasm-java (>= 9.6~us1), libbyte-buddy-java (>= 1.14.11~us1), libobjenesis-java (>= 3.3)'

Also rephrased changelog as per grammarly.

[Zixing Liu (liushuyu-011)]

Looks good to me

review: Approve

[Vladimir Petko (vpa1977)]

Uploaded, thank you!

Unmerged commits

bbb2a84... by Vladimir Petko on 2024-02-21

changelog

e03e966... by Vladimir Petko on 2024-02-21

replace pom version with the changelog version

314d2b7... by Vladimir Petko on 2024-01-03

1.14.11~us1-0ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index b07ff04..107a7ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+byte-buddy (1.14.11~us1-0ubuntu2) noble; urgency=medium
+
+  * d/rules: replace the pom version with the changelog version to
+    include a repack suffix (LP: #2054488). This change fixes
+    the inability to install byte-buddy dependencies after rebuild
+    due to binary dependency on byte-buddy >= 1.14.11.
+
+ -- Vladimir Petko <[e-mail]>  Wed, 21 Feb 2024 18:27:13 +1300
+
 byte-buddy (1.14.11~us1-0ubuntu1) noble; urgency=medium
 
   * New upstream release (LP: #2051752):
diff --git a/debian/rules b/debian/rules
index f81bf7c..8912398 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+v_upstream=$(shell dpkg-parsechangelog -S Version| sed 's/-[^-][^-]*$$//')
+
 %:
 	dh $@
 
@@ -24,3 +26,8 @@ override_dh_auto_test:
 	# Do not run 'mvn test', even if the tests are disabled in debian/maven.properties
 	# it performs a second bytecode transformation and the build break due to duplicate
 	# fields introduced by net.bytebuddy.build.CachedReturnPlugin
+
+override_dh_auto_install:
+	dh_auto_install
+
+	find debian/libbyte-buddy-java/usr/share/maven-repo -exec sed -i 's|debian.originalVersion>.*<|debian.originalVersion>$(v_upstream)<|g' {} \;