]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
debian: Run wrap-and-sort from devscripts
authorAndras Elso <elso.andras@gmail.com>
Fri, 29 Mar 2013 12:28:28 +0000 (13:28 +0100)
committerAndras Elso <elso.andras@gmail.com>
Fri, 29 Mar 2013 12:34:48 +0000 (13:34 +0100)
Signed-off-by: Andras Elso <elso.andras@gmail.com>
14 files changed:
debian/ceph-common.install
debian/ceph-fs-common.install
debian/ceph-fuse.install
debian/ceph-test.install
debian/ceph.install
debian/control
debian/copyright
debian/libcephfs-dev.install
debian/libcephfs1.install
debian/librados-dev.install
debian/librados2.install
debian/librbd-dev.install
debian/librbd1.install
debian/radosgw.install

index ffc467537ff085513e5c0269ec4bc28218bab4b4..893fa2be46502d7ff3a75edc6791a122f65778fd 100644 (file)
@@ -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
index 9a50360fb003e52aed40c9102d965f9aa1b62d84..b20f66af34423d7a99d3b8f15f1195e0528cd1d2 100644 (file)
@@ -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
index 79588d2a629ce12d3926fbc239b5003371f57c43..c3bcd4993049550fa50ddb8bc8a62c2a6d94451d 100644 (file)
@@ -1,3 +1,3 @@
+sbin/mount.fuse.ceph
 usr/bin/ceph-fuse
 usr/share/man/man8/ceph-fuse.8
-sbin/mount.fuse.ceph
index ef3a339ac7769d7ddc2ce7e7254f7471beda6334..5a6010ee3612d5cc01eb1c2e5f69de28c51fea9d 100644 (file)
@@ -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
index f174f55691f5182458af8b679e0df5f68ad9e3c7..16f8ba295af83e7d9b7f56c7fa44795141d1bb41 100644 (file)
@@ -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
index 340e6dfda8607972100458ed56a970bb166d9c5e..b36e9cb5bc1a0ddee3f310ef25db8438d9131446 100644 (file)
@@ -6,13 +6,49 @@ Vcs-Git: git://github.com/ceph/ceph.git
 Vcs-Browser: https://github.com/ceph/ceph
 Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
 Uploaders: Sage Weil <sage@newdream.net>
-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.
index 01cd52137369b4e80616a33cfeeebbdf2b20a6f1..4295a1564f9a38e6d6b0c18a0ee3ceabf52a2ca0 100644 (file)
@@ -37,25 +37,25 @@ Files: m4/acx_pthread.m4
 Copyright: Steven G. Johnson <stevenj@alum.mit.edu>
 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
index 902fb950cc151cbb98e28275a76c38a851fb3bfd..45ff62733650b594d335c1d6789bbea7761eb23f 100644 (file)
@@ -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
index a5266dfbca3e34cb6ae2ce7d8fcd995f259faf3e..f1b4adf056b5f6728ab5a3d9d97bfb9ee13d8dd3 100644 (file)
@@ -1,2 +1,2 @@
-usr/lib/libcephfs.so.*
 
+usr/lib/libcephfs.so.*
index 5db72fc4eef205ad14e0bac6928d68a33c985f77..230f4070ec65104e9b566ff4ef6d26c536aa9472 100644 (file)
@@ -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
index 8ba139a94f1635078e13649576a7eb1c1aa83524..7cf8f19d7c2b7cc854daa321495a5240ca2bf7bf 100644 (file)
@@ -1,2 +1,2 @@
-usr/lib/librados.so.*
 
+usr/lib/librados.so.*
index 05d5012cfd1bb9e8907752e71c737865e25f147b..37ef6bdcb6f8a6c49cd4b3f1228530b4601daa8f 100644 (file)
@@ -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
index a99fd689ec544493fff25c50568fbf6dbf692cc3..0aaf73338a0135e7a6d0b9023b6f09e210714eb2 100644 (file)
@@ -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
index a188a204a20046dc57b5a37a64a26ef2282e00cf..1ed620e0ad35d3f82876664ed14f97afa8fbfd10 100644 (file)
@@ -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