From 8f5c665744e58d6d51a1e86de55c1399f51cc1c3 Mon Sep 17 00:00:00 2001 From: Andras Elso Date: Fri, 29 Mar 2013 13:28:28 +0100 Subject: [PATCH] debian: Run wrap-and-sort from devscripts Signed-off-by: Andras Elso --- debian/ceph-common.install | 12 ++--- debian/ceph-fs-common.install | 2 +- debian/ceph-fuse.install | 2 +- debian/ceph-test.install | 20 ++++---- debian/ceph.install | 32 ++++++------ debian/control | 96 ++++++++++++++++++++++++----------- debian/copyright | 10 ++-- debian/libcephfs-dev.install | 4 +- debian/libcephfs1.install | 2 +- debian/librados-dev.install | 12 ++--- debian/librados2.install | 2 +- debian/librbd-dev.install | 8 +-- debian/librbd1.install | 4 +- debian/radosgw.install | 4 +- 14 files changed, 123 insertions(+), 87 deletions(-) diff --git a/debian/ceph-common.install b/debian/ceph-common.install index ffc467537ff08..893fa2be46502 100644 --- a/debian/ceph-common.install +++ b/debian/ceph-common.install @@ -1,16 +1,16 @@ +etc/bash_completion.d/rados +etc/bash_completion.d/rbd usr/bin/ceph -usr/bin/ceph-conf -usr/bin/ceph-syn usr/bin/ceph-authtool +usr/bin/ceph-conf usr/bin/ceph-dencoder +usr/bin/ceph-syn usr/bin/rados usr/bin/rbd -usr/share/man/man8/ceph.8 usr/share/man/man8/ceph-authtool.8 -usr/share/man/man8/ceph-syn.8 usr/share/man/man8/ceph-conf.8 usr/share/man/man8/ceph-dencoder.8 +usr/share/man/man8/ceph-syn.8 +usr/share/man/man8/ceph.8 usr/share/man/man8/rados.8 usr/share/man/man8/rbd.8 -etc/bash_completion.d/rados -etc/bash_completion.d/rbd diff --git a/debian/ceph-fs-common.install b/debian/ceph-fs-common.install index 9a50360fb003e..b20f66af34423 100644 --- a/debian/ceph-fs-common.install +++ b/debian/ceph-fs-common.install @@ -1,4 +1,4 @@ sbin/mount.ceph usr/bin/cephfs -usr/share/man/man8/mount.ceph.8 usr/share/man/man8/cephfs.8 +usr/share/man/man8/mount.ceph.8 diff --git a/debian/ceph-fuse.install b/debian/ceph-fuse.install index 79588d2a629ce..c3bcd49930495 100644 --- a/debian/ceph-fuse.install +++ b/debian/ceph-fuse.install @@ -1,3 +1,3 @@ +sbin/mount.fuse.ceph usr/bin/ceph-fuse usr/share/man/man8/ceph-fuse.8 -sbin/mount.fuse.ceph diff --git a/debian/ceph-test.install b/debian/ceph-test.install index ef3a339ac7769..5a6010ee3612d 100644 --- a/debian/ceph-test.install +++ b/debian/ceph-test.install @@ -1,40 +1,45 @@ +usr/bin/ceph-coverage usr/bin/ceph_bench_log usr/bin/ceph_dupstore +usr/bin/ceph_filestore_dump usr/bin/ceph_kvstorebench usr/bin/ceph_multi_stress_watch usr/bin/ceph_omapbench usr/bin/ceph_psim usr/bin/ceph_radosacl -usr/bin/ceph_rgw_multiparser usr/bin/ceph_rgw_jsonparser +usr/bin/ceph_rgw_multiparser usr/bin/ceph_scratchtool usr/bin/ceph_scratchtoolpp usr/bin/ceph_smalliobench usr/bin/ceph_smalliobenchdumb usr/bin/ceph_smalliobenchfs usr/bin/ceph_smalliobenchrbd -usr/bin/ceph_filestore_dump usr/bin/ceph_streamtest usr/bin/ceph_test_cfuse_cache_invalidate usr/bin/ceph_test_cls_lock usr/bin/ceph_test_cls_rbd usr/bin/ceph_test_cls_refcount usr/bin/ceph_test_cls_rgw +usr/bin/ceph_test_crypto usr/bin/ceph_test_filejournal usr/bin/ceph_test_filestore usr/bin/ceph_test_filestore_idempotent usr/bin/ceph_test_filestore_idempotent_sequence usr/bin/ceph_test_filestore_workloadgen usr/bin/ceph_test_ioctls +usr/bin/ceph_test_keys usr/bin/ceph_test_keyvaluedb_atomicity usr/bin/ceph_test_keyvaluedb_iterators usr/bin/ceph_test_libcephfs usr/bin/ceph_test_librbd usr/bin/ceph_test_librbd_fsx usr/bin/ceph_test_mon_workloadgen +usr/bin/ceph_test_msgr usr/bin/ceph_test_mutate usr/bin/ceph_test_object_map usr/bin/ceph_test_objectcacher_stress +usr/bin/ceph_test_rados usr/bin/ceph_test_rados_api_aio usr/bin/ceph_test_rados_api_cls usr/bin/ceph_test_rados_api_io @@ -44,21 +49,16 @@ usr/bin/ceph_test_rados_api_pool usr/bin/ceph_test_rados_api_snapshots usr/bin/ceph_test_rados_api_stat usr/bin/ceph_test_rados_api_watch_notify -usr/bin/ceph_test_rewrite_latency -usr/bin/ceph_test_stress_watch -usr/bin/ceph_test_trans -usr/bin/ceph_test_crypto -usr/bin/ceph_test_keys -usr/bin/ceph_test_msgr -usr/bin/ceph_test_rados usr/bin/ceph_test_rados_delete_pools_parallel usr/bin/ceph_test_rados_list_parallel usr/bin/ceph_test_rados_open_pools_parallel usr/bin/ceph_test_rados_watch_notify +usr/bin/ceph_test_rewrite_latency usr/bin/ceph_test_signal_handlers usr/bin/ceph_test_store_tool +usr/bin/ceph_test_stress_watch usr/bin/ceph_test_timers +usr/bin/ceph_test_trans usr/bin/ceph_tpbench usr/bin/ceph_xattr_bench -usr/bin/ceph-coverage usr/share/java/libcephfs-test.jar diff --git a/debian/ceph.install b/debian/ceph.install index f174f55691f51..16f8ba295af83 100644 --- a/debian/ceph.install +++ b/debian/ceph.install @@ -1,29 +1,29 @@ +etc/bash_completion.d/ceph +lib/udev/rules.d/95-ceph-osd.rules +sbin/ceph-create-keys usr/sbin/ +sbin/ceph-disk usr/sbin/ +sbin/ceph-disk-activate usr/sbin/ +sbin/ceph-disk-prepare usr/sbin/ +sbin/mkcephfs usr/bin/ceph-clsinfo -usr/bin/crushtool -usr/bin/monmaptool -usr/bin/osdmaptool -usr/bin/ceph-run +usr/bin/ceph-debugpack usr/bin/ceph-mon usr/bin/ceph-osd -usr/bin/ceph-debugpack +usr/bin/ceph-run usr/bin/ceph_mon_store_converter -sbin/ceph-disk usr/sbin/ -sbin/ceph-disk-prepare usr/sbin/ -sbin/ceph-disk-activate usr/sbin/ -sbin/ceph-create-keys usr/sbin/ -sbin/mkcephfs +usr/bin/crushtool +usr/bin/monmaptool +usr/bin/osdmaptool usr/lib/ceph/ceph_common.sh usr/lib/rados-classes/* usr/share/doc/ceph/sample.ceph.conf usr/share/doc/ceph/sample.fetch_config +usr/share/man/man8/ceph-clsinfo.8 +usr/share/man/man8/ceph-debugpack.8 usr/share/man/man8/ceph-mon.8 usr/share/man/man8/ceph-osd.8 -usr/share/man/man8/mkcephfs.8 usr/share/man/man8/ceph-run.8 usr/share/man/man8/crushtool.8 -usr/share/man/man8/osdmaptool.8 +usr/share/man/man8/mkcephfs.8 usr/share/man/man8/monmaptool.8 -usr/share/man/man8/ceph-clsinfo.8 -usr/share/man/man8/ceph-debugpack.8 -etc/bash_completion.d/ceph -lib/udev/rules.d/95-ceph-osd.rules +usr/share/man/man8/osdmaptool.8 diff --git a/debian/control b/debian/control index 340e6dfda8607..b36e9cb5bc1a0 100644 --- a/debian/control +++ b/debian/control @@ -6,13 +6,49 @@ Vcs-Git: git://github.com/ceph/ceph.git Vcs-Browser: https://github.com/ceph/ceph Maintainer: Laszlo Boszormenyi (GCS) Uploaders: Sage Weil -Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, libfuse-dev, libboost-dev (>= 1.42), libboost-thread-dev, libedit-dev, libnss3-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev [i386 amd64], pkg-config, libcurl4-gnutls-dev, libkeyutils-dev, uuid-dev, libaio-dev, python (>= 2.6.6-3~), libxml2-dev, javahelper, default-jdk, junit4, libboost-program-options-dev, libleveldb-dev, libsnappy-dev +Build-Depends: autoconf, + automake, + autotools-dev, + debhelper (>= 6.0.7~), + default-jdk, + javahelper, + junit4, + libaio-dev, + libatomic-ops-dev, + libboost-dev (>= 1.42), + libboost-program-options-dev, + libboost-thread-dev, + libcurl4-gnutls-dev, + libedit-dev, + libexpat1-dev, + libfcgi-dev, + libfuse-dev, + libgoogle-perftools-dev [i386 amd64], + libkeyutils-dev, + libleveldb-dev, + libnss3-dev, + libsnappy-dev, + libtool, + libxml2-dev, + pkg-config, + python (>= 2.6.6-3~), + uuid-dev Standards-Version: 3.9.3 Package: ceph Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime, python, xfsprogs, gdisk, parted, cryptsetup-bin -Recommends: ceph-mds, librados2, librbd1, btrfs-tools +Depends: binutils, + ceph-common, + cryptsetup-bin, + gdisk, + parted, + python, + sdparm | hdparm, + uuid-runtime, + xfsprogs, + ${misc:Depends}, + ${shlibs:Depends} +Recommends: btrfs-tools, ceph-mds, librados2, librbd1 X-Python-Version: >= 2.6 Description: distributed storage and file system Ceph is a distributed storage system designed to provide excellent @@ -36,10 +72,10 @@ Description: debugging symbols for ceph Package: ceph-mds Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends}, ceph -Recommends: ceph-fuse, libcephfs1, ceph-fs-common +Depends: ceph, ${misc:Depends}, ${shlibs:Depends} +Recommends: ceph-fs-common, ceph-fuse, libcephfs1 Replaces: ceph (<< 0.58-1) -Breaks: ceph (<< 0.58-1) +Breaks: ceph (<< 0.58-1) Description: metadata server for the ceph distributed file system Ceph is a distributed storage and network file system designed to provide excellent performance, reliability, and scalability. @@ -60,7 +96,7 @@ Description: debugging symbols for ceph-mds Package: ceph-fuse Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: fuse-utils Description: FUSE-based client for the Ceph distributed file system Ceph is a distributed network file system designed to provide @@ -89,7 +125,7 @@ Description: debugging symbols for ceph-fuse Package: rbd-fuse Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: fuse-utils Description: FUSE-based rbd client for the Ceph distributed file system Ceph is a distributed network file system designed to provide @@ -112,7 +148,7 @@ Description: debugging symbols for rbd-fuse Package: ceph-common Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends}, librbd1 (= ${binary:Version}) +Depends: librbd1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Conflicts: ceph-client-tools Replaces: ceph-client-tools Suggests: ceph, ceph-mds @@ -137,7 +173,7 @@ Description: debugging symbols for ceph-common Package: ceph-fs-common Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: ceph-client-tools Suggests: ceph-mds Description: common utilities to mount and interact with a ceph file system @@ -165,7 +201,7 @@ Package: ceph-resource-agents Architecture: linux-any Recommends: pacemaker Priority: extra -Depends: ceph (= ${binary:Version}), ${misc:Depends}, resource-agents +Depends: ceph (= ${binary:Version}), resource-agents, ${misc:Depends} Description: OCF-compliant resource agents for Ceph Ceph is a distributed storage and network file system designed to provide excellent performance, reliability, and scalability. @@ -179,7 +215,7 @@ Conflicts: librados, librados1 Replaces: librados, librados1 Architecture: linux-any Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: RADOS distributed object store client library RADOS is a reliable, autonomic distributed object storage cluster developed as part of the Ceph distributed storage system. This is a @@ -204,7 +240,7 @@ Description: debugging symbols for librados Package: librados-dev Architecture: linux-any Section: libdevel -Depends: ${misc:Depends}, librados2 (= ${binary:Version}) +Depends: librados2 (= ${binary:Version}), ${misc:Depends} Conflicts: librados1-dev, librados2-dev Replaces: librados1-dev, librados2-dev Description: RADOS distributed object store client library (development files) @@ -219,7 +255,7 @@ Description: RADOS distributed object store client library (development files) Package: librbd1 Architecture: linux-any Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends}, librados2 (= ${binary:Version}) +Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: RADOS block device client library RBD is a block device striped across multiple distributed objects in RADOS, a reliable, autonomic distributed object storage cluster @@ -242,7 +278,7 @@ Description: debugging symbols for librbd1 Package: librbd-dev Architecture: linux-any Section: libdevel -Depends: ${misc:Depends}, librbd1 (= ${binary:Version}), librados-dev +Depends: librados-dev, librbd1 (= ${binary:Version}), ${misc:Depends} Conflicts: librbd1-dev Replaces: librbd1-dev Description: RADOS block device client library (development files) @@ -255,11 +291,11 @@ Description: RADOS block device client library (development files) link against librbd1. Package: libcephfs1 -Conflicts: libcephfs, libceph, libceph1 -Replaces: libcephfs, libceph, libceph1 +Conflicts: libceph, libceph1, libcephfs +Replaces: libceph, libceph1, libcephfs Architecture: linux-any Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: Ceph distributed file system client library Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability. This is a @@ -284,9 +320,9 @@ Description: debugging symbols for libcephfs1 Package: libcephfs-dev Architecture: linux-any Section: libdevel -Depends: ${misc:Depends}, libcephfs1 (= ${binary:Version}) -Conflicts: libcephfs1-dev, libceph1-dev, libceph-dev -Replaces: libcephfs1-dev, libceph1-dev, libceph-dev +Depends: libcephfs1 (= ${binary:Version}), ${misc:Depends} +Conflicts: libceph-dev, libceph1-dev, libcephfs1-dev +Replaces: libceph-dev, libceph1-dev, libcephfs1-dev Description: Ceph distributed file system client library (development files) Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability. This is a @@ -298,7 +334,7 @@ Description: Ceph distributed file system client library (development files) Package: radosgw Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-common +Depends: ceph-common, ${misc:Depends}, ${shlibs:Depends} Description: REST gateway for RADOS distributed object store RADOS is a distributed object store used by the Ceph distributed storage system. This package provides a REST gateway to the @@ -322,7 +358,7 @@ Description: debugging symbols for radosgw Package: rest-bench Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-common, xml2, curl +Depends: ceph-common, curl, xml2, ${misc:Depends}, ${shlibs:Depends} Description: RESTful bencher that can be used to benchmark radosgw performance. @@ -330,26 +366,26 @@ Package: rest-bench-dbg Architecture: linux-any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-common, xml2, curl +Depends: ceph-common, curl, xml2, ${misc:Depends}, ${shlibs:Depends} Description: RESTful bencher that can be used to benchmark radosgw performance. Package: ceph-test Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-common, xml2, curl -Description: Ceph test and benchmarking tools. +Depends: ceph-common, curl, xml2, ${misc:Depends}, ${shlibs:Depends} +Description: Ceph test and benchmarking tools. Package: ceph-test-dbg Architecture: linux-any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-common, xml2, curl -Description: Ceph test and benchmarking tools. +Depends: ceph-common, curl, xml2, ${misc:Depends}, ${shlibs:Depends} +Description: Ceph test and benchmarking tools. Package: python-ceph Architecture: linux-any Section: python -Depends: ${misc:Depends}, ${python:Depends}, librados2, librbd1 +Depends: librados2, librbd1, ${misc:Depends}, ${python:Depends} X-Python-Version: >= 2.6 Description: Python libraries for the Ceph distributed filesystem Ceph is a distributed storage and network file system designed to provide @@ -367,5 +403,5 @@ Description: Java libraries for the Ceph File System. Package: libcephfs-jni Architecture: linux-any Section: libs -Depends: libcephfs1, ${shlibs:Depends}, ${java:Depends}, ${misc:Depends} +Depends: libcephfs1, ${java:Depends}, ${misc:Depends}, ${shlibs:Depends} Description: Java Native Interface library for CephFS Java bindings. diff --git a/debian/copyright b/debian/copyright index 01cd52137369b..4295a1564f9a3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -37,25 +37,25 @@ Files: m4/acx_pthread.m4 Copyright: Steven G. Johnson License: GPLWithACException -Files: src/common/sctp_crc32.c: +Files: src/common/sctp_crc32.c: Copyright: Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved. Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved License: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + a) Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + b) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + c) Neither the name of Cisco Systems, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/debian/libcephfs-dev.install b/debian/libcephfs-dev.install index 902fb950cc151..45ff62733650b 100644 --- a/debian/libcephfs-dev.install +++ b/debian/libcephfs-dev.install @@ -1,4 +1,4 @@ -usr/lib/libcephfs.so +usr/include/cephfs/libcephfs.h usr/lib/libcephfs.a usr/lib/libcephfs.la -usr/include/cephfs/libcephfs.h +usr/lib/libcephfs.so diff --git a/debian/libcephfs1.install b/debian/libcephfs1.install index a5266dfbca3e3..f1b4adf056b5f 100644 --- a/debian/libcephfs1.install +++ b/debian/libcephfs1.install @@ -1,2 +1,2 @@ -usr/lib/libcephfs.so.* +usr/lib/libcephfs.so.* diff --git a/debian/librados-dev.install b/debian/librados-dev.install index 5db72fc4eef20..230f4070ec651 100644 --- a/debian/librados-dev.install +++ b/debian/librados-dev.install @@ -1,12 +1,12 @@ -usr/lib/librados.so -usr/lib/librados.a -usr/lib/librados.la +usr/bin/librados-config +usr/include/rados/buffer.h +usr/include/rados/crc32c.h usr/include/rados/librados.h usr/include/rados/librados.hpp -usr/include/rados/buffer.h usr/include/rados/page.h -usr/include/rados/crc32c.h usr/include/rados/rados_types.h usr/include/rados/rados_types.hpp -usr/bin/librados-config +usr/lib/librados.a +usr/lib/librados.la +usr/lib/librados.so usr/share/man/man8/librados-config.8 diff --git a/debian/librados2.install b/debian/librados2.install index 8ba139a94f163..7cf8f19d7c2b7 100644 --- a/debian/librados2.install +++ b/debian/librados2.install @@ -1,2 +1,2 @@ -usr/lib/librados.so.* +usr/lib/librados.so.* diff --git a/debian/librbd-dev.install b/debian/librbd-dev.install index 05d5012cfd1bb..37ef6bdcb6f8a 100644 --- a/debian/librbd-dev.install +++ b/debian/librbd-dev.install @@ -1,6 +1,6 @@ -usr/lib/librbd.so -usr/lib/librbd.a -usr/lib/librbd.la +usr/include/rbd/features.h usr/include/rbd/librbd.h usr/include/rbd/librbd.hpp -usr/include/rbd/features.h +usr/lib/librbd.a +usr/lib/librbd.la +usr/lib/librbd.so diff --git a/debian/librbd1.install b/debian/librbd1.install index a99fd689ec544..0aaf73338a013 100644 --- a/debian/librbd1.install +++ b/debian/librbd1.install @@ -1,4 +1,4 @@ -usr/lib/librbd.so.* +lib/udev/rules.d/50-rbd.rules usr/bin/ceph-rbdnamer +usr/lib/librbd.so.* usr/share/man/man8/ceph-rbdnamer.8 -lib/udev/rules.d/50-rbd.rules diff --git a/debian/radosgw.install b/debian/radosgw.install index a188a204a2004..1ed620e0ad35d 100644 --- a/debian/radosgw.install +++ b/debian/radosgw.install @@ -1,5 +1,5 @@ +etc/bash_completion.d/radosgw-admin usr/bin/radosgw usr/bin/radosgw-admin -usr/share/man/man8/radosgw.8 usr/share/man/man8/radosgw-admin.8 -etc/bash_completion.d/radosgw-admin +usr/share/man/man8/radosgw.8 -- 2.39.5