From 36d86cb0c519511260351a9595ed0a7a12c47cb0 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 23 May 2024 18:45:52 +0200
Subject: Merging debian version 18.2.3-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/ceph-exporter.install |  2 ++
 debian/ceph-mgr.requires     |  1 +
 debian/changelog             |  6 ++++++
 debian/control               | 25 ++++++++++++++++++++++++-
 debian/rules                 |  1 +
 5 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 debian/ceph-exporter.install

diff --git a/debian/ceph-exporter.install b/debian/ceph-exporter.install
new file mode 100644
index 000000000..1ac0edcd2
--- /dev/null
+++ b/debian/ceph-exporter.install
@@ -0,0 +1,2 @@
+lib/systemd/system/ceph-exporter*
+usr/bin/ceph-exporter
diff --git a/debian/ceph-mgr.requires b/debian/ceph-mgr.requires
index bf334fb9b..39336330c 100644
--- a/debian/ceph-mgr.requires
+++ b/debian/ceph-mgr.requires
@@ -1,3 +1,4 @@
+bcrypt
 pyOpenSSL
 cephfs
 ceph-argparse
diff --git a/debian/changelog b/debian/changelog
index ab1069a75..22404c37f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (18.2.3-1) stable; urgency=medium
+
+  * New upstream release
+
+ -- Ceph Release Team <ceph-maintainers@ceph.io>  Wed, 24 Apr 2024 19:57:19 +0000
+
 ceph (18.2.2-0progress7.99u1) graograman-backports-extras; urgency=low
 
   * Initial reupload to graograman-backports-extras.
diff --git a/debian/control b/debian/control
index 89ecb6688..f1824188f 100644
--- a/debian/control
+++ b/debian/control
@@ -96,7 +96,6 @@ Build-Depends: automake,
                python3-all-dev,
                python3-cherrypy3,
                python3-natsort,
-               python3-jwt <pkg.ceph.check>,
                python3-pecan <pkg.ceph.check>,
                python3-bcrypt <pkg.ceph.check>,
                tox <pkg.ceph.check>,
@@ -358,6 +357,30 @@ Description: debugging symbols for ceph-mgr
  .
  This package contains the debugging symbols for ceph-mgr.
 
+Package: ceph-exporter
+Architecture: linux-any
+Depends: ceph-base (= ${binary:Version}),
+Description: metrics exporter for the ceph distributed storage system
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains the metrics exporter daemon, which is used to expose
+ the performance metrics.
+
+Package: ceph-exporter-dbg
+Architecture: linux-any
+Section: debug
+Priority: extra
+Depends: ceph-exporter (= ${binary:Version}),
+         ${misc:Depends},
+Description: debugging symbols for ceph-exporter
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains the debugging symbols for ceph-exporter.
+
 Package: ceph-mon
 Architecture: linux-any
 Depends: ceph-common (= ${binary:Version}),
diff --git a/debian/rules b/debian/rules
index ed7f4a255..68c69e044 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,6 +105,7 @@ override_dh_strip:
 	dh_strip -pceph-mds --dbg-package=ceph-mds-dbg
 	dh_strip -pceph-fuse --dbg-package=ceph-fuse-dbg
 	dh_strip -pceph-mgr --dbg-package=ceph-mgr-dbg
+	dh_strip -pceph-exporter --dbg-package=ceph-exporter-dbg
 	dh_strip -pceph-mon --dbg-package=ceph-mon-dbg
 	dh_strip -pceph-osd --dbg-package=ceph-osd-dbg
 	dh_strip -pceph-base --dbg-package=ceph-base-dbg
-- 
cgit v1.2.3