Merge ~paelzer/ubuntu/+source/libslirp:lp-2029431-static-lib-jammy into ubuntu/+source/libslirp:ubuntu/jammy-devel

Proposed by Christian Ehrhardt 
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merged at revision: 2e6c1e4f1aac4c81323ba886488054d13d66b572
Proposed branch: ~paelzer/ubuntu/+source/libslirp:lp-2029431-static-lib-jammy
Merge into: ubuntu/+source/libslirp:ubuntu/jammy-devel
Diff against target: 35 lines (+11/-0)
3 files modified
debian/changelog (+7/-0)
debian/libslirp-dev.install (+1/-0)
debian/rules (+3/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Athos Ribeiro (community) Approve
Canonical Server Reporter Pending
Review via email: mp+457875@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/lp-2029431-static-libslirp-jammy

This really is trivial, the change is identical to the one Athos already made.
All my effort is actually writing a changelog and showcasing a simple test for the SRU which I've done.

Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

LGTM.

Thanks, Christian!

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

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

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Thanks, uploaded

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 4dfc666..54eb592 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+libslirp (4.6.1-1ubuntu0.1) jammy; urgency=medium
7+
8+ * d/rules, d/libslirp-dev.install: ship static library in the libslirp-dev
9+ binary package. (LP: #2029431)
10+
11+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 03 Jan 2024 07:54:40 +0100
12+
13 libslirp (4.6.1-1build1) jammy; urgency=high
14
15 * No change rebuild for ppc64el baseline bump.
16diff --git a/debian/libslirp-dev.install b/debian/libslirp-dev.install
17index aa09df2..4ea7660 100644
18--- a/debian/libslirp-dev.install
19+++ b/debian/libslirp-dev.install
20@@ -1,3 +1,4 @@
21 usr/include/slirp
22 usr/lib/*/pkgconfig/slirp.pc
23 usr/lib/*/libslirp.so
24+usr/lib/*/libslirp.a
25diff --git a/debian/rules b/debian/rules
26index ffc9f5d..96cbd3c 100755
27--- a/debian/rules
28+++ b/debian/rules
29@@ -2,3 +2,6 @@
30
31 build-arch build-indep build clean install-indep install-arch install binary-arch binary-indep binary: %:
32 dh $@ --buildsystem=meson+ninja
33+
34+override_dh_auto_configure:
35+ dh_auto_configure -- --default-library=both

Subscribers

People subscribed via source and target branches