Merge ~athos-ribeiro/ubuntu/+source/libslirp:ship-static-lib into ubuntu/+source/libslirp:ubuntu/devel

[Athos Ribeiro]

Fix for LP: #2029431. Here, we want to ship a static library within the -dev package.

We set the meson option to build both the static and shared libraries from the project and install the .a file in the -dev package.

I will forward this change to debian once it is accepted here.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/libslirp-static/+packages

Unfortunately, this package has no DEP8 tests.

[Athos Ribeiro (athos-ribeiro)]

I wonder if debhelper shouldn't add the option to build the static library to the default options appended to the configure target...

[Sergio Durigan Junior (sergiodj)]

Thanks, Athos.

LGTM, +1. Thanks for also submitting this change to Debian.

As for your comment re. debhelper, that's an interesting question. I tried searching to see if I could find any rationale, but apparently this topic was never even raised. I'm not very familiar with meson/ninja, so I don't know if there could be any side effects to always enabling "--default-library=both". But it's certainly something worth discussing with the debhelper maintainers, IMHO.

Thanks.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: athos-ribeiro, sergiodj
Uploaders: athos-ribeiro, sergiodj
MP auto-approved

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Sergio!

Uploaded.

diff --git a/debian/changelog b/debian/changelog
index bc0945d..3424c9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libslirp (4.7.0-1ubuntu1) mantic; urgency=medium
+
+  * d/rules, d/libslirp-dev.install: ship static library in the libslirp-dev
+    binary package. (LP: #2029431)
+
+ -- Athos Ribeiro <[e-mail]>  Wed, 16 Aug 2023 14:36:41 -0300
+
 libslirp (4.7.0-1) unstable; urgency=medium
 
   * new upstream release
diff --git a/debian/control b/debian/control
index bcdde93..c91afe5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libslirp
 Section: net
 Priority: optional
-Maintainer: Debian QEMU Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian QEMU Team <[e-mail]>
 Uploaders: Michael Tokarev <[e-mail]>
 Build-Depends: debhelper-compat (= 13), libglib2.0-dev, meson, ninja-build
 Standards-Version: 4.6.0
diff --git a/debian/libslirp-dev.install b/debian/libslirp-dev.install
index aa09df2..4ea7660 100644
--- a/debian/libslirp-dev.install
+++ b/debian/libslirp-dev.install
@@ -1,3 +1,4 @@
 usr/include/slirp
 usr/lib/*/pkgconfig/slirp.pc
 usr/lib/*/libslirp.so
+usr/lib/*/libslirp.a
diff --git a/debian/rules b/debian/rules
index ffc9f5d..96cbd3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,6 @@
 
 build-arch build-indep build clean install-indep install-arch install binary-arch binary-indep binary: %:
 	dh $@ --buildsystem=meson+ninja
+
+override_dh_auto_configure:
+	dh_auto_configure -- --default-library=both