Merge ~fnordahl/ubuntu/+source/ceph:bug/1940697-impish into ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/impish

Proposed by Frode Nordahl
Status: Merged
Merged at revision: c795a9baebe2558e258b29882f2856af4e066edf
Proposed branch: ~fnordahl/ubuntu/+source/ceph:bug/1940697-impish
Merge into: ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/impish
Diff against target: 40 lines (+9/-2)
2 files modified
debian/changelog (+8/-1)
debian/control (+1/-1)
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+407592@code.launchpad.net
To post a comment you must log in.

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 ca85895..472f217 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,8 +1,15 @@
6 ceph (16.2.5-0ubuntu3) UNRELEASED; urgency=medium
7
8+ [ James Page ]
9+
10 * d/librbd1.install: Install any built extensions to librbd.
11
12- -- James Page <james.page@ubuntu.com> Thu, 15 Jul 2021 07:22:23 +0100
13+ [ Frode Nordahl ]
14+
15+ * d/control: The ISA-L EC plugin changed its build dependency from yasm to
16+ nasm 2.13.03 or newer (LP: #1940697).
17+
18+ -- Frode Nordahl <frode.nordahl@canonical.com> Tue, 24 Aug 2021 08:39:48 +0200
19
20 ceph (16.2.5-0ubuntu2) impish; urgency=medium
21
22diff --git a/debian/control b/debian/control
23index ea66129..93a940e 100644
24--- a/debian/control
25+++ b/debian/control
26@@ -83,6 +83,7 @@ Build-Depends:
27 libyaml-cpp-dev,
28 lsb-release,
29 luarocks,
30+ nasm (>= 2.13.03) [amd64],
31 pkg-config,
32 protobuf-compiler,
33 python3-cherrypy3,
34@@ -97,7 +98,6 @@ Build-Depends:
35 valgrind [amd64 armhf i386 powerpc ppc64el s390x arm64],
36 virtualenv,
37 xfslibs-dev,
38- yasm [amd64],
39 zlib1g-dev,
40 Standards-Version: 4.2.1
41

Subscribers

People subscribed via source and target branches