[Pkg-ceph-commits] [ceph] 22/59: Misc package resyncs for 12.1.0

James Downing Page jamespage at moszumanska.debian.org
Thu Feb 1 15:27:52 UTC 2018


This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu/artful
in repository ceph.

commit 2fa3551e866e218e75e0065c669f4a2a195c778b
Author: James Page <james.page at ubuntu.com>
Date:   Tue Jun 27 07:34:18 2017 +0000

    Misc package resyncs for 12.1.0
---
 debian/ceph-base.install |  1 -
 debian/ceph-osd.install  |  1 -
 debian/ceph-test.install |  2 --
 debian/control           | 13 ++++++++++---
 debian/copyright         | 28 ----------------------------
 debian/radosgw.install   |  1 +
 6 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/debian/ceph-base.install b/debian/ceph-base.install
index c962afc..05b6d13 100644
--- a/debian/ceph-base.install
+++ b/debian/ceph-base.install
@@ -12,7 +12,6 @@ usr/lib/python*/dist-packages/ceph_detect_init*
 usr/sbin/ceph-create-keys
 usr/sbin/ceph-detect-init
 usr/share/doc/ceph/sample.ceph.conf
-usr/share/doc/ceph/sample.fetch_config
 usr/share/man/man8/ceph-create-keys.8
 usr/share/man/man8/ceph-debugpack.8
 usr/share/man/man8/ceph-detect-init.8
diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
index b77057c..d812c84 100644
--- a/debian/ceph-osd.install
+++ b/debian/ceph-osd.install
@@ -7,7 +7,6 @@ usr/bin/ceph_objectstore_bench
 usr/lib/ceph/ceph-osd-prestart.sh
 usr/lib/python*/dist-packages/ceph_disk*
 usr/sbin/ceph-disk
-usr/sbin/ceph-disk-udev
 usr/share/man/man8/ceph-clsinfo.8
 usr/share/man/man8/ceph-disk.8
 usr/share/man/man8/ceph-osd.8
diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index df537a1..ba55036 100644
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -23,7 +23,5 @@ usr/bin/ceph_smalliobenchrbd /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
-usr/bin/dmclock-data-struct-tests /usr/lib/ceph
-usr/bin/dmclock-tests /usr/lib/ceph
 usr/lib/*/ceph/ceph-monstore-update-crush.sh /usr/lib/ceph
 usr/share/java/libcephfs-test.jar
diff --git a/debian/control b/debian/control
index 7bd48d7..60e34ed 100644
--- a/debian/control
+++ b/debian/control
@@ -17,10 +17,10 @@ Build-Depends: cmake,
                dh-python,
                dh-systemd (>= 1.5),
                dpkg-dev (>= 1.16.1~),
+               gperf,
                javahelper,
                junit4,
                libaio-dev,
-               libatomic-ops-dev,
                libbabeltrace-ctf-dev,
                libbabeltrace-dev,
                libblkid-dev,
@@ -40,7 +40,6 @@ Build-Depends: cmake,
                libcurl4-gnutls-dev,
                libedit-dev,
                libexpat1-dev,
-               libfcgi-dev,
                libfuse-dev,
                libgoogle-perftools-dev [i386 amd64 powerpc armhf arm64 ppc64el],
                libibverbs-dev,
@@ -56,10 +55,13 @@ Build-Depends: cmake,
                lsb-release,
                pkg-config,
                python-all-dev (>= 2.6.6-3~),
+               python-cherrypy3,
                python-nose,
+               python-pecan,
                python-prettytable,
                python-setuptools,
                python-sphinx,
+               python-werkzeug,
                python3-all-dev,
                python3-setuptools,
                uuid-dev,
@@ -183,12 +185,16 @@ Description: common utilities to mount and interact with a ceph storage cluster
 Package: ceph-mgr
 Architecture: linux-any
 Depends: ceph-base (= ${binary:Version}),
+         python-cherrypy3,
+         python-openssl,
+         python-pecan,
+         python-werkzeug,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
 Replaces: ceph (<< 0.93-417),
 Breaks: ceph (<< 0.93-417),
-Description: metadata server for the ceph distributed file system
+Description: manager 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.
@@ -466,6 +472,7 @@ Package: ceph-test
 Architecture: linux-any
 Depends: ceph-common,
          curl,
+         jq,
          xml2,
          xmlstarlet,
          ${misc:Depends},
diff --git a/debian/copyright b/debian/copyright
index 9cec6e5..132c365 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -153,34 +153,6 @@ License: Boost-Software-License-1.0
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-Files: m4/acx_pthread.m4
-Copyright: Steven G. Johnson <stevenj at alum.mit.edu>
-License: GPLWithACException
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
- .
- As a special exception, the respective Autoconf Macro’s copyright owner gives
- unlimited permission to copy, distribute and modify the configure scripts that
- are the output of Autoconf when processing the Macro. You need not follow the
- terms of the GNU General Public License when using or distributing such
- scripts, even though portions of the text of the Macro appear in them. The
- GNU General Public License (GPL) does govern all other use of the material
- that constitutes the Autoconf Macro.
- .
- This special exception to the GPL applies to versions of the Autoconf Macro
- released by the Autoconf Archive. When you make and distribute a modified
- version of the Autoconf Macro, you may extend this special exception to the
- GPL to apply to your modified version as well.
-
 Files: src/common/crc32c_intel*
 Copyright: 2012-2013 Intel Corporation All Rights Reserved.
 License: BSD-3-clause
diff --git a/debian/radosgw.install b/debian/radosgw.install
index b7e89cb..8398322 100644
--- a/debian/radosgw.install
+++ b/debian/radosgw.install
@@ -1,4 +1,5 @@
 usr/bin/radosgw
 usr/bin/radosgw-object-expirer
 usr/bin/radosgw-token
+usr/bin/radosgw-es
 usr/share/man/man8/radosgw.8

-- 
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