Skip to content

Commit

Permalink
Merge pull request ceph#53546 from mcv21/deb_package_fixes
Browse files Browse the repository at this point in the history
debian: update to dh compat 12, fix more serious packaging errors, correct copyright syntax

Reviewed-by: Kefu Chai <[email protected]>
  • Loading branch information
tchaikov authored Sep 23, 2023
2 parents 1378703 + e4393e5 commit cbb06d6
Show file tree
Hide file tree
Showing 7 changed files with 574 additions and 35 deletions.
1 change: 0 additions & 1 deletion debian/ceph-base.docs

This file was deleted.

1 change: 1 addition & 0 deletions debian/ceph-mon.postinst
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/sh
# vim: set noet ts=8:
# postinst script for ceph-mon
#
Expand Down
1 change: 1 addition & 0 deletions debian/ceph-osd.postinst
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/sh
# vim: set noet ts=8:
# postinst script for ceph-osd
#
Expand Down
2 changes: 1 addition & 1 deletion debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
12
18 changes: 7 additions & 11 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Priority: optional
Homepage: http://ceph.com/
Vcs-Git: git://github.com/ceph/ceph.git
Vcs-Browser: https://github.com/ceph/ceph
Maintainer: Ceph Maintainers <ceph-maintainers@lists.ceph.com>
Maintainer: Ceph Maintainers <ceph-maintainers@ceph.io>
Uploaders: Ken Dreyer <[email protected]>,
Alfredo Deza <[email protected]>,
Build-Depends: automake,
Expand All @@ -20,8 +20,7 @@ Build-Depends: automake,
git,
golang,
gperf,
g++ (>= 7),
hostname <pkg.ceph.check>,
g++ (>= 11),
javahelper,
jq <pkg.ceph.check>,
jsonnet <pkg.ceph.check>,
Expand Down Expand Up @@ -136,9 +135,6 @@ Package: ceph-base
Architecture: linux-any
Depends: binutils,
ceph-common (= ${binary:Version}),
debianutils,
findutils,
grep,
logrotate,
parted,
psmisc,
Expand Down Expand Up @@ -190,6 +186,7 @@ Package: cephadm
Architecture: linux-any
Recommends: podman (>= 2.0.2) | docker.io | docker-ce
Depends: lvm2,
python3,
${python3:Depends},
Description: cephadm utility to bootstrap ceph daemons with systemd and containers
Ceph is a massively scalable, open-source, distributed
Expand Down Expand Up @@ -432,7 +429,6 @@ Depends: ceph-osd (= ${binary:Version}),
e2fsprogs,
lvm2,
parted,
util-linux,
xfsprogs,
${misc:Depends},
${python3:Depends}
Expand Down Expand Up @@ -760,7 +756,7 @@ Architecture: any
Section: debug
Priority: extra
Depends: libsqlite3-mod-ceph (= ${binary:Version}),
libsqlite3-0-dbgsym
libsqlite3-0-dbgsym,
${misc:Depends},
Description: debugging symbols for libsqlite3-mod-ceph
A SQLite3 VFS for storing and manipulating databases stored on Ceph's RADOS
Expand Down Expand Up @@ -1208,14 +1204,14 @@ Description: Java Native Interface library for CephFS Java bindings
Package: rados-objclass-dev
Architecture: linux-any
Section: libdevel
Depends: librados-dev (= ${binary:Version}) ${misc:Depends},
Depends: librados-dev (= ${binary:Version}), ${misc:Depends},
Description: RADOS object class development kit.
.
This package contains development files needed for building RADOS object class plugins.

Package: cephfs-shell
Architecture: all
Depends: ${misc:Depends}
Depends: ${misc:Depends},
${python3:Depends}
Description: interactive shell for the Ceph distributed file system
Ceph is a massively scalable, open-source, distributed
Expand All @@ -1228,7 +1224,7 @@ Description: interactive shell for the Ceph distributed file system

Package: cephfs-top
Architecture: all
Depends: ${misc:Depends}
Depends: ${misc:Depends},
${python3:Depends}
Description: This package provides a top(1) like utility to display various
filesystem metrics in realtime.
Expand Down
Loading

0 comments on commit cbb06d6

Please sign in to comment.