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

[Frode Nordahl]

diff --git a/debian/changelog b/debian/changelog
index ca85895..472f217 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
 ceph (16.2.5-0ubuntu3) UNRELEASED; urgency=medium
 
+  [ James Page ]
+
   * d/librbd1.install: Install any built extensions to librbd.
 
- -- James Page <[e-mail]>  Thu, 15 Jul 2021 07:22:23 +0100
+  [ Frode Nordahl ]
+
+  * d/control: The ISA-L EC plugin changed its build dependency from yasm to
+    nasm 2.13.03 or newer (LP: #1940697).
+
+ -- Frode Nordahl <[e-mail]>  Tue, 24 Aug 2021 08:39:48 +0200
 
 ceph (16.2.5-0ubuntu2) impish; urgency=medium
 
diff --git a/debian/control b/debian/control
index ea66129..93a940e 100644
--- a/debian/control
+++ b/debian/control
@@ -83,6 +83,7 @@ Build-Depends:
  libyaml-cpp-dev,
  lsb-release,
  luarocks,
+ nasm (>= 2.13.03) [amd64],
  pkg-config,
  protobuf-compiler,
  python3-cherrypy3,
@@ -97,7 +98,6 @@ Build-Depends:
  valgrind [amd64 armhf i386 powerpc ppc64el s390x arm64],
  virtualenv,
  xfslibs-dev,
- yasm [amd64],
  zlib1g-dev,
 Standards-Version: 4.2.1