[Pkg-ceph-commits] [ceph] 08/23: Resync further packaging changes from upstream.
James Downing Page
jamespage at moszumanska.debian.org
Wed Feb 17 10:42:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch jewel
in repository ceph.
commit be780db65e4a7edc40d50326d4cad0e4e1355522
Author: James Page <james.page at ubuntu.com>
Date: Mon Jan 25 15:42:19 2016 +0000
Resync further packaging changes from upstream.
---
debian/ceph-common.install | 2 +-
debian/ceph-test.install | 1 -
debian/ceph.install | 1 +
debian/control | 33 ++++++++++++++++++++++++++++++---
debian/copyright | 1 -
debian/librados-dev.install | 1 +
debian/python-cephfs.install | 1 +
debian/python-rbd.install | 2 ++
debian/rbd-nbd.install | 2 ++
debian/rules | 1 +
10 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index d033c38..e33b90f 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -12,8 +12,8 @@ usr/bin/ceph-rbdnamer
usr/bin/ceph-syn
usr/bin/rados
usr/bin/rbd
-usr/bin/rbdmap
usr/bin/rbd-replay*
+usr/bin/rbdmap
usr/lib/python*/dist-packages/ceph_argparse.py*
usr/lib/python*/dist-packages/ceph_daemon.py*
usr/share/ceph/id_dsa_drop.ceph.com
diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index 0e866f4..6902979 100644
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -19,7 +19,6 @@ usr/bin/ceph_smalliobench /usr/lib/ceph/bin
usr/bin/ceph_smalliobenchdumb /usr/lib/ceph/bin
usr/bin/ceph_smalliobenchfs /usr/lib/ceph/bin
usr/bin/ceph_smalliobenchrbd /usr/lib/ceph/bin
-usr/bin/ceph_streamtest /usr/lib/ceph/bin
usr/bin/ceph_test_* /usr/lib/ceph/bin
usr/bin/ceph_tpbench /usr/lib/ceph/bin
usr/bin/ceph_xattr_bench /usr/lib/ceph/bin
diff --git a/debian/ceph.install b/debian/ceph.install
index 4a9a02c..ce87a75 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -3,6 +3,7 @@ debian/etc/pm/sleep.d/* /etc/pm/sleep.d/
etc/bash_completion.d/ceph
udev/60-ceph-partuuid-workaround.rules lib/udev/rules.d
udev/95-ceph-osd.rules lib/udev/rules.d
+usr/bin/ceph-bluefs-tool
usr/bin/ceph-clsinfo
usr/bin/ceph-debugpack
usr/bin/ceph-detect-init
diff --git a/debian/control b/debian/control
index 99bcc18..743a13c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Uploaders: Laszlo Boszormenyi (GCS) <gcs at debian.org>,
Homepage: http://ceph.com/
Vcs-Git: git://anonscm.debian.org/pkg-ceph/ceph.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ceph/ceph.git
-Build-Depends: debhelper (>= 9~),
+Build-Depends: cython,
+ debhelper (>= 9~),
default-jdk,
dh-autoreconf,
dh-python,
@@ -26,7 +27,6 @@ Build-Depends: debhelper (>= 9~),
libboost-regex-dev,
libboost-system-dev (>= 1.42),
libboost-thread-dev (>= 1.42),
- libbz2-dev,
libcurl4-gnutls-dev,
libedit-dev,
libexpat1-dev,
@@ -44,8 +44,8 @@ Build-Depends: debhelper (>= 9~),
pkg-config,
python-all (>= 2.6.6-3~),
python-nose,
- python-sphinx,
python-setuptools,
+ python-sphinx,
uuid-dev,
uuid-runtime,
valgrind [amd64 armhf i386 powerpc],
@@ -108,6 +108,33 @@ Description: debugging symbols for ceph
.
This package contains the debugging symbols for ceph.
+Package: rbd-nbd
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: NBD-based rbd client for the Ceph distributed file 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 is a
+ NBD-based client that allows one to map Ceph rbd images as local
+ block device.
+ .
+ NBD base client that allows one to map Ceph rbd images as local
+ block device.
+
+Package: rbd-nbd-dbg
+Architecture: linux-any
+Section: debug
+Priority: extra
+Depends: rbd-nbd (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for rbd-nbd
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage. This is a
+ NBD-based client that allows one to map Ceph rbd images as local
+ block device.
+ .
+ This package contains the debugging symbols for rbd-nbd.
+
Package: ceph-common
Architecture: linux-any
Depends: librbd1 (= ${binary:Version}),
diff --git a/debian/copyright b/debian/copyright
index ebecbf4..1440477 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -819,4 +819,3 @@ License: BSD-3-clause
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/debian/librados-dev.install b/debian/librados-dev.install
index cc8a7c0..960a635 100644
--- a/debian/librados-dev.install
+++ b/debian/librados-dev.install
@@ -1,5 +1,6 @@
usr/bin/librados-config
usr/include/rados/buffer.h
+usr/include/rados/buffer_fwd.h
usr/include/rados/crc32c.h
usr/include/rados/librados.h
usr/include/rados/librados.hpp
diff --git a/debian/python-cephfs.install b/debian/python-cephfs.install
index 458102c..5b127b8 100644
--- a/debian/python-cephfs.install
+++ b/debian/python-cephfs.install
@@ -1 +1,2 @@
+usr/lib/python*/dist-packages/ceph_volume_client.py*
usr/lib/python*/dist-packages/cephfs.py*
diff --git a/debian/python-rbd.install b/debian/python-rbd.install
index a4ec715..8d3a6c2 100644
--- a/debian/python-rbd.install
+++ b/debian/python-rbd.install
@@ -1 +1,3 @@
+usr/lib/python*/dist-packages/rbd-*.egg-info
usr/lib/python*/dist-packages/rbd.py*
+usr/lib/python*/dist-packages/rbd.so
diff --git a/debian/rbd-nbd.install b/debian/rbd-nbd.install
new file mode 100644
index 0000000..385c450
--- /dev/null
+++ b/debian/rbd-nbd.install
@@ -0,0 +1,2 @@
+usr/bin/rbd-nbd
+usr/share/man/man8/rbd-nbd.8
diff --git a/debian/rules b/debian/rules
index 3ee366c..8321abf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -139,6 +139,7 @@ override_dh_strip:
dh_strip -pceph-mds --dbg-package=ceph-mds-dbg
dh_strip -pceph-fuse --dbg-package=ceph-fuse-dbg
dh_strip -prbd-fuse --dbg-package=rbd-fuse-dbg
+ dh_strip -prbd-nbd --dbg-package=rbd-nbd-dbg
dh_strip -pceph-common --dbg-package=ceph-common-dbg
dh_strip -pceph-fs-common --dbg-package=ceph-fs-common-dbg
dh_strip -plibrados2 --dbg-package=librados2-dbg
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list