[Pkg-ceph-commits] [ceph] 01/01: Import Debian changes 0.80.11-0ubuntu1.14.04.1

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


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

jamespage pushed a commit to annotated tag debian/0.80.11-0ubuntu1.14.04.1
in repository ceph.

commit 7d06cbf71a29b2ac0ae1c284e51e5b9dee0d4a51
Merge: f4e7a5d a829670
Author: James Page <james.page at ubuntu.com>
Date:   Mon Jan 18 14:25:14 2016 +0000

    Import Debian changes 0.80.11-0ubuntu1.14.04.1
    
    ceph (0.80.11-0ubuntu1.14.04.1) trusty; urgency=medium
    
      * New upstream stable point release (LP: #1535278):
        - d/p/ceph-radosgw-init.patch
          d/p/zap-in-two-phases.patch: Dropped, included upstream.
        - d/p/increaseFileLimit.patch: Refresh.

 .gitignore                                         |   1 -
 Makefile.am                                        |   6 +-
 Makefile.in                                        |   6 +-
 ceph.spec                                          |  46 +-
 ceph.spec.in                                       |  44 +-
 configure                                          |  22 +-
 configure.ac                                       |   2 +-
 debian/README.Debian                               |  90 ---
 debian/ceph-common.bash-completion                 |   2 -
 debian/ceph-common.install                         |   2 +
 debian/ceph-common.lintian-overrides               |   2 -
 debian/ceph-common.maintscript                     |   2 -
 debian/ceph-common.manpages                        |   1 -
 debian/ceph-fuse.lintian-overrides                 |   2 -
 debian/ceph-fuse.manpages                          |   1 -
 debian/ceph-mds.lintian-overrides                  |   3 -
 debian/ceph-test.install                           |   2 +-
 debian/ceph-test.lintian-overrides                 |   5 -
 debian/ceph.NEWS                                   |  56 --
 debian/ceph.bash-completion                        |   1 -
 debian/ceph.init                                   |   1 -
 debian/ceph.install                                |  10 +-
 debian/ceph.lintian-overrides                      |   3 -
 debian/ceph.logrotate                              |   1 -
 debian/ceph.maintscript                            |   1 -
 debian/ceph.rbdmap.init                            |   1 -
 debian/changelog                                   | 246 ++------
 debian/clean                                       |   1 -
 debian/control                                     | 121 ++--
 debian/copyright                                   | 676 ++-------------------
 debian/etc/pm/sleep.d/25-ceph                      |  12 -
 debian/gbp.conf                                    |   3 +-
 debian/libcephfs1.lintian-overrides                |   2 -
 debian/libcephfs1.symbols                          | 273 ---------
 debian/librados2.lintian-overrides                 |   2 -
 debian/librados2.symbols                           | 285 ---------
 debian/librbd1.install                             |   3 +-
 debian/librbd1.symbols                             |  64 --
 debian/man/ceph-crush-location.1                   |  24 -
 debian/man/mount.fuse.ceph.8                       |  30 -
 debian/patches/CVE-2015-5245.patch                 |  31 -
 debian/patches/arch.patch                          |  17 -
 debian/patches/backfill-prio.patch                 | 236 -------
 debian/patches/bash-completion.patch               |  98 ---
 debian/patches/boost-1.57_1.patch                  | 118 ----
 debian/patches/boost-1.57_2.patch                  |  38 --
 debian/patches/boost-1.58.patch                    |  28 -
 debian/patches/bug-11860.patch                     |  24 -
 debian/patches/bug-8342.patch                      |  38 --
 debian/patches/bug-8624a.patch                     |  60 --
 debian/patches/bug-8624b.patch                     |  37 --
 debian/patches/bug-8821.patch                      | 353 -----------
 debian/patches/bug-9341.patch                      | 106 ----
 debian/patches/client-sleep1.patch                 |  46 --
 debian/patches/client-sleep2.patch                 |  41 --
 debian/patches/client-sleep3.patch                 |  44 --
 .../patches/fix-build-without-libatomic-ops.patch  |  32 -
 debian/patches/increaseFileLimit.patch             |  32 +
 debian/patches/modules.patch                       |   9 +-
 debian/patches/rbdmap1-mount.patch                 | 147 -----
 debian/patches/rbdmap2-hooks.patch                 |  99 ---
 debian/patches/rbdmap3-lazyumount.patch            |  51 --
 debian/patches/sample.ceph.conf.patch              | 369 -----------
 debian/patches/series                              |  29 +-
 debian/patches/sleep-recover.patch                 |  18 -
 debian/patches/use_system_jerasure.patch           | 117 ----
 ...er-download.patch => virtualenv-never-download} |   0
 debian/radosgw.bash-completion                     |   1 -
 debian/radosgw.init                                |   1 -
 debian/radosgw.install                             |   1 +
 debian/radosgw.lintian-overrides                   |   3 +
 debian/radosgw.logrotate                           |   1 -
 debian/radosgw.maintscript                         |   1 -
 debian/rules                                       |  34 +-
 src/.git_version                                   |   4 +-
 src/Makefile.in                                    |   2 +-
 src/ceph-disk                                      | 106 ++--
 src/ceph-post-file.in                              |  20 +-
 src/ceph_fuse.cc                                   |   4 +-
 src/ceph_syn.cc                                    |   5 +-
 src/common/Mutex.cc                                |   1 +
 src/common/RWLock.h                                |   3 +-
 src/common/Thread.cc                               |  12 +-
 src/common/Throttle.cc                             |   6 +
 src/common/Throttle.h                              |   3 +-
 src/common/WorkQueue.h                             |  35 +-
 src/common/admin_socket.cc                         |  50 +-
 src/common/admin_socket.h                          |   1 +
 src/common/buffer.cc                               |  23 +-
 src/common/ceph_context.cc                         |   6 +
 src/common/ceph_context.h                          |  19 +
 src/common/config.cc                               |   2 +-
 src/common/config_opts.h                           |  17 +-
 src/common/sync_filesystem.h                       |  12 +-
 src/crush/CrushWrapper.cc                          |  27 +
 src/crush/CrushWrapper.h                           |   1 +
 src/include/interval_set.h                         |   1 +
 src/init-radosgw                                   |  16 +-
 src/init-radosgw.sysv                              |  17 +-
 src/json_spirit/json_spirit_reader_template.h      |  34 +-
 src/libcephfs.cc                                   |  17 +-
 src/librados/IoCtxImpl.cc                          |   4 +-
 src/librados/RadosClient.cc                        |   8 +-
 src/librados/RadosClient.h                         |   4 +-
 src/librbd/AioCompletion.cc                        |  48 +-
 src/librbd/AioCompletion.h                         |  33 +-
 src/librbd/AioRequest.cc                           |  15 +-
 src/librbd/AioRequest.h                            |   6 +-
 src/librbd/ImageCtx.cc                             |  34 +-
 src/librbd/ImageCtx.h                              |   3 +
 src/librbd/internal.cc                             | 183 +++---
 src/librbd/internal.h                              |  17 +-
 src/librbd/librbd.cc                               | 139 ++++-
 src/libs3/debian/changelog                         |   5 +
 src/libs3/debian/changelog.Debian                  |   6 +
 src/libs3/debian/control                           |  12 +
 src/libs3/debian/control.dev                       |  26 +
 src/libs3/debian/postinst                          |   3 +
 src/log/Log.cc                                     |   2 +
 src/mds/MDSUtility.cc                              |   2 +-
 src/messages/MOSDBoot.h                            |  20 +-
 src/mon/AuthMonitor.cc                             |   3 +-
 src/mon/Elector.cc                                 |   9 +-
 src/mon/MDSMonitor.cc                              |  47 +-
 src/mon/MDSMonitor.h                               |   6 +-
 src/mon/MonClient.cc                               |  12 +-
 src/mon/MonCommands.h                              |   4 +-
 src/mon/Monitor.cc                                 |  69 +--
 src/mon/MonitorDBStore.h                           |  19 +-
 src/mon/MonitorStore.cc                            |  16 +-
 src/mon/OSDMonitor.cc                              |  70 ++-
 src/mon/OSDMonitor.h                               |  10 +-
 src/mon/PGMonitor.cc                               |   8 +-
 src/mon/PaxosService.cc                            |  10 +
 src/mon/PaxosService.h                             |   5 +-
 src/msg/Messenger.cc                               |   7 +
 src/msg/Messenger.h                                |  15 +
 src/os/FileJournal.cc                              |  13 +-
 src/os/FileStore.cc                                |   6 +-
 src/os/WBThrottle.cc                               |   1 +
 src/os/chain_xattr.cc                              |   8 +
 src/osd/ECBackend.cc                               |   2 +-
 src/osd/OSD.cc                                     |  61 +-
 src/osd/OSD.h                                      |  36 +-
 src/osd/OSDMap.cc                                  |  14 +-
 src/osd/PG.cc                                      |   6 +-
 src/osd/PGLog.cc                                   |  65 +-
 src/osd/PGLog.h                                    |  19 +-
 src/osd/ReplicatedPG.cc                            | 100 ++-
 src/osd/ReplicatedPG.h                             |   6 +-
 src/osd/osd_types.cc                               | 153 ++++-
 src/osd/osd_types.h                                |  44 +-
 src/osdc/Objecter.cc                               |  92 ++-
 src/osdc/Objecter.h                                |  80 ++-
 src/rgw/logrotate.conf                             |   2 +-
 src/rgw/rgw_civetweb.cc                            |  11 +-
 src/rgw/rgw_client_io.cc                           |   7 +-
 src/rgw/rgw_main.cc                                |   2 +-
 src/rgw/rgw_op.cc                                  |  13 +
 src/rgw/rgw_rados.cc                               |  35 ++
 src/rgw/rgw_rados.h                                |  11 +
 src/rgw/rgw_rest.cc                                |  34 +-
 src/rgw/rgw_rest.h                                 |   8 +-
 src/rgw/rgw_rest_swift.cc                          |  43 +-
 src/rgw/rgw_swift.cc                               |   5 +
 src/test/Makefile.am                               |   2 +-
 src/test/bufferlist.cc                             |  11 +
 src/test/librados/TestCase.cc                      |   9 +-
 src/test/librados/tier.cc                          | 215 ++++++-
 src/test/librbd/test_librbd.cc                     |  71 ++-
 src/test/mon/test_mon_workloadgen.cc               |   3 +-
 src/test/objectstore/chain_xattr.cc                |  39 ++
 src/test/osd/TestPGLog.cc                          |  84 ++-
 src/tools/ceph_authtool.cc                         |   2 +-
 src/upstart/ceph-mds.conf                          |   2 +-
 src/upstart/ceph-mon.conf                          |   2 +-
 src/upstart/ceph-osd.conf                          |   2 +-
 177 files changed, 2335 insertions(+), 4623 deletions(-)

diff --cc debian/ceph-common.install
index 755b575,0000000..e341a06
mode 100644,000000..100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@@ -1,22 -1,0 +1,24 @@@
++etc/bash_completion.d/rados
++etc/bash_completion.d/rbd
 +usr/bin/ceph
 +usr/bin/ceph-authtool
 +usr/bin/ceph-conf
 +usr/bin/ceph-crush-location
 +usr/bin/ceph-dencoder
 +usr/bin/ceph-post-file
 +usr/bin/ceph-rest-api
 +usr/bin/ceph-syn
 +usr/bin/rados
 +usr/bin/rbd
 +usr/share/ceph/id_dsa_drop.ceph.com
 +usr/share/ceph/id_dsa_drop.ceph.com.pub
 +usr/share/ceph/known_hosts_drop.ceph.com
 +usr/share/man/man8/ceph-authtool.8
 +usr/share/man/man8/ceph-conf.8
 +usr/share/man/man8/ceph-dencoder.8
 +usr/share/man/man8/ceph-post-file.8
 +usr/share/man/man8/ceph-rest-api.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
diff --cc debian/ceph-mds.lintian-overrides
index c883954,0000000..7fc94db
mode 100644,000000..100644
--- a/debian/ceph-mds.lintian-overrides
+++ b/debian/ceph-mds.lintian-overrides
@@@ -1,13 -1,0 +1,10 @@@
- # False-positives:
- spelling-error-in-binary * tEH the
- 
 +# Ceph upstart configuration don't have equivalent init scripts
 +ceph-mds: init.d-script-not-marked-as-conffile etc/init.d/ceph-mds-all
 +ceph-mds: init.d-script-not-included-in-package etc/init.d/ceph-mds-all
 +ceph-mds: init.d-script-not-marked-as-conffile etc/init.d/ceph-mds
 +ceph-mds: init.d-script-not-included-in-package etc/init.d/ceph-mds
 +ceph-mds: init.d-script-not-marked-as-conffile etc/init.d/ceph-mds-all-starter
 +ceph-mds: init.d-script-not-included-in-package etc/init.d/ceph-mds-all-starter
 +ceph-mds: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mds-all
 +ceph-mds: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mds
 +ceph-mds: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mds-all-starter
diff --cc debian/ceph-test.install
index a37c4a5,0000000..1d98f72
mode 100644,000000..100644
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@@ -1,27 -1,0 +1,27 @@@
 +usr/bin/ceph-coverage /usr/lib/ceph/bin
 +usr/bin/ceph-kvstore-tool /usr/lib/ceph/bin
 +usr/bin/ceph-monstore-tool /usr/lib/ceph/bin
++usr/bin/ceph-objectstore-tool /usr/lib/ceph/bin
 +usr/bin/ceph-osdomap-tool /usr/lib/ceph/bin
 +usr/bin/ceph_bench_log /usr/lib/ceph/bin
 +usr/bin/ceph_dupstore /usr/lib/ceph/bin
 +usr/bin/ceph_erasure_code /usr/lib/ceph/bin
 +usr/bin/ceph_erasure_code_benchmark /usr/lib/ceph/bin
- usr/bin/ceph-objectstore-tool /usr/lib/ceph/bin
 +usr/bin/ceph_kvstorebench /usr/lib/ceph/bin
 +usr/bin/ceph_multi_stress_watch /usr/lib/ceph/bin
 +usr/bin/ceph_omapbench /usr/lib/ceph/bin
 +usr/bin/ceph_psim /usr/lib/ceph/bin
 +usr/bin/ceph_radosacl /usr/lib/ceph/bin
 +usr/bin/ceph_rgw_jsonparser /usr/lib/ceph/bin
 +usr/bin/ceph_rgw_multiparser /usr/lib/ceph/bin
 +usr/bin/ceph_scratchtool /usr/lib/ceph/bin
 +usr/bin/ceph_scratchtoolpp /usr/lib/ceph/bin
 +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
 +usr/share/java/libcephfs-test.jar
diff --cc debian/ceph.install
index d8fb0e1,0000000..29c237d
mode 100644,000000..100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@@ -1,33 -1,0 +1,33 @@@
- debian/etc/pm/sleep.d/*    /etc/pm/sleep.d/
++../../src/rbdmap etc/ceph
++../../udev/60-ceph-partuuid-workaround.rules lib/udev/rules.d
++../../udev/95-ceph-osd.rules lib/udev/rules.d
++etc/bash_completion.d/ceph
 +sbin/mkcephfs
 +usr/bin/ceph-clsinfo
 +usr/bin/ceph-debugpack
 +usr/bin/ceph-mon
 +usr/bin/ceph-osd
 +usr/bin/ceph-run
 +usr/bin/ceph_mon_store_converter
 +usr/bin/crushtool
 +usr/bin/monmaptool
 +usr/bin/osdmaptool
 +usr/lib/*/ceph/ceph_common.sh
 +usr/lib/*/ceph/erasure-code/libec_jerasure*.so
 +usr/lib/*/rados-classes/*.so
 +usr/sbin/ceph-create-keys
 +usr/sbin/ceph-disk
 +usr/sbin/ceph-disk-activate
 +usr/sbin/ceph-disk-prepare
 +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-disk.8
 +usr/share/man/man8/ceph-mon.8
 +usr/share/man/man8/ceph-osd.8
 +usr/share/man/man8/ceph-run.8
 +usr/share/man/man8/crushtool.8
 +usr/share/man/man8/mkcephfs.8
 +usr/share/man/man8/monmaptool.8
 +usr/share/man/man8/osdmaptool.8
- ## install from source tree
- src/rbdmap                               /etc/ceph
- udev/60-ceph-partuuid-workaround.rules   /lib/udev/rules.d
- udev/95-ceph-osd.rules                   /lib/udev/rules.d
diff --cc debian/ceph.lintian-overrides
index 9568da6,0000000..2d71ebc
mode 100644,000000..100644
--- a/debian/ceph.lintian-overrides
+++ b/debian/ceph.lintian-overrides
@@@ -1,29 -1,0 +1,26 @@@
- # False-positives:
- spelling-error-in-binary * tEH the
- 
 +# Ceph upstart configurations don't have init.d equivalents
 +ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-create-keys
 +ceph: init.d-script-not-included-in-package etc/init.d/ceph-create-keys
 +ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon
 +ceph: init.d-script-not-included-in-package etc/init.d/ceph-mon
 +ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd-all
 +ceph: init.d-script-not-included-in-package etc/init.d/ceph-osd-all
 +ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon-all
 +ceph: init.d-script-not-included-in-package etc/init.d/ceph-mon-all
 +ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd
 +ceph: init.d-script-not-included-in-package etc/init.d/ceph-osd
 +ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-all
 +ceph: init.d-script-not-included-in-package etc/init.d/ceph-all
 +ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon-all-starter
 +ceph: init.d-script-not-included-in-package etc/init.d/ceph-mon-all-starter
 +ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd-all-starter
 +ceph: init.d-script-not-included-in-package etc/init.d/ceph-osd-all-starter
 +ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon-all-starter
 +ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd
 +ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd-all
 +ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon
 +ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-create-keys
 +ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon-all
 +ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/rbdmap
 +ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-all
 +ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd-all-starter
diff --cc debian/changelog
index a1394e4,0000000..8360c47
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,477 -1,0 +1,365 @@@
- ceph (0.80.10-2) unstable; urgency=medium
++ceph (0.80.11-0ubuntu1.14.04.1) trusty; urgency=medium
 +
-   * [2d1482] Add upstream patch to fix building without libatomic-ops
-     (Closes: #801477)
-   * [4d408f] Remove build dependency on libatomic-ops-dev for armel
++  * New upstream stable point release (LP: #1535278):
++    - d/p/ceph-radosgw-init.patch
++      d/p/zap-in-two-phases.patch: Dropped, included upstream.
++    - d/p/increaseFileLimit.patch: Refresh.
 +
-  -- Gaudenz Steinlin <gaudenz at debian.org>  Mon, 12 Oct 2015 18:47:17 +0200
++ -- James Page <james.page at ubuntu.com>  Mon, 18 Jan 2016 14:25:14 +0000
 +
- ceph (0.80.10-1) unstable; urgency=medium
++ceph (0.80.10-0ubuntu1.14.04.3) trusty; urgency=medium
 +
-   * [469085] Imported Upstream version 0.80.10
-   * [3d6549] Refresh backfill-prio.patch
-   * [c8b478] Add upstream patch to fix compiling with boost 1.58
-     (Closes: #795178)
-   * [6fc46b] Add bug-11860.patch to fix quotes in bucket header for rgw
-   * [d3c87f] Add upstream patch to fix CVE-2015-5245 (Closes: #798567)
-   * [d29942] ceph-test: ceph_filestore_dump and ceph_filestore_tool
-     replaced by ceph-objectstore-tool
-   * [ad1248] Add upstream patches to fix compiling with boost 1.57
-   * [186e1e] Use dh_bash-completion to install bash completions
-   * [901a83] Remove no longer needed check for dh-autoreconf>=6
-   * [b5feba] Add build dependency on dh-python
++  * d/p/ceph-radosgw-init.patch: Cherry pick patch from upstream VCS to
++    ensure that restarts of the radosgw wait an appropriate amount of time
++    for the existing daemon to shutdown (LP: #1477225).
 +
-  -- Gaudenz Steinlin <gaudenz at debian.org>  Wed, 07 Oct 2015 11:54:58 +0200
++ -- Liam Young <liam.young at canonical.com>  Mon, 07 Sep 2015 16:00:31 +0100
 +
- ceph (0.80.9-2) unstable; urgency=medium
++ceph (0.80.10-0ubuntu1.14.04.2) trusty; urgency=medium
 +
-   * [70fc1d] Add NEWS entry about CRUSH issues fixed in 0.80.9
-   * [f41bb6] Add NEWS entry about rbd backed filesystems and systemd
++  * Switch to two step 'zapping' of disks, ensuring that disks with invalid
++    metadata don't cause hangs are fully cleaned and initialized prior
++    to use (LP: #1475247).
 +
-  -- Gaudenz Steinlin <gaudenz at debian.org>  Tue, 05 May 2015 21:29:15 +0200
++ -- Christopher Glass (Canonical) <christopher.glass at canonical.com>  Mon, 10 Aug 2015 11:00:44 +0100
 +
- ceph (0.80.9-1) unstable; urgency=medium
++ceph (0.80.10-0ubuntu0.14.04.1) trusty; urgency=medium
 +
-   * [4b4e] Imported Upstream version 0.80.9
-   * [7102] Remove patches firefly-latest and p2139 applied upstream
-   * [5869] Add myself to uploaders
++  * New upstream stable point release (LP: #1477174):
++    - d/ceph.install: Add manpage for ceph-disk.
++    - d/ceph-common.install: Replace ceph_filestore_* with
++      ceph-objectstore-tool.
++    - d/control: Ensure ceph-test-dbg depends on ceph-test only.
++    - d/p/fix-python-rados-memleak.patch: Dropped included upstream.
 +
-  -- Gaudenz Steinlin <gaudenz at debian.org>  Mon, 04 May 2015 08:49:37 +0200
++ -- James Page <james.page at ubuntu.com>  Wed, 22 Jul 2015 17:12:16 +0100
 +
- ceph (0.80.7-2) unstable; urgency=medium
++ceph (0.80.9-0ubuntu0.14.04.2) trusty; urgency=medium
 +
-   * Team upload.
-   * Build-Depends: +libjerasure-dev (>= 2.0.0-2~)
-   * New patch to use system "jerasure" library instead of its bundled copy.
-   * Removed myself from Uploaders.
++  * Fix memory leak in rados.py (LP: #1425164):
++    - d/p/fix-python-rados-memleak.patch: patches the rados.py Ioctx
++      class to remove circular dependencies which prevent python from
++      garbage collecting object references.
 +
-  -- Dmitry Smirnov <onlyjob at debian.org>  Thu, 11 Dec 2014 12:55:38 +1100
++ -- Billy Olsen <billy.olsen at canonical.com>  Tue, 14 Apr 2015 09:34:42 +0100
 +
- ceph (0.80.7-1) unstable; urgency=medium
++ceph (0.80.9-0ubuntu0.14.04.1) trusty; urgency=medium
 +
-   * New upstream release [October 2014].
-   * Minor update to long description of "rbd-fuse" (Closes: #765462).
- 
-  -- Dmitry Smirnov <onlyjob at debian.org>  Thu, 16 Oct 2014 04:36:23 +1100
- 
- ceph (0.80.6-1) unstable; urgency=medium
++  [ James Page ]
++  * New upstream stable point release (LP: #1413917).
 +
-   * New upstream release [October 2014].
-   * Standards-Version: 3.9.6.
++  [ Dave Chiluk ]
++  * Increase file limit to prevent hitting the file limit on large
++    installations (LP: #1420647)
 +
-  -- Dmitry Smirnov <onlyjob at debian.org>  Thu, 02 Oct 2014 23:07:04 +1000
++ -- James Page <james.page at ubuntu.com>  Wed, 11 Mar 2015 09:14:35 +0000
 +
- ceph (0.80.5-2) unstable; urgency=low
++ceph (0.80.8-0ubuntu0.14.04.1) trusty; urgency=low
 +
-   * Patchworks:
-     + new patch for Ceph#9341 to dramatically (e.g seconds instead of
-       hours) reduce rejoin (i.e. MDS restart) time (fuse clients).
-     + new "p2139.patch".
-     + new patch with fixes from Firefly HEAD;
-       includes patch to fix FTBFS on alpha (Closes: #756892).
-       updated "librbd1.symbols";
-   * Build-Depends: mark "yasm" as [amd64] (Closes: #760383).
-   * Recommends: + "time-daemon | chrony".
++  * New upstream stable point release (LP: #1413917).
 +
-  -- Dmitry Smirnov <onlyjob at debian.org>  Tue, 16 Sep 2014 03:54:15 +1000
++ -- James Page <james.page at ubuntu.com>  Fri, 23 Jan 2015 16:29:08 +0000
 +
- ceph (0.80.5-1) unstable; urgency=medium
++ceph (0.80.7-0ubuntu0.14.04.1) trusty; urgency=medium
 +
-   * New upstream stable release:
-     - d/p/firefly-post-release.patch: Dropped, no longer required.
-     - d/lib{rados2,cephfs1}.symbols: Update with new symbols.
++  * New upstream stable point release (LP: #1381410).
 +
-  -- James Page <jamespage at debian.org>  Wed, 30 Jul 2014 10:15:40 +0100
++ -- James Page <james.page at ubuntu.com>  Wed, 12 Nov 2014 11:31:46 +0000
 +
- ceph (0.80.4-1) unstable; urgency=medium
++ceph (0.80.5-0ubuntu0.14.04.1) trusty; urgency=medium
 +
-   * New upstream release [July 2014].
-   * New patches:
-     + rbdmap1-mount.patch
-     + rbdmap2-hooks.patch
-     + rbdmap3-lazyumount.patch
-     + bug-8821.patch
-   * radosgw: removed unused lintian overrides.
++  * New upstream stable point release (LP: #1346166).
 +
-  -- Dmitry Smirnov <onlyjob at debian.org>  Fri, 18 Jul 2014 02:33:39 +1000
++ -- James Page <james.page at ubuntu.com>  Mon, 04 Aug 2014 08:09:39 +0100
 +
- ceph (0.80.1-2) unstable; urgency=low
++ceph (0.80.4-0ubuntu0.14.04.1) trusty; urgency=medium
 +
-   * Megapatch from "firefly" branch with post-0.80.1 fixes.
-   * Patches for upstream bugs 8342, 8624 and some cherry-picks.
-   * New "bash-completion.patch" with Bash completion improvements.
-   * New patch to fix FTBFS on 'hppa' (Closes: #748571).
-   * "sample.ceph.conf.patch": minor update.
++  * New upstream stable point release (LP: #1346166):
++    - d/p/bug-8428.patch: Dropped, included upstream.
 +
-  -- Dmitry Smirnov <onlyjob at debian.org>  Sat, 05 Jul 2014 20:29:44 +1000
++ -- James Page <james.page at ubuntu.com>  Mon, 21 Jul 2014 12:04:25 +0100
 +
- ceph (0.80.1-1) unstable; urgency=low
++ceph (0.80.1-0ubuntu1.1) trusty; urgency=medium
 +
-   * New upstream release [May 2014].
-   * Dropped all backported patches.
-   * New "sleep-recover" and "client-sleep[1,2,3]" patches to fix
-     fuse-client hang after resume from suspend [#8291]; thanks, Zheng Yan.
-   * New "gcj_search_path.patch" to find "jni.h" with gcj-jdk v4.9.0.
++  * Fix issue setting Swift ACL's on existing containers (LP: #1322498):
++    - d/p/bug-8428.patch: Cherry pick proposed fix from upstream VCS.
 +
-  -- Dmitry Smirnov <onlyjob at debian.org>  Wed, 14 May 2014 09:24:15 +1000
++ -- James Page <james.page at ubuntu.com>  Mon, 02 Jun 2014 09:09:37 +0100
 +
- ceph (0.80-1) unstable; urgency=low
++ceph (0.80.1-0ubuntu1) trusty; urgency=medium
 +
-   * New upstream release [May 2014].
-     + upload to unstable.
-   * Updated "README.Debian".
-   * Updated "debian/copyright"; Thanks, László Böszörményi.
-   * Added backported patches:
-       [8113, 8175, 8282, 8291, bp0001, sample.ceph.conf].
-   * "gbp.conf": don't merge to experimental.
-   * lintian-overrides: spelling-error-in-binary * tEH the.
++  * New upstream release stable point release (LP: #1278466).
 +
-  -- Dmitry Smirnov <onlyjob at debian.org>  Wed, 07 May 2014 16:43:07 +1000
++ -- James Page <james.page at ubuntu.com>  Wed, 14 May 2014 11:09:37 -0400
 +
- ceph (0.80~rc1-1) experimental; urgency=low
++ceph (0.80-0ubuntu1) trusty; urgency=medium
 +
-   * New upstream pre-release.
-   * Minor re-factoring of udev rules installation.
-   * ceph-common: added ceph-crush-location.1 man page.
-   * ceph-test-dbg: fixed Depends.
++  * New upstream release stable release (LP: #1278466).
 +
-  -- Dmitry Smirnov <onlyjob at debian.org>  Thu, 24 Apr 2014 02:52:12 +1000
++ -- James Page <james.page at ubuntu.com>  Sun, 11 May 2014 09:54:31 -0400
 +
- ceph (0.79-3) experimental; urgency=low
++ceph (0.79-0ubuntu1) trusty; urgency=medium
 +
-   * New "arch.patch" to detect build architecture using dpkg-architecture.
-   * Mark amd64-only symbols as such.
-   * Minor rules cleanup.
++  * New upstream release (LP: #1278466):
++    - d/p/modules.patch: Refreshed.
++    - d/ceph.install: Install all jerasure modules.
 +
-  -- Dmitry Smirnov <onlyjob at debian.org>  Sat, 19 Apr 2014 15:56:37 +1000
++ -- James Page <james.page at ubuntu.com>  Wed, 09 Apr 2014 11:14:03 +0100
 +
- ceph (0.79-2) experimental; urgency=low
- 
-   [ James Page ]
-   * d/p/modules.patch,d/ceph.install: Mark all jerasure plugins as modules
-     and ensure they are all installed.
- 
-   [ Dmitry Smirnov ]
-   * Patchworks:
-     - removed unused "defaults-leveldb-osd.patch".
-     + improved description of "modules.patch". Thanks, James Page.
-     + added new backported patches [#5469, #8008, _1606, spelling].
-   * Added .symbols and "dh_makeshlibs -V" shlibs tightening (Closes: #744382).
-   * README.Debian: added note regarding kernel client mount option.
-   * copyright: added license for man files.
-   * control: "Suggests: logrotate".
- 
-  -- Dmitry Smirnov <onlyjob at debian.org>  Fri, 18 Apr 2014 18:27:01 +1000
- 
- ceph (0.79-1) experimental; urgency=low
- 
-   * New upstream release [April 2014].
-   * Tighten dependency on ceph-common.
-   * Install pm-suspend handler to stop/start ceph services on suspend/resume.
-   * New (inactive) patch to bump OSD's leveldb defaults.
-   * Patches dropped (applied-upstream):
-     - init.patch
-     - logrotate.patch
-     - fix-defaultweight.patch
-   * Refreshed "modules.patch".
- 
-  -- Dmitry Smirnov <onlyjob at debian.org>  Tue, 08 Apr 2014 16:52:04 +1000
- 
- ceph (0.78-2) experimental; urgency=low
- 
-   * Standards to 3.9.5.
-   * debian/copyright: reviewed and updated.
-   * ceph-test: added lintian-override for "binary-without-manpage".
-   * Patchworks:
-     + refreshed/renamed/reordered "virtualenv-never-download.patch".
-     + new "init.patch" for init.d scripts lintianisation.
-     + new "logrotate.patch" to avoid rotating empty logs.
-     + new "fix-defaultweight.patch" to fix weight calculation on OSD start.
-     + new "gcj.patch" with partial fix to FTBFS with gcj-jdk.
-   * Use symlinks to simplify installation of init.d and logrotate scripts.
-   * Added retrospective changelog entry to mention new B-D "libblkid-dev".
-   * Added "debian/clean file".
-   * Added "README.Debian" file with some hopefully useful notes.
-   * Added "mount.fuse.ceph.8" man page.
-   * rules:
-     + "dh --with" optimised.
-     + set JAVAC to prevent FTBFS due to incorrect use of 'gcj', when detected.
-     + verbose mode for 'cp' and 'rm' commands.
-     + build with "--as-needed" to minimise needless linking.
-   * control:
-     + lintian/duplicate-short-description + consistent capitalisation.
-     + removed needless versioned dependencies from Build-Depends.
-     + added myself to Uploaders.
- 
-  -- Dmitry Smirnov <onlyjob at debian.org>  Tue, 25 Mar 2014 07:17:40 +1100
- 
- ceph (0.78-1) experimental; urgency=medium
++ceph (0.78-0ubuntu1) trusty; urgency=medium
 +
 +  * New upstream release:
-     - d/control: Add "xfslib-dev" and "libblkid-dev" to BD's.
++    - d/control: Add xfslib-dev to BD's.
 +    - d/*: Sync relevant packaging changes from upstream.
 +    - d/p/*: Drop upstreamed patches.
 +    - d/p/modules.patch: Mark libcls_user.so and libec_jerasure.so as modules.
 +    - d/ceph.install: Only install libec_jerasure.so.
 +  * d/ceph-test.install: Install test binaries to /usr/lib/ceph/bin; they
 +    really don't need to be installed on the default path.
 +  * d/{ceph|radosgw|ceph-mds}.lintian-overrides: Add overrides for intentional
 +    difference in naming and structure between upstart configurations and
 +    init.d scripts.
 +
 + -- James Page <james.page at ubuntu.com>  Sat, 22 Mar 2014 18:27:40 +0000
 +
- ceph (0.72.2-3) unstable; urgency=medium
- 
-   * Team upload.
- 
-   [ James Page ]
-   * d/ceph-test.install: Install test binaries to /usr/lib/ceph/bin; they
-     really don't need to be installed on the default path.
- 
-   [ Dmitry Smirnov ]
-   * Tightened shlibs with "dh_makeshlibs -V" (Closes: #679686).
- 
-  -- Dmitry Smirnov <onlyjob at debian.org>  Mon, 14 Apr 2014 17:28:20 +1000
- 
 +ceph (0.72.2-2) unstable; urgency=medium
 +
 +  * d/radosgw.{postinst,postrm,preinst}: Handle renaming of radosgw
 +    upstart configuration on upgrade at 0.72.1-3.
 +  * d/{ceph|ceph-mds|radosgw}.{postinst|prerm}: Check to ensure that system
 +    is running upstart before trying to start/stop upstart configurations
 +    (Closes: #734241, #738845, #738845).
 +
 + -- James Page <jamespage at debian.org>  Sat, 08 Mar 2014 16:48:28 +0000
 +
 +ceph (0.72.2-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +
 + -- James Page <james.page at ubuntu.com>  Wed, 01 Jan 2014 09:32:03 +0000
 +
 +ceph (0.72.1-3) unstable; urgency=low
 +
 +  * d/rules,ceph.install: Correct install paths for ceph-* helpers. 
 +  * d/p/modules: Mark libcls_kvs.so as module.
 +  * d/rules: Rename radosgw upstart configuration to radosgw-instance to
 +    avoid namespace conflict with init script which breaks backwards
 +    compatibility (LP: #1255464).
 +
 + -- James Page <james.page at ubuntu.com>  Wed, 27 Nov 2013 10:52:48 +0000
 +
 +ceph (0.72.1-2) unstable; urgency=low
 +
 +  * Fix upgrade failures from ceph < 0.67.3-1 (Closes: #728164):
 +    - d/control: ceph-mds Breaks/Replaces ceph (<< 0.67.3-1).
 +    - d/control: ceph-fs-common Breaks/Replaces ceph-common (<< 0.67.3-1).
 +  * d/rules,control: Use google-perftools on armhf and powerpc archs.
 +
 + -- James Page <james.page at ubuntu.com>  Mon, 25 Nov 2013 10:13:19 +0000
 +
 +ceph (0.72.1-1) unstable; urgency=low
 +
 +  * New upstream stable release:
 +    - d/ceph-test.install: Add new ceph_filestore_tool, ceph-kvstore-tool
 +      and ceph_test_cls_hello binaries, drop ceph_test_store_tool.
 +    - d/ceph-common.install: Add new ceph-post-file binary and manpage.
 +    - d/ceph.install: Tweaked install path /usr/sbin -> /sbin.
 +    - d/control: Add new BD's on python-nose and yasm.
 +    - d/copyright: Updates inline with changes in codebase.
 +    - d/ceph.install,rules: Install rbdmap init file using dh_installinit.
 +    - Refresh patches.
 +  * d/control,rules: Disable unit testing; it requires a forked version of
 +    cram and is still trying to download dependencies using virtualenv.
 +
 + -- James Page <james.page at ubuntu.com>  Fri, 22 Nov 2013 13:02:29 +0000
 +
 +ceph (0.67.3-1) unstable; urgency=low
 +
 +  [ Laszlo Boszormenyi ]
 +  * New upstream release (Closes: #693866, #705262).
 +  * Update debian/copyright.
 +  * Sync with Ubuntu.
 +
 +  [ James Page ]
 +  * d/control,rules,libcephfs-{java,jni}: Enable Java CephFS library,
 +    add new BD's on javahelper and default-jdk, add dbg package.
 +  * d/control: Add new BD on libboost-thread-dev for RADOS Gateway
 +    keystone integration.
 +  * d/{control,obsync.install}: Drop obsync package inline with
 +    upstream.
 +  * d/librbd-dev.install: Pickup new features.h file.
 +  * Remove manual calls to ldconfig:
 +    - d/lib{rados2|rbd1|cephfs1}.post*: Dropped - all these do is call
 +      ldconfig which will automatically be done. 
 +    - d/rules: Let dh_makeshlibs do its magic with postinst/postrm.
 +  * d/tests/*: Added autopkgtests for librbd, librados, python-ceph
 +    and the ceph CLI.
 +  * d/control: Fix versions of librbd1, librados2 and libcephfs1 for
 +    python-ceph as it requires an exact version match.
 +  * d/ceph.docs: Drop - README from upstream is only useful for developers
 +    (Closes: #722957).
 +  * d/rules: Drop --upstart-only from dh_installinit calls for upstart
 +    configurations; this is deprecated in Ubuntu and not support in Debian.
 +  * d/rules: Exclude jni package from shlibs generation to avoid pointless
 +    ldconfig calls in maintainer scripts.
 +
 +  [ Bastian Blank ]
 +  * Use debhelper 9.
 +  * Use dh-autoreconf.
 +  * Install files from source tree if possible.
 +  * Run test-suite:
 +    - Build-depend on python-virtualenv.
 +    - Ask virtualenv to never download anything.
 +  * Fix clean target.
 +  * Properly mark library modules:
 +    - Don't longer exclude them from stripping.
 +  * Drop all libtool .la files.
 +  * Generate python dependencies.
 +  * Don't exclude stuff from shlibs generation.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.org>  Tue, 01 Oct 2013 02:29:08 +0200
 +
 +ceph (0.48-1) unstable; urgency=low
 +
 +  * New upstream release, the first with long-term support.
 +  * As gceph dropped by upstream, remove it from packaging.
 +  * Build with hardening enabled and build-conflict with libcryptopp not to
 +    mix up with libnss.
 +  * Use symbol versioning (closes: #679686).
 +  * Update debian/watch to GitHub tags.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sat, 07 Jul 2012 07:53:40 +0200
 +
 +ceph (0.47.2-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Use system leveldb (closes: #667907).
 +  * Remove librgw1 , librgw-dev and librgw1-dbg and add rest-bench and
 +    rest-bench-dbg packages.
 +  * Backport leveldb build fixes from upstream git as
 +    fix_leveldb_dep_for_system_library_case.patch and
 +    fix_leveldb_includes_for_system_library_case.patch .
 +  * Update packaging.
 +  * Sync with Ubuntu: switch build-dependency from libcryptopp to libnss as
 +    libcryptopp is not seeded.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sun, 03 Jun 2012 13:37:52 +0200
 +
 +ceph (0.44.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Fri, 06 Apr 2012 01:10:15 +0200
 +
 +ceph (0.43-1) unstable; urgency=low
 +
 +  * New upstream release, now creates /var/run/ceph on each start
 +    (closes: #660238).
 +  * Update debian/copyright .
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sun, 26 Feb 2012 04:07:02 +0100
 +
 +ceph (0.41-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sun, 05 Feb 2012 10:07:38 +0100
 +
 +ceph (0.40-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #652037).
 +  * Adjust copyright to match upstream source changes.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sat, 14 Jan 2012 12:01:30 +0100
 +
 +ceph (0.38-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #647764), missingok is now part of logrotate
 +    directives (closes: #645651).
 +  * Rename ceph-client-tools package to ceph-common , libceph-dev to
 +    libcephfs-dev and libceph1{,-dbg} ones to libcephfs1{,-dbg} respectively.
 +  * Update upstream VCS locations.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sun, 27 Nov 2011 21:40:52 +0100
 +
 +ceph (0.35-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sat, 24 Sep 2011 16:51:57 +0200
 +
 +ceph (0.34-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #638714).
 +  * Make librbd-dev depends on librados-dev as it uses headers from the latter
 +    (closes: #636845).
 +  * Add new binary packages, gceph, gceph-dbg and obsync . The libcrush ones
 +    removed.
 +  * Change to quilt source format and tune packaging.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sun, 28 Aug 2011 15:56:16 +0200
 +
 +ceph (0.27-1.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Remove references to other libraries from dependency_libs field
 +    (closes: #621208). 
 +
 + -- Luk Claes <luk at debian.org>  Sat, 28 May 2011 22:28:48 +0200
 +
 +ceph (0.27-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Mon, 25 Apr 2011 10:09:05 +0200
 +
 +ceph (0.25.2-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Make Ceph cross buildable (closes: #618939), thanks to Hector Oron.
 +  * Disable libatomic-ops on ARMv4t (armel) archs to prevent FTBFS
 +    (closes: #615235), thanks go to Hector Oron again.
 +  * Rename librados1{,-dbg,-dev} packages to librados2{,-dbg,-dev} ones;
 +    conflict with and replace the former ones.
 +  * Add librbd1 and librbd-dev packages.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sun, 27 Mar 2011 15:51:23 +0200
 +
 +ceph (0.24.3-2) unstable; urgency=low
 +
 +  * Make Ceph Linux only and build on all Linux archs (closes: #614890).
 +  * Support parallel building via DEB_BUILD_OPTIONS .
 +  * Add watch file, thanks to Clint Byrum (closes: #615021).
 +  * Tune packaging.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Fri, 25 Feb 2011 15:17:26 +0100
 +
 +ceph (0.24.3-1) unstable; urgency=low
 +
 +  * New upstream bugfix release.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sat, 19 Feb 2011 12:25:43 +0100
 +
 +ceph (0.24.2-1) unstable; urgency=low
 +
 +  * New upstream bugfix release.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sat, 29 Jan 2011 15:25:14 +0100
 +
 +ceph (0.24.1-1) unstable; urgency=low
 +
 +  * New upstream bugfix release.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Tue, 11 Jan 2011 22:23:18 +0100
 +
 +ceph (0.24-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Wed, 01 Dec 2010 09:26:25 -0800
 +
 +ceph (0.23.1-1) experimental; urgency=low
 +
 +  * Initial release (Closes: #506040)
 +
 + -- Sage Weil <sage at newdream.net>  Sun, 21 Nov 2010 15:22:21 -0800
diff --cc debian/control
index 0e1f9b0,0000000..f6d852b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,471 -1,0 +1,468 @@@
 +Source: ceph
 +Section: admin
 +Priority: optional
- Maintainer: Ceph Maintainers <ceph-maintainers at lists.ceph.com>
++Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
++XSBC-Original-Maintainer: Ceph Maintainers <ceph-maintainers at lists.ceph.com>
 +Uploaders: Laszlo Boszormenyi (GCS) <gcs at debian.org>,
-            James Page <jamespage at debian.org>,
-            Gaudenz Steinlin <gaudenz at debian.org>
++           James Page <jamespage 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: bash-completion,
-                debhelper (>= 9~),
++Build-Depends: debhelper (>= 9~),
 +               default-jdk,
 +               dh-autoreconf,
-                dh-python,
 +               dpkg-dev (>= 1.16.1~),
 +               javahelper,
 +               junit4,
 +               libaio-dev,
-                libatomic-ops-dev [!armel],
-                libblkid-dev,
-                libboost-dev,
-                libboost-program-options-dev,
-                libboost-system-dev,
-                libboost-thread-dev,
++               libatomic-ops-dev,
++               libblkid-dev (>= 2.17),
++               libboost-dev (>= 1.42),
++               libboost-program-options-dev (>= 1.42),
++               libboost-system-dev (>= 1.42),
++               libboost-thread-dev (>= 1.42),
 +               libcurl4-gnutls-dev,
 +               libedit-dev,
 +               libexpat1-dev,
 +               libfcgi-dev,
 +               libfuse-dev,
 +               libgoogle-perftools-dev [i386 amd64 powerpc armhf ppc64el],
-                libjerasure-dev (>= 2.0.0-2~),
 +               libkeyutils-dev,
 +               libleveldb-dev,
 +               libnss3-dev,
 +               libs3-dev,
 +               libsnappy-dev,
 +               libtool,
 +               libxml2-dev,
 +               pkg-config,
 +               python-all (>= 2.6.6-3~),
 +               python-nose,
 +               uuid-dev,
 +               uuid-runtime,
 +               xfslibs-dev,
-                yasm [amd64]
++               yasm
 +Build-Conflicts: libcrypto++-dev
- Standards-Version: 3.9.6
++Standards-Version: 3.9.4
 +X-Python-Version: >= 2.6
 +XS-Testsuite: autopkgtest
 +
 +Package: ceph
 +Architecture: linux-any
 +Depends: binutils,
-          ceph-common (= ${binary:Version}),
++         ceph-common,
 +         cryptsetup-bin | cryptsetup,
 +         gdisk,
 +         hdparm | sdparm,
 +         parted,
 +         uuid-runtime,
 +         xfsprogs,
 +         ${misc:Depends},
 +         ${python:Depends},
 +         ${shlibs:Depends}
 +Pre-Depends: ${misc:Pre-Depends}
 +Conflicts: gceph, librgw-dev, librgw1, librgw1-dbg, obsync
 +Replaces: gceph, librgw-dev, librgw1, librgw1-dbg, obsync
- Recommends: libcephfs1, librados2, librbd1, time-daemon | chrony
- Suggests: logrotate
++Recommends: libcephfs1, librados2, librbd1
 +Description: distributed storage and file system
 + Ceph is a distributed storage system designed to provide excellent
 + performance, reliability, and scalability.
 + .
 + This package contains all server daemons and management tools for creating,
 + running, and administering a Ceph storage cluster, with the exception of the
 + metadata server, which is necessary for using the distributed file system
 + and is provided by the ceph-mds package.
 +
 +Package: ceph-dbg
 +Architecture: linux-any
 +Section: debug
 +Priority: extra
 +Depends: ceph (= ${binary:Version}), ${misc:Depends}
 +Conflicts: gceph-dbg
 +Replaces: gceph-dbg
 +Description: debugging symbols for ceph
 + Ceph is a distributed storage system designed to provide excellent
 + performance, reliability, and scalability.
 + .
 + This package contains the debugging symbols for ceph.
 +
- Package: ceph-common
- Architecture: linux-any
- Depends: librbd1 (= ${binary:Version}),
-          python-ceph (= ${binary:Version}),
-          ${misc:Depends},
-          ${python:Depends},
-          ${shlibs:Depends}
- Conflicts: ceph-client-tools
- Replaces: ceph-client-tools
- Suggests: ceph, ceph-mds
- Description: common utilities to mount and interact with a ceph storage cluster
-  Ceph is a distributed storage and file system designed to provide
-  excellent performance, reliability, and scalability.  This is a collection
-  of common tools that allow one to interact with and administer a Ceph cluster.
- 
- Package: ceph-common-dbg
- Architecture: linux-any
- Section: debug
- Priority: extra
- Depends: ceph-common (= ${binary:Version}), ${misc:Depends}
- Conflicts: ceph-client-tools-dbg
- Replaces: ceph-client-tools-dbg
- Description: debugging symbols for ceph-common
-  Ceph is a distributed storage and file system designed to provide
-  excellent performance, reliability, and scalability.  This is a collection
-  of common tools that allow one to interact with and administer a Ceph cluster.
-  .
-  This package contains the debugging symbols for ceph-common.
- 
 +Package: ceph-mds
 +Architecture: linux-any
 +Depends: ceph, ${misc:Depends}, ${shlibs:Depends}
 +Recommends: ceph-fs-common, ceph-fuse, libcephfs1
 +Breaks: ceph (<< 0.67.3-1)
 +Replaces: ceph (<< 0.67.3-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.
 + .
 + This package contains the metadata server daemon, which is used to
 + create a distributed file system on top of the ceph storage cluster.
 +
 +Package: ceph-mds-dbg
 +Architecture: linux-any
 +Section: debug
 +Priority: extra
 +Depends: ceph-mds (= ${binary:Version}), ${misc:Depends}
 +Description: debugging symbols for ceph-mds
 + Ceph is a distributed storage and network file system designed to provide
 + excellent performance, reliability, and scalability.
 + .
 + This package contains the debugging symbols for ceph-mds.
 +
 +Package: ceph-fuse
 +Architecture: amd64
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Recommends: fuse
 +Description: FUSE-based client for the Ceph distributed file system
 + Ceph is a distributed network file system designed to provide
 + excellent performance, reliability, and scalability.  This is a
 + FUSE-based client that allows one to mount a Ceph file system without
 + root privileges.
 + .
 + Because the FUSE-based client has certain inherent performance
 + limitations, it is recommended that the native Linux kernel client
 + be used if possible.  If it is not practical to load a kernel module
 + (insufficient privileges, older kernel, etc.), then the FUSE client will
 + do.
 +
 +Package: ceph-fuse-dbg
 +Architecture: amd64
 +Section: debug
 +Priority: extra
 +Depends: ceph-fuse (= ${binary:Version}), ${misc:Depends}
 +Description: debugging symbols for ceph-fuse
 + Ceph is a distributed network file system designed to provide
 + excellent performance, reliability, and scalability.  This is a
 + FUSE-based client that allows one to mount a Ceph file system without
 + root privileges.
 + .
 + This package contains the debugging symbols for ceph-fuse.
 +
 +Package: rbd-fuse
 +Architecture: linux-any
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Recommends: fuse
 +Description: FUSE-based rbd client for the Ceph distributed file system
 + Ceph is a distributed network file system designed to provide
 + excellent performance, reliability, and scalability.  This is a
 + FUSE-based client that allows one to map Ceph rbd images as files.
++ .
++ FUSE base client that allows one to map Ceph rbd images as files.
 +
 +Package: rbd-fuse-dbg
 +Architecture: linux-any
 +Section: debug
 +Priority: extra
 +Depends: rbd-fuse (= ${binary:Version}), ${misc:Depends}
 +Description: debugging symbols for rbd-fuse
 + Ceph is a distributed network file system designed to provide
 + excellent performance, reliability, and scalability.  This is a
 + FUSE-based client that allows one to map Ceph rbd images as files.
 + .
 + This package contains the debugging symbols for rbd-fuse.
 +
++Package: ceph-common
++Architecture: linux-any
++Depends: librbd1 (= ${binary:Version}),
++         python-ceph (= ${binary:Version}),
++         ${misc:Depends},
++         ${python:Depends},
++         ${shlibs:Depends}
++Conflicts: ceph-client-tools
++Replaces: ceph-client-tools
++Suggests: ceph, ceph-mds
++Description: common utilities to mount and interact with a ceph storage cluster
++ Ceph is a distributed storage and file system designed to provide
++ excellent performance, reliability, and scalability.  This is a collection
++ of common tools that allow one to interact with and administer a Ceph cluster.
++
++Package: ceph-common-dbg
++Architecture: linux-any
++Depends: ceph-common (= ${binary:Version}), ${misc:Depends}
++Conflicts: ceph-client-tools-dbg
++Replaces: ceph-client-tools-dbg
++Section: debug
++Priority: extra
++Description: debugging symbols for ceph-common
++ Ceph is a distributed storage and file system designed to provide
++ excellent performance, reliability, and scalability.  This is a collection
++ of common tools that allow one to interact with and administer a Ceph cluster.
++ .
++ This package contains the debugging symbols for ceph-common.
++
 +Package: ceph-fs-common
 +Architecture: linux-any
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Breaks: ceph-common (<< 0.67.3-1)
 +Conflicts: ceph-client-tools
 +Replaces: ceph-client-tools, ceph-common (<< 0.67.3-1)
 +Suggests: ceph-mds
 +Description: common utilities to mount and interact with a ceph file system
 + Ceph is a distributed network file system designed to provide
 + excellent performance, reliability, and scalability.  This is a collection
 + of common tools, including the mount utility, that allows one to mount the
 + Ceph file system with the kernel client.
 +
 +Package: ceph-fs-common-dbg
 +Architecture: linux-any
- Section: debug
- Priority: extra
 +Depends: ceph-fs-common (= ${binary:Version}), ${misc:Depends}
 +Conflicts: ceph-client-tools-dbg
 +Replaces: ceph-client-tools-dbg
++Section: debug
++Priority: extra
 +Description: debugging symbols for ceph-fs-common
 + Ceph is a distributed network file system designed to provide
 + excellent performance, reliability, and scalability.  This is a collection
 + of common tools, including the mount utility, that allows one to mount the
 + Ceph file system with the kernel client.
 + .
 + This package contains the debugging symbols for ceph-fs-common.
 +
 +Package: ceph-resource-agents
 +Architecture: all
- Priority: extra
 +Recommends: pacemaker
++Priority: extra
 +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.
 + .
 + This package contains the resource agents (RAs) which integrate
 + Ceph with OCF-compliant cluster resource managers,
 + such as Pacemaker.
 +
 +Package: librados2
- Architecture: linux-any
- Section: libs
 +Conflicts: libcrush, libcrush1, librados, librados1
 +Replaces: libcrush, libcrush1, librados, librados1
++Architecture: linux-any
++Section: libs
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Pre-Depends: ${misc:Pre-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
 + shared library allowing applications to access the distributed object
 + store using a simple file-like interface.
 +
 +Package: librados2-dbg
++Conflicts: libcrush1-dbg, librados1-dbg
++Replaces: libcrush1-dbg, librados1-dbg
 +Architecture: linux-any
 +Section: debug
 +Priority: extra
- Conflicts: libcrush1-dbg, librados1-dbg
- Replaces: libcrush1-dbg, librados1-dbg
 +Depends: librados2 (= ${binary:Version}), ${misc:Depends}
 +Description: debugging symbols for librados2
 + RADOS is a reliable, autonomic distributed object storage cluster
 + developed as part of the Ceph distributed storage system.  This is a
 + shared library allowing applications to access the distributed object
 + store using a simple file-like interface.
 + .
 + This package contains debugging symbols for librados2.
 +
 +Package: librados-dev
 +Architecture: linux-any
 +Section: libdevel
 +Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 +Conflicts: libcrush-dev, libcrush1-dev, librados1-dev, librados2-dev
 +Replaces: libcrush-dev, libcrush1-dev, librados1-dev, librados2-dev
 +Description: RADOS distributed object store client library (development files)
 + RADOS is a reliable, autonomic distributed object storage cluster
 + developed as part of the Ceph distributed storage system.  This is a
 + shared library allowing applications to access the distributed object
 + store using a simple file-like interface.
 + .
 + This package contains development files needed for building applications that
 + link against librados2.
 +
 +Package: librbd1
 +Architecture: linux-any
 +Section: libs
 +Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 +Pre-Depends: ${misc:Pre-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
 + developed as part of the Ceph distributed storage system.  This is a
 + shared library allowing applications to manage these block devices.
 +
 +Package: librbd1-dbg
 +Architecture: linux-any
 +Section: debug
 +Priority: extra
 +Depends: librbd1 (= ${binary:Version}), ${misc:Depends}
 +Description: debugging symbols for librbd1
 + RBD is a block device striped across multiple distributed objects
 + in RADOS, a reliable, autonomic distributed object storage cluster
 + developed as part of the Ceph distributed storage system.  This is a
 + shared library allowing applications to manage these block devices.
 + .
 + This package contains debugging symbols for librbd1.
 +
 +Package: librbd-dev
 +Architecture: linux-any
 +Section: libdevel
 +Depends: librados-dev, librbd1 (= ${binary:Version}), ${misc:Depends}
 +Conflicts: librbd1-dev
 +Replaces: librbd1-dev
 +Description: RADOS block device client library (development files)
 + RBD is a block device striped across multiple distributed objects
 + in RADOS, a reliable, autonomic distributed object storage cluster
 + developed as part of the Ceph distributed storage system.  This is a
 + shared library allowing applications to manage these block devices.
 + .
 + This package contains development files needed for building applications that
 + link against librbd1.
 +
 +Package: libcephfs1
- Architecture: linux-any
- Section: libs
 +Conflicts: libceph, libceph1, libcephfs
 +Replaces: libceph, libceph1, libcephfs
++Architecture: linux-any
++Section: libs
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Pre-Depends: ${misc:Pre-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
 + shared library allowing applications to access a Ceph distributed
 + file system via a POSIX-like interface.
 +
 +Package: libcephfs1-dbg
 +Architecture: linux-any
 +Section: debug
 +Priority: extra
 +Depends: libcephfs1 (= ${binary:Version}), ${misc:Depends}
 +Conflicts: libceph1-dbg
 +Replaces: libceph1-dbg
 +Description: debugging symbols for libcephfs1
 + Ceph is a distributed network file system designed to provide
 + excellent performance, reliability, and scalability.  This is a
 + shared library allowing applications to access a Ceph distributed
 + file system via a POSIX-like interface.
 + .
 + This package contains debugging symbols for libcephfs1.
 +
 +Package: libcephfs-dev
 +Architecture: linux-any
 +Section: libdevel
 +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
 + shared library allowing applications to access a Ceph distributed
 + file system via a POSIX-like interface.
 + .
 + This package contains development files needed for building applications that
 + link against libcephfs1.
 +
 +Package: radosgw
 +Architecture: linux-any
 +Depends: ceph-common (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
- Suggests: logrotate
 +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
 + object store that aims to implement a superset of Amazon's S3
 + service.
 + .
 + This package contains the proxy daemon and related tools only.
 +
 +Package: radosgw-dbg
 +Architecture: linux-any
 +Section: debug
 +Priority: extra
 +Depends: radosgw (= ${binary:Version}), ${misc:Depends}
 +Description: debugging symbols for radosgw
 + RADOS is a distributed object store used by the Ceph distributed
 + storage system.  This package provides a REST gateway to the
 + object store that aims to implement a superset of Amazon's S3
 + service.
 + .
 + This package contains debugging symbols for radosgw.
 +
 +Package: rest-bench
 +Architecture: linux-any
 +Depends: ceph-common, curl, xml2, ${misc:Depends}, ${shlibs:Depends}
 +Description: RESTful bencher that can be used to benchmark radosgw performance
 + Simple tool to benchmark radosgw (or S3) (based on 'rados-bench' command).
 +
 +Package: rest-bench-dbg
 +Architecture: linux-any
 +Section: debug
 +Priority: extra
 +Depends: rest-bench (= ${binary:Version}), ${misc:Depends}
- Description: debugging symbols for rest-bench
++Description: RESTful bencher that can be used to benchmark radosgw performance
 + Simple tool to benchmark radosgw (or S3) (based on 'rados-bench' command).
 + .
 + This package contains the debugging symbols for rest-bench.
 +
 +Package: ceph-test
 +Architecture: linux-any
 +Depends: ceph-common, curl, xml2, ${misc:Depends}, ${shlibs:Depends}
 +Description: Ceph test and benchmarking tools
 + Ceph is a distributed storage system designed to provide excellent
 + performance, reliability, and scalability.
 + .
 + This package contains tools for testing and benchmarking Ceph.
 +
 +Package: ceph-test-dbg
 +Architecture: linux-any
 +Section: debug
 +Priority: extra
- Depends: ceph-test (= ${binary:Version}), ${misc:Depends}
- Description: debugging symbols for ceph-test
++Depends: ceph-test (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
++Description: Debugging symbols for ceph-test
 + Ceph is a distributed storage system designed to provide excellent
 + performance, reliability, and scalability.
 + .
 + This package contains the debugging symbols for ceph-test.
 +
 +Package: python-ceph
 +Architecture: linux-any
 +Section: python
 +Depends: libcephfs1 (= ${binary:Version}),
 +         librados2 (= ${binary:Version}),
 +         librbd1 (= ${binary:Version}),
 +         python-flask,
 +         python-requests,
 +         ${misc:Depends},
 +         ${python:Depends}
 +Provides: ${python:Provides}
 +Description: Python libraries for the Ceph distributed filesystem
 + Ceph is a distributed storage and network file system designed to provide
 + excellent performance, reliability, and scalability.
 + .
 + This package contains Python libraries for interacting with Ceph's
 + RADOS object storage, and RBD (RADOS block device).
 +
 +Package: libcephfs-java
- Architecture: all
 +Section: java
++Architecture: all
 +Depends: libcephfs-jni (>= ${binary:Version}), ${java:Depends}, ${misc:Depends}
 +Description: Java library for the Ceph File System
 + Ceph is a distributed storage system designed to provide excellent
 + performance, reliability, and scalability.
 + .
 + This package contains the Java library for interacting with the Ceph
 + File System.
 +
 +Package: libcephfs-jni
 +Architecture: linux-any
 +Section: libs
 +Depends: libcephfs1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 +Description: Java Native Interface library for CephFS Java bindings
 + Ceph is a distributed storage system designed to provide excellent
 + performance, reliability, and scalability.
 + .
 + This package contains the Java Native Interface library for interacting
 + with the Ceph File System.
 +
 +Package: libcephfs-jni-dbg
 +Architecture: linux-any
 +Section: debug
 +Priority: extra
 +Depends: libcephfs-jni (= ${binary:Version}), ${misc:Depends}
- Description: debugging symbols for libcephfs-jni
++Description: Debugging symbols for libcephfs-jni
 + Ceph is a distributed storage system designed to provide excellent
 + performance, reliability, and scalability.
 + .
 + This package contains debugging symbols for libcephfs-jni.
diff --cc debian/copyright
index 87363b9,0000000..9b8f0f5
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,858 -1,0 +1,256 @@@
 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 +Upstream-Name: ceph
 +Upstream-Contact: Sage Weil <sage at newdream.net>
 +Source: http://ceph.com/
- Files-Excluded: src/erasure-code/jerasure/gf-complete
-                 src/erasure-code/jerasure/jerasure
 +
 +Files: *
- Copyright: 2004-2013 Sage Weil <sage at newdream.net>
-            2004-2014 Inktank <info at inktank.com>
-                      Inktank, Inc
-                      Inktank Storage, Inc.
-            2012-2014 Red Hat <contact at redhat.com>
-            2013-2014 Cloudwatt <libre.licensing at cloudwatt.com>
-            2004-2011 Dreamhost
-            2013      eNovance SAS <licensing at enovance.com>
-            2012      Florian Haas, hastexo
-            2010      Greg Farnum <gregf at hq.newdream.net>
-            2014      John Spray <john.spray at inktank.com
-            2004-2012 New Dream Network
-            2011      Stanislav Sedov <stas at FreeBSD.org>
-            2013-2014 UnitedStack <haomai at unitedstack.com>
-            2011      Wido den Hollander <wido at widodh.nl>
++Copyright: 2004-2013 by Sage Weil <sage at newdream.net>
 +License: LGPL-2.1
 +
- Files: src/erasure-code/jerasure/ErasureCode*
-        src/erasure-code/ErasureCode*
-        src/include/str_map.h
-        src/test/common/test_str_map.cc
-        src/test/erasure-code/*
-        src/test/rgw/test_rgw_manifest.cc
- Copyright: 2014 CERN/Switzerland
-            2013 Cloudwatt <libre.licensing at cloudwatt.com>
-            2013 eNovance SAS <licensing at enovance.com>
- License: LGPL-2.1+
- 
 +Files: src/mount/canonicalize.c
-        src/test/common/test_config.cc
-        src/test/crush/TestCrushWrapper.cc
-        src/test/common/Throttle.cc
-        src/test/objectstore/chain_xattr.cc
-        src/test/mon/mon-test-helpers.sh
-        src/test/objectstore/chain_xattr.cc
-        src/test/osd/osd-test-helpers.sh
-        src/ceph-disk
-        src/stop.sh
- Copyright: 1993      Rick Sladkey <jrs at world.std.com>
-            2013      Inktank <info at inktank.com>
-            2013-2014 Cloudwatt <libre.licensing at cloudwatt.com>
++Copyright: 1993 Rick Sladkey <jrs at world.std.com>
 +License: LGPL-2+
 +
 +Files: src/os/btrfs_ioctl.h
-        src/test/mon/PGMap.cc
 +Copyright: 2007 Oracle.  All rights reserved.
-            2014 Inktank <info at inktank.com>
 +License: GPL-2
 +
- Files: src/common/ceph_hash.cc
++Files: src/include/ceph_hash.cc
 +Copyright: 1995-1997 Robert J. Jenkins Jr.
 +License: public-domain
 +  This file uses Robert Jenkin's hash function as detailed at:
 +  .
 +    http://burtleburtle.net/bob/hash/evahash.html
 +  .
 +  This is in the public domain.
 +
 +Files: src/common/bloom_filter.hpp
 +Copyright: 2000 Arash Partow
- License: Boost-Software-License-1.0
++License: Boost Software License, Version 1.0
 + Permission is hereby granted, free of charge, to any person or organization
 + obtaining a copy of the software and accompanying documentation covered by
 + this license (the "Software") to use, reproduce, display, distribute,
 + execute, and transmit the Software, and to prepare derivative works of the
 + Software, and to permit third-parties to whom the Software is furnished to
 + do so, all subject to the following:
 + .
 +   The copyright notices in the Software and this entire statement,
 +   including the above license grant, this restriction and the following
 +   disclaimer, must be included in all copies of the Software, in whole or
 +   in part, and all derivative works of the Software, unless such copies
 +   or derivative works are solely in the form of machine-executable object
 +   code generated by a source language processor.
 + .
 + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
 + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 + 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
++License:
 + Redistribution and use in source and binary forms, with or without
 + modification, are permitted provided that the following conditions
 + are met:
 + .
 + * Redistributions of source code must retain the above copyright
 +   notice, this list of conditions and the following disclaimer.
 + .
 + * 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.
 + .
 + * Neither the name of the Intel Corporation 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 ARE DISCLAIMED. IN NO EVENT SHALL THE
 + COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
 + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 + 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.
 +
 +Files: src/common/sctp_crc32.c
 +Copyright: 2001-2007, by Cisco Systems, Inc. All rights reserved,
 +           2004-2006 Intel Corporation - All Rights Reserved
- License: BSD-3-clause
++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
 + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 + CONTRACT, 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.
 +
- Files: src/erasure-code/jerasure/gf-complete/*/*
- Copyright: 2013 James S. Plank
-                 Ethan L. Miller
-                 Kevin M. Greenan
-                 Benjamin A. Arnold
-                 John A. Burnum
-                 Adam W. Disney
-                 Allen C. McBride
- License: BSD-3-clause
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-  .
-  - Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  .
-  - 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.
-  .
-  - Neither the name of the University of Tennessee 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 ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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.
- Comment:
-  https://bitbucket.org/jimplank/gf-complete
++Files: src/json_spirit/*
++Copyright: John W. Wilkinson 2007 - 2011
++License: MIT
++ Permission is hereby granted, free of charge, to any person obtaining
++ a copy of this software and associated documentation files (the
++ "Software"), to deal in the Software without restriction, including
++ without limitation the rights to use, copy, modify, merge, publish,
++ distribute, sublicense, and/or sell copies of the Software, and to
++ permit persons to whom the Software is furnished to do so, subject to
++ the following conditions:
++ .
++ The above copyright notice and this permission notice shall be
++ included in all copies or substantial portions of the Software.
++ .
++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
++ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 +
- Files: src/erasure-code/jerasure/jerasure/*/*
- Copyright: 2011-2013 James S. Plank <plank at cs.utk.edu>
-            2013      Kevin Greenan
- License: BSD-3-clause
++Files: src/test/common/Throttle.cc src/test/filestore/chain_xattr.cc
++Copyright: 2013 Cloudwatt <libre.licensing at cloudwatt.com>
++License: LGPL-2+
++
++Files: src/osd/ErasureCodePluginJerasure/*
++Copyright: 2011, James S. Plank <plank at cs.utk.edu>
++License:
 + Redistribution and use in source and binary forms, with or without
 + modification, are permitted provided that the following conditions
 + are met:
 + .
 +  - Redistributions of source code must retain the above copyright
 +    notice, this list of conditions and the following disclaimer.
 + .
 +  - 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.
 + .
 +  - Neither the name of the University of Tennessee 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 ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 + HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
 + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
 + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
 + AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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.
 +
- Files: src/gtest/*
- Copyright: 2008, Google Inc.
- License: BSD-3-clause
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
-  met:
-  .
-     * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-     * 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.
-     * Neither the name of Google 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 ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, 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.
- 
- Files: src/civetweb/*
- Copyright: 2004-2013 Sergey Lyubka
-            2013-2014 the Civetweb developers
- License: Expat
- 
- Files: src/json_spirit/*
- Copyright: 2007-2011, John W. Wilkinson
- License: Expat
- 
- Files: src/java/native/ScopedLocalRef.h
-        src/java/native/JniConstants.*
- Copyright: 2010 The Android Open Source Project
- License: Apache-2.0
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  .
-       http://www.apache.org/licenses/LICENSE-2.0
-  .
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  .
-  The complete text of the Apache License, Version 2.0
-  can be found in "/usr/share/common-licenses/Apache-2.0".
- 
- Files: src/libs3/*
- Copyright: 2008 Bryan Ischo <bryan at ischo.com>
- License: GPL-3/OpenSSL
-  libs3 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, version 3 of the License.
-  .
-  In addition, as a special exception, the copyright holders give
-  permission to link the code of this library and its programs with the
-  OpenSSL library, and distribute linked combinations including the two.
-  .
-  libs3 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.
-  .
-  The complete text of the GNU General Public License version 3
-  can be found in "/usr/share/common-licenses/GPL-3' file.
- 
- Files: src/mount/mtab.c
- Copyright: util-linux-ng AUTHORS
- License: GPL-2+
- Comment:
-  "mount/fstab.c" from line 565:
-  https://gitorious.org/util-linux-ng/util-linux-ng/source/d8c36bdf037b901d92c8cbe45546b210dc5f8b90:mount/fstab.c#L565
-  https://gitorious.org/util-linux-ng/util-linux-ng/source/d8c36bdf037b901d92c8cbe45546b210dc5f8b90:README.licensing
- 
- Files: src/test/librbd/fsx.c
- Copyright: 1991, NeXT Computer, Inc.
- License: APSL-2.0
-  The contents of this file constitute Original Code as defined in and
-  are subject to the Apple Public Source License Version 2.0 (the
-  "License"). You may not use this file except in compliance with the
-  License. Please obtain a copy of the License at
-  http://www.opensource.apple.com/apsl/ and read it before using this file.
-  .
-  This Original Code and all software distributed under the License are
-  distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-  EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-  INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
-  License for the specific language governing rights and limitations
-  under the License.
- Comment:
-  http://codemonkey.org.uk/projects/fsx/
-  https://gitorious.org/freebsd/freebsd/source/35d508eed26d6b836a57b4aa6dba5677e171efde:tools/regression/fsx/fsx.c
- 
- Files: man/*
-        debian/man/*
- Copyright: 2010-2014, Inktank Storage, Inc. and contributors.
- License: CC-BY-SA-3.0
- 
 +Files: debian/*
- Copyright: 2010      Sage Weil <sage at newdream.net>
-            2010      Canonical, Ltd.
-            2011-2013 László Böszörményi (GCS) <gcs at debian.org>
-            2013-2014 James Page <james.page at ubuntu.com>
-            2014      Dmitry Smirnov <onlyjob at debian.org>
++Copyright: 2004- Sage Weil <sage at newdream.net>,
++           2010- Canonical, Ltd.,
++           2011- Laszlo Boszormenyi (GCS) <gcs at debian.org>
 +License: LGPL-2.1
 +
 +License: GPL-2
 + 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, write to the Free Software Foundation, Inc.,
 + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + .
 + On Debian systems, the complete text of the GNU General Public License
 + version 2 can be found in `/usr/share/common-licenses/GPL-2' file.
 +
- License: GPL-2+
-  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 package 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/>.
-  .
-  On Debian systems, the complete text of the GNU General Public License
-  version 2 can be found in `/usr/share/common-licenses/GPL-2'.
- 
 +License: LGPL-2.1
 + This library is free software; you can redistribute it and/or
 + modify it under the terms of the GNU Lesser General Public
 + License version 2.1 as published by the Free Software Foundation.
 + .
 + This library 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
 + Lesser General Public License for more details.
 + .
 + You should have received a copy of the GNU Lesser General Public
 + License along with this library; if not, write to the Free Software
 + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 + .
 + On Debian systems, the complete text of the GNU Lesser General
 + Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 +
- License: LGPL-2.1+
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-  .
-  This library 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
-  Lesser General Public License for more details.
-  .
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  .
-  On Debian systems, the complete text of the GNU Lesser General
-  Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
- 
 +License: LGPL-2+
 + This library is free software; you can redistribute it and/or
 + modify it under the terms of the GNU Lesser General Public
 + License version 2 (or later) as published by the Free Software Foundation.
 + .
 + This library 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
 + Lesser General Public License for more details.
 + .
 + You should have received a copy of the GNU Lesser General Public
 + License along with this library; if not, write to the Free Software
 + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 + .
 + On Debian systems, the complete text of the GNU Lesser General
 + Public License 2 can be found in `/usr/share/common-licenses/LGPL-2'.
- 
- License: Expat
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  .
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  .
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
- Comment:
-  This license also known as "MIT" however FSF consider "MIT" labelling
-  ambiguous and copyright-format specification recommend to label such license
-  as "Expat".
- 
- License: CC-BY-SA-3.0
-  Creative Commons Attribution-ShareAlike 3.0 Unported
-  ․
-  CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-  LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
-  ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
-  ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE
-  INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-  ITS USE.
-  ․
-  License
-  ․
-  THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-  COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-  COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-  AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-  ․
-  BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-  TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
-  BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
-  CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-  CONDITIONS.
-  ․
-  1. Definitions
-  ․
-  a. "Adaptation" means a work based upon the Work, or upon the Work and
-  other pre-existing works, such as a translation, adaptation, derivative
-  work, arrangement of music or other alterations of a literary or
-  artistic work, or phonogram or performance and includes cinematographic
-  adaptations or any other form in which the Work may be recast,
-  transformed, or adapted including in any form recognizably derived from
-  the original, except that a work that constitutes a Collection will not
-  be considered an Adaptation for the purpose of this License. For the
-  avoidance of doubt, where the Work is a musical work, performance or
-  phonogram, the synchronization of the Work in timed-relation with a
-  moving image ("synching") will be considered an Adaptation for the
-  purpose of this License.
-  ․
-  b. "Collection" means a collection of literary or artistic works, such
-  as encyclopedias and anthologies, or performances, phonograms or
-  broadcasts, or other works or subject matter other than works listed in
-  Section 1(f) below, which, by reason of the selection and arrangement of
-  their contents, constitute intellectual creations, in which the Work is
-  included in its entirety in unmodified form along with one or more other
-  contributions, each constituting separate and independent works in
-  themselves, which together are assembled into a collective whole. A work
-  that constitutes a Collection will not be considered an Adaptation (as
-  defined below) for the purposes of this License.
-  ․
-  c. "Creative Commons Compatible License" means a license that is listed
-  at http://creativecommons.org/compatiblelicenses that has been approved
-  by Creative Commons as being essentially equivalent to this License,
-  including, at a minimum, because that license: (i) contains terms that
-  have the same purpose, meaning and effect as the License Elements of
-  this License; and, (ii) explicitly permits the relicensing of
-  adaptations of works made available under that license under this
-  License or a Creative Commons jurisdiction license with the same License
-  Elements as this License.
-  ․
-  d. "Distribute" means to make available to the public the original and
-  copies of the Work or Adaptation, as appropriate, through sale or other
-  transfer of ownership.
-  ․
-  e. "License Elements" means the following high-level license attributes
-  as selected by Licensor and indicated in the title of this License:
-  Attribution, ShareAlike.
-  ․
-  f. "Licensor" means the individual, individuals, entity or entities that
-  offer(s) the Work under the terms of this License.
-  ․
-  g. "Original Author" means, in the case of a literary or artistic work,
-  the individual, individuals, entity or entities who created the Work or
-  if no individual or entity can be identified, the publisher; and in
-  addition (i) in the case of a performance the actors, singers,
-  musicians, dancers, and other persons who act, sing, deliver, declaim,
-  play in, interpret or otherwise perform literary or artistic works or
-  expressions of folklore; (ii) in the case of a phonogram the producer
-  being the person or legal entity who first fixes the sounds of a
-  performance or other sounds; and, (iii) in the case of broadcasts, the
-  organization that transmits the broadcast.
-  ․
-  h. "Work" means the literary and/or artistic work offered under the
-  terms of this License including without limitation any production in the
-  literary, scientific and artistic domain, whatever may be the mode or
-  form of its expression including digital form, such as a book, pamphlet
-  and other writing; a lecture, address, sermon or other work of the same
-  nature; a dramatic or dramatico-musical work; a choreographic work or
-  entertainment in dumb show; a musical composition with or without words;
-  a cinematographic work to which are assimilated works expressed by a
-  process analogous to cinematography; a work of drawing, painting,
-  architecture, sculpture, engraving or lithography; a photographic work
-  to which are assimilated works expressed by a process analogous to
-  photography; a work of applied art; an illustration, map, plan, sketch
-  or three-dimensional work relative to geography, topography,
-  architecture or science; a performance; a broadcast; a phonogram; a
-  compilation of data to the extent it is protected as a copyrightable
-  work; or a work performed by a variety or circus performer to the extent
-  it is not otherwise considered a literary or artistic work.
-  ․
-  i. "You" means an individual or entity exercising rights under this
-  License who has not previously violated the terms of this License with
-  respect to the Work, or who has received express permission from the
-  Licensor to exercise rights under this License despite a previous
-  violation.
-  ․
-  j. "Publicly Perform" means to perform public recitations of the Work
-  and to communicate to the public those public recitations, by any means
-  or process, including by wire or wireless means or public digital
-  performances; to make available to the public Works in such a way that
-  members of the public may access these Works from a place and at a place
-  individually chosen by them; to perform the Work to the public by any
-  means or process and the communication to the public of the performances
-  of the Work, including by public digital performance; to broadcast and
-  rebroadcast the Work by any means including signs, sounds or images.
-  ․
-  k. "Reproduce" means to make copies of the Work by any means including
-  without limitation by sound or visual recordings and the right of
-  fixation and reproducing fixations of the Work, including storage of a
-  protected performance or phonogram in digital form or other electronic
-  medium.
-  ․
-  2. Fair Dealing Rights. Nothing in this License is intended to reduce,
-  limit, or restrict any uses free from copyright or rights arising from
-  limitations or exceptions that are provided for in connection with the
-  copyright protection under copyright law or other applicable laws.
-  ․
-  3. License Grant. Subject to the terms and conditions of this License,
-  Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-  perpetual (for the duration of the applicable copyright) license to
-  exercise the rights in the Work as stated below:
-  ․
-  a. to Reproduce the Work, to incorporate the Work into one or more
-  Collections, and to Reproduce the Work as incorporated in the
-  Collections;
-  ․
-  b. to create and Reproduce Adaptations provided that any such
-  Adaptation, including any translation in any medium, takes reasonable
-  steps to clearly label, demarcate or otherwise identify that changes
-  were made to the original Work. For example, a translation could be
-  marked "The original work was translated from English to Spanish," or a
-  modification could indicate "The original work has been modified.";
-  ․
-  c. to Distribute and Publicly Perform the Work including as incorporated
-  in Collections; and,
-  ․
-  d. to Distribute and Publicly Perform Adaptations.
-  ․
-  e. For the avoidance of doubt:
-  ․
-  i. Non-waivable Compulsory License Schemes. In those jurisdictions in
-  which the right to collect royalties through any statutory or compulsory
-  licensing scheme cannot be waived, the Licensor reserves the exclusive
-  right to collect such royalties for any exercise by You of the rights
-  granted under this License;
-  ․
-  ii. Waivable Compulsory License Schemes. In those jurisdictions in which
-  the right to collect royalties through any statutory or compulsory
-  licensing scheme can be waived, the Licensor waives the exclusive right
-  to collect such royalties for any exercise by You of the rights granted
-  under this License; and,
-  ․
-  iii. Voluntary License Schemes. The Licensor waives the right to collect
-  royalties, whether individually or, in the event that the Licensor is a
-  member of a collecting society that administers voluntary licensing
-  schemes, via that society, from any exercise by You of the rights
-  granted under this License.
-  ․
-  The above rights may be exercised in all media and formats whether now
-  known or hereafter devised. The above rights include the right to make
-  such modifications as are technically necessary to exercise the rights
-  in other media and formats. Subject to Section 8(f), all rights not
-  expressly granted by Licensor are hereby reserved.
-  ․
-  4. Restrictions. The license granted in Section 3 above is expressly
-  made subject to and limited by the following restrictions:
-  ․
-  a. You may Distribute or Publicly Perform the Work only under the terms
-  of this License. You must include a copy of, or the Uniform Resource
-  Identifier (URI) for, this License with every copy of the Work You
-  Distribute or Publicly Perform. You may not offer or impose any terms on
-  the Work that restrict the terms of this License or the ability of the
-  recipient of the Work to exercise the rights granted to that recipient
-  under the terms of the License. You may not sublicense the Work. You
-  must keep intact all notices that refer to this License and to the
-  disclaimer of warranties with every copy of the Work You Distribute or
-  Publicly Perform. When You Distribute or Publicly Perform the Work, You
-  may not impose any effective technological measures on the Work that
-  restrict the ability of a recipient of the Work from You to exercise the
-  rights granted to that recipient under the terms of the License. This
-  Section 4(a) applies to the Work as incorporated in a Collection, but
-  this does not require the Collection apart from the Work itself to be
-  made subject to the terms of this License. If You create a Collection,
-  upon notice from any Licensor You must, to the extent practicable,
-  remove from the Collection any credit as required by Section 4(c), as
-  requested. If You create an Adaptation, upon notice from any Licensor
-  You must, to the extent practicable, remove from the Adaptation any
-  credit as required by Section 4(c), as requested.
-  ․
-  b. You may Distribute or Publicly Perform an Adaptation only under the
-  terms of: (i) this License; (ii) a later version of this License with
-  the same License Elements as this License; (iii) a Creative Commons
-  jurisdiction license (either this or a later license version) that
-  contains the same License Elements as this License (e.g.,
-  Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible
-  License. If you license the Adaptation under one of the licenses
-  mentioned in (iv), you must comply with the terms of that license. If
-  you license the Adaptation under the terms of any of the licenses
-  mentioned in (i), (ii) or (iii) (the "Applicable License"), you must
-  comply with the terms of the Applicable License generally and the
-  following provisions: (I) You must include a copy of, or the URI for,
-  the Applicable License with every copy of each Adaptation You Distribute
-  or Publicly Perform; (II) You may not offer or impose any terms on the
-  Adaptation that restrict the terms of the Applicable License or the
-  ability of the recipient of the Adaptation to exercise the rights
-  granted to that recipient under the terms of the Applicable License;
-  (III) You must keep intact all notices that refer to the Applicable
-  License and to the disclaimer of warranties with every copy of the Work
-  as included in the Adaptation You Distribute or Publicly Perform; (IV)
-  when You Distribute or Publicly Perform the Adaptation, You may not
-  impose any effective technological measures on the Adaptation that
-  restrict the ability of a recipient of the Adaptation from You to
-  exercise the rights granted to that recipient under the terms of the
-  Applicable License. This Section 4(b) applies to the Adaptation as
-  incorporated in a Collection, but this does not require the Collection
-  apart from the Adaptation itself to be made subject to the terms of the
-  Applicable License.
-  ․
-  c. If You Distribute, or Publicly Perform the Work or any Adaptations or
-  Collections, You must, unless a request has been made pursuant to
-  Section 4(a), keep intact all copyright notices for the Work and
-  provide, reasonable to the medium or means You are utilizing: (i) the
-  name of the Original Author (or pseudonym, if applicable) if supplied,
-  and/or if the Original Author and/or Licensor designate another party or
-  parties (e.g., a sponsor institute, publishing entity, journal) for
-  attribution ("Attribution Parties") in Licensor's copyright notice,
-  terms of service or by other reasonable means, the name of such party or
-  parties; (ii) the title of the Work if supplied; (iii) to the extent
-  reasonably practicable, the URI, if any, that Licensor specifies to be
-  associated with the Work, unless such URI does not refer to the
-  copyright notice or licensing information for the Work; and (iv) ,
-  consistent with Ssection 3(b), in the case of an Adaptation, a credit
-  identifying the use of the Work in the Adaptation (e.g., "French
-  translation of the Work by Original Author," or "Screenplay based on
-  original Work by Original Author"). The credit required by this Section
-  4(c) may be implemented in any reasonable manner; provided, however,
-  that in the case of a Adaptation or Collection, at a minimum such credit
-  will appear, if a credit for all contributing authors of the Adaptation
-  or Collection appears, then as part of these credits and in a manner at
-  least as prominent as the credits for the other contributing authors.
-  For the avoidance of doubt, You may only use the credit required by this
-  Section for the purpose of attribution in the manner set out above and,
-  by exercising Your rights under this License, You may not implicitly or
-  explicitly assert or imply any connection with, sponsorship or
-  endorsement by the Original Author, Licensor and/or Attribution Parties,
-  as appropriate, of You or Your use of the Work, without the separate,
-  express prior written permission of the Original Author, Licensor and/or
-  Attribution Parties.
-  ․
-  d. Except as otherwise agreed in writing by the Licensor or as may be
-  otherwise permitted by applicable law, if You Reproduce, Distribute or
-  Publicly Perform the Work either by itself or as part of any Adaptations
-  or Collections, You must not distort, mutilate, modify or take other
-  derogatory action in relation to the Work which would be prejudicial to
-  the Original Author's honor or reputation. Licensor agrees that in those
-  jurisdictions (e.g. Japan), in which any exercise of the right granted
-  in Section 3(b) of this License (the right to make Adaptations) would be
-  deemed to be a distortion, mutilation, modification or other derogatory
-  action prejudicial to the Original Author's honor and reputation, the
-  Licensor will waive or not assert, as appropriate, this Section, to the
-  fullest extent permitted by the applicable national law, to enable You
-  to reasonably exercise Your right under Section 3(b) of this License
-  (right to make Adaptations) but not otherwise.
-  ․
-  5. Representations, Warranties and Disclaimer
-  ․
-  UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-  OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
-  KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-  INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-  FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-  LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
-  WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE
-  EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-  ․
-  6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-  LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-  ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-  ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
-  BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-  ․
-  7. Termination
-  ․
-  a. This License and the rights granted hereunder will terminate
-  automatically upon any breach by You of the terms of this License.
-  Individuals or entities who have received Adaptations or Collections
-  from You under this License, however, will not have their licenses
-  terminated provided such individuals or entities remain in full
-  compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
-  survive any termination of this License.
-  ․
-  b. Subject to the above terms and conditions, the license granted here
-  is perpetual (for the duration of the applicable copyright in the Work).
-  Notwithstanding the above, Licensor reserves the right to release the
-  Work under different license terms or to stop distributing the Work at
-  any time; provided, however that any such election will not serve to
-  withdraw this License (or any other license that has been, or is
-  required to be, granted under the terms of this License), and this
-  License will continue in full force and effect unless terminated as
-  stated above.
-  ․
-  8. Miscellaneous
-  ․
-  a. Each time You Distribute or Publicly Perform the Work or a
-  Collection, the Licensor offers to the recipient a license to the Work
-  on the same terms and conditions as the license granted to You under
-  this License.
-  ․
-  b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
-  offers to the recipient a license to the original Work on the same terms
-  and conditions as the license granted to You under this License.
-  ․
-  c. If any provision of this License is invalid or unenforceable under
-  applicable law, it shall not affect the validity or enforceability of
-  the remainder of the terms of this License, and without further action
-  by the parties to this agreement, such provision shall be reformed to
-  the minimum extent necessary to make such provision valid and
-  enforceable.
-  ․
-  d. No term or provision of this License shall be deemed waived and no
-  breach consented to unless such waiver or consent shall be in writing
-  and signed by the party to be charged with such waiver or consent.
-  ․
-  e. This License constitutes the entire agreement between the parties
-  with respect to the Work licensed here. There are no understandings,
-  agreements or representations with respect to the Work not specified
-  here. Licensor shall not be bound by any additional provisions that may
-  appear in any communication from You. This License may not be modified
-  without the mutual written agreement of the Licensor and You.
-  ․
-  f. The rights granted under, and the subject matter referenced, in this
-  License were drafted utilizing the terminology of the Berne Convention
-  for the Protection of Literary and Artistic Works (as amended on
-  September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
-  Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and
-  the Universal Copyright Convention (as revised on July 24, 1971). These
-  rights and subject matter take effect in the relevant jurisdiction in
-  which the License terms are sought to be enforced according to the
-  corresponding provisions of the implementation of those treaty
-  provisions in the applicable national law. If the standard suite of
-  rights granted under applicable copyright law includes additional rights
-  not granted under this License, such additional rights are deemed to be
-  included in the License; this License is not intended to restrict the
-  license of any rights under applicable law.
-  ․
-  ․
-  Creative Commons Notice
-  ․
-  Creative Commons is not a party to this License, and makes no warranty
-  whatsoever in connection with the Work. Creative Commons will not be
-  liable to You or any party on any legal theory for any damages
-  whatsoever, including without limitation any general, special,
-  incidental or consequential damages arising in connection to this
-  license. Notwithstanding the foregoing two (2) sentences, if Creative
-  Commons has expressly identified itself as the Licensor hereunder, it
-  shall have all rights and obligations of Licensor.
-  ․
-  Except for the limited purpose of indicating to the public that the Work
-  is licensed under the CCPL, Creative Commons does not authorize the use
-  by either party of the trademark "Creative Commons" or any related
-  trademark or logo of Creative Commons without the prior written consent
-  of Creative Commons. Any permitted use will be in compliance with
-  Creative Commons' then-current trademark usage guidelines, as may be
-  published on its website or otherwise made available upon request from
-  time to time. For the avoidance of doubt, this trademark restriction
-  does not form part of the License.
-  ․
-  Creative Commons may be contacted at http://creativecommons.org/.
diff --cc debian/gbp.conf
index 75ebe04,0000000..fce89ec
mode 100644,000000..100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,7 -1,0 +1,6 @@@
 +[DEFAULT]
- debian-branch = master
- upstream-branch = upstream-firefly
++debian-branch = ubuntu
 +pristine-tar = True
 +
 +[import-orig]
 +filter = debian/*
diff --cc debian/librbd1.install
index 848b669,0000000..46bc2f7
mode 100644,000000..100644
--- a/debian/librbd1.install
+++ b/debian/librbd1.install
@@@ -1,5 -1,0 +1,4 @@@
++../../udev/50-rbd.rules lib/udev/rules.d
 +usr/bin/ceph-rbdnamer
 +usr/lib/*/librbd.so.*
 +usr/share/man/man8/ceph-rbdnamer.8
- ## install from source tree
- udev/50-rbd.rules    /lib/udev/rules.d
diff --cc debian/patches/increaseFileLimit.patch
index 0000000,0000000..b1dc1c0
new file mode 100644
--- /dev/null
+++ b/debian/patches/increaseFileLimit.patch
@@@ -1,0 -1,0 +1,32 @@@
++Description: Increase file limit to prevent hitting the file limit 
++
++Upstream commit text
++"
++commit 5773a374d0089ce824dec0a0c74a76e57806cc43
++Author: Sage Weil <sage at redhat.com>
++Date:   Mon Jul 28 09:27:20 2014 -0700
++
++    upstart/ceph-osd.conf: bump nofile limit up by 10x
++
++    This should ensure that we don't hit this limit on all but the very biggest
++    clusters.  We seen it hit on a ~500 OSD dumpling cluster.
++
++    Backport: firefly, dumpling
++    Signed-off-by: Sage Weil <sage at redhat.com>
++"
++
++Author: Dave Chiluk <chiluk at canonical.com>
++Bug-Ubuntu: https://bugs.launchpad.net/bugs/1420647
++Origin: https://github.com/ceph/ceph/commit/5773a374d0089ce824dec0a0c74a76e57806cc43
++---
++--- a/src/upstart/ceph-osd.conf
+++++ b/src/upstart/ceph-osd.conf
++@@ -6,7 +6,7 @@ stop on runlevel [!2345] or stopping cep
++ respawn
++ respawn limit 3 1800
++ 
++-limit nofile 32768 32768
+++limit nofile 327680 327680
++ 
++ pre-start script
++     set -e
diff --cc debian/patches/modules.patch
index 301d253,0000000..b786693
mode 100644,000000..100644
--- a/debian/patches/modules.patch
+++ b/debian/patches/modules.patch
@@@ -1,58 -1,0 +1,53 @@@
- Last-Update: 2014-04-14
- Forwarded: no
- Author: James Page <james.page at ubuntu.com>
 +Description: Mark modules as actually being modules
-  Ceph was/is building internal plugins/modules as versioned libraries;
-  this makes no sense as they are not exposed to anything other than
-  ceph so ABI compat is irrelevant - this patch makes them build without
-  the so.2.0.0 extensions and is a little cleaner.
++Author: James Page <james.page at ubuntu.com>
++Forwarded: no
 +
 +--- a/src/cls/Makefile.am
 ++++ b/src/cls/Makefile.am
 +@@ -45,7 +45,7 @@ radoslib_LTLIBRARIES += libcls_replica_l
 + 
 + libcls_user_la_SOURCES = cls/user/cls_user.cc
 + libcls_user_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
 +-libcls_user_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
 ++libcls_user_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 + radoslib_LTLIBRARIES += libcls_user.la
 + 
 + libcls_rgw_la_SOURCES = \
 +--- a/src/erasure-code/jerasure/Makefile.am
 ++++ b/src/erasure-code/jerasure/Makefile.am
 +@@ -40,7 +40,7 @@ libec_jerasure_generic_la_CXXFLAGS= ${AM
 + 	-Ierasure-code/jerasure/gf-complete/include \
 + 	-Ierasure-code/jerasure/jerasure/include
 + libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
 +-libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
 ++libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
 + if LINUX
 + libec_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
 + endif
 +@@ -63,7 +63,7 @@ libec_jerasure_sse3_la_CXXFLAGS= ${AM_CX
 + 	-Ierasure-code/jerasure/gf-complete/include \
 + 	-Ierasure-code/jerasure/jerasure/include
 + libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
 +-libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
 ++libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
 + if LINUX
 + libec_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
 + endif
 +@@ -90,7 +90,7 @@ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CX
 + 	-Ierasure-code/jerasure/gf-complete/include \
 + 	-Ierasure-code/jerasure/jerasure/include
 + libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
 +-libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
 ++libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
 + if LINUX
 + libec_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
 + endif
 +@@ -102,7 +102,7 @@ libec_jerasure_la_SOURCES = \
 + libec_jerasure_la_CFLAGS = ${AM_CFLAGS} 
 + libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS}
 + libec_jerasure_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
 +-libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
 ++libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
 + if LINUX
 + libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
 + endif
diff --cc debian/patches/series
index 200b8e2,0000000..f08ffaa
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,28 -1,0 +1,3 @@@
- ## Backported / Upstream
- bug-8342.patch
- bug-8624a.patch
- bug-8624b.patch
- bug-8821.patch
- bug-9341.patch
- client-sleep1.patch
- client-sleep2.patch
- client-sleep3.patch
- sleep-recover.patch
- backfill-prio.patch
- bash-completion.patch
- rbdmap1-mount.patch
- rbdmap2-hooks.patch
- bug-11860.patch
- CVE-2015-5245.patch
- boost-1.57_1.patch
- boost-1.57_2.patch
- boost-1.58.patch
- fix-build-without-libatomic-ops.patch
- 
- ## Debian
- rbdmap3-lazyumount.patch
- arch.patch
++virtualenv-never-download
 +modules.patch
- sample.ceph.conf.patch
- use_system_jerasure.patch
- virtualenv-never-download.patch
++increaseFileLimit.patch
diff --cc debian/patches/virtualenv-never-download
index b95e96f,0000000..b95e96f
mode 100644,000000..100644
--- a/debian/patches/virtualenv-never-download
+++ b/debian/patches/virtualenv-never-download
diff --cc debian/radosgw.install
index f4c4abf,0000000..1ed620e
mode 100644,000000..100644
--- a/debian/radosgw.install
+++ b/debian/radosgw.install
@@@ -1,4 -1,0 +1,5 @@@
++etc/bash_completion.d/radosgw-admin
 +usr/bin/radosgw
 +usr/bin/radosgw-admin
 +usr/share/man/man8/radosgw-admin.8
 +usr/share/man/man8/radosgw.8
diff --cc debian/radosgw.lintian-overrides
index 326e9c4,0000000..b5c8c28
mode 100644,000000..100644
--- a/debian/radosgw.lintian-overrides
+++ b/debian/radosgw.lintian-overrides
@@@ -1,7 -1,0 +1,10 @@@
 +# Ceph upstart configuration's don't have init.d equivalents
 +radosgw: init.d-script-not-marked-as-conffile etc/init.d/radosgw-all-starter
 +radosgw: init.d-script-not-included-in-package etc/init.d/radosgw-all-starter
 +radosgw: init.d-script-not-marked-as-conffile etc/init.d/radosgw-instance
 +radosgw: init.d-script-not-included-in-package etc/init.d/radosgw-instance
 +radosgw: init.d-script-not-marked-as-conffile etc/init.d/radosgw-all
 +radosgw: init.d-script-not-included-in-package etc/init.d/radosgw-all
++radosgw: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/radosgw-all
++radosgw: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/radosgw-instance
++radosgw: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/radosgw-all-starter
diff --cc debian/rules
index b977a45,0000000..ef63946
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,105 -1,0 +1,105 @@@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
 +#export DH_VERBOSE=1
 +
- # minimise needless linking
- export DEB_LDFLAGS_MAINT_APPEND= -Wl,--as-needed
++export DESTDIR=$(CURDIR)/debian/tmp
 +
 +# Enable hardening
 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all
++include /usr/share/dpkg/buildflags.mk
 +
 +export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 +
- export JAVA_HOME=/usr/lib/jvm/default-java
- ## Set JAVAC to prevent FTBFS due to incorrect use of 'gcj' if found (see "m4/ac_prog_javac.m4").
- export JAVAC=javac
- 
 +extraopts += --disable-silent-rules
 +extraopts += --with-ocf --with-rest-bench --with-nss
 +extraopts += --with-debug
 +extraopts += --enable-cephfs-java
 +
 +ifeq ($(DEB_HOST_ARCH), armel)
 +  # armel supports ARMv4t or above instructions sets.
 +  # libatomic-ops is only usable with Ceph for ARMv6 or above.
 +  extraopts += --without-libatomic-ops
 +endif
 +
 +# Only selected architectures support gperftools
 +gperftools_archs = i386 amd64 powerpc armhf ppc64el
 +ifneq (,$(filter $(DEB_HOST_ARCH), $(gperftools_archs)))
 +  extraopts += --with-tcmalloc
 +else
 +  extraopts += --without-tcmalloc
 +endif
 +
 +# Use system provided libs3
 +extraopts += --with-system-libs3
 +
 +%:
- 	dh $@ --with javahelper,python2,autoreconf,bash-completion --parallel
- 
- override_dh_autoreconf:
- 	dh_autoreconf --as-needed
++	dh $@ --with javahelper --with python2 --with autoreconf --parallel
 +
 +override_dh_auto_configure:
 +	dh_auto_configure -- $(extraopts)
 +
 +override_dh_auto_build:
 +	dh_auto_build
- 	cp -v src/upstart/rbdmap.conf debian/ceph.rbdmap.upstart
++	cp src/init-ceph debian/ceph.init
++	cp src/init-radosgw debian/radosgw.init
++	cp src/init-rbdmap debian/ceph.rbdmap.init
++	cp src/upstart/rbdmap.conf debian/ceph.rbdmap.upstart
++	cp src/logrotate.conf debian/ceph.logrotate
++	cp src/rgw/logrotate.conf debian/radosgw.logrotate
 +
 +override_dh_auto_clean:
 +	dh_auto_clean
- 	rm -fv debian/*.upstart
++	rm -f debian/ceph.init debian/radosgw.init debian/ceph.rbdmap.init debian/ceph.rbdmap.upstart
++	rm -f debian/ceph.logrotate debian/radosgw.logrotate
++	rm -f debian/*.upstart
 +
 +override_dh_auto_install:
- 	dh_auto_install --destdir=$(CURDIR)/debian/tmp
++	dh_auto_install
 +
 +override_dh_installinit:
 +	dh_installinit --no-start
 +	dh_installinit -pceph --no-start --name=rbdmap
 +	# Install upstart configurations using dh_installinit
 +	for conf in `ls -1 src/upstart/ceph*.conf | grep -v mds`; do \
 +        name=`basename $$conf | cut -d . -f 1`; \
-         cp -v $$conf debian/ceph.$$name.upstart; \
++        cp $$conf debian/ceph.$$name.upstart; \
 +        dh_installinit -pceph --no-start --name=$$name; \
 +    done
 +	for conf in `ls -1 src/upstart/ceph-mds*.conf`; do \
 +        name=`basename $$conf | cut -d . -f 1`; \
-         cp -v $$conf debian/ceph-mds.$$name.upstart; \
++        cp $$conf debian/ceph-mds.$$name.upstart; \
 +        dh_installinit -pceph-mds --no-start --name=$$name; \
 +    done
 +	for conf in `ls -1 src/upstart/radosgw*.conf`; do \
 +        name=`basename $$conf | cut -d . -f 1`; \
 +        [ $$name = "radosgw" ] && name="radosgw-instance";\
-         cp -v $$conf debian/radosgw.$$name.upstart; \
++        cp $$conf debian/radosgw.$$name.upstart; \
 +        dh_installinit -pradosgw --no-start --name=$$name; \
 +    done
 +
 +override_dh_strip:
 +	dh_strip -pceph --dbg-package=ceph-dbg
 +	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 -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
 +	dh_strip -plibrbd1 --dbg-package=librbd1-dbg
 +	dh_strip -plibcephfs1 --dbg-package=libcephfs1-dbg
 +	dh_strip -pradosgw --dbg-package=radosgw-dbg
 +	dh_strip -prest-bench --dbg-package=rest-bench-dbg
 +	dh_strip -pceph-test --dbg-package=ceph-test-dbg
 +	dh_strip -plibrados-dev
 +	dh_strip -plibcephfs-jni --dbg-package=libcephfs-jni-dbg
 +
 +override_dh_makeshlibs:
 +	# exclude jni libraries in libcephfs-jni to avoid pointless ldconfig
 +	# calls in maintainer scripts
- 	dh_makeshlibs -V -X/usr/lib/jni
++	dh_makeshlibs -X/usr/lib/jni
 +
 +override_dh_auto_test:
 +	# Skip tests as they rely on virtualenv
 +	:
 +
 +.PHONY: override_dh_auto_configure override_dh_installinit override_dh_strip override_dh_makeshlibs override_dh_auto_test
diff --cc src/libs3/debian/changelog
index 0000000,0000000..520b2b9
new file mode 100644
--- /dev/null
+++ b/src/libs3/debian/changelog
@@@ -1,0 -1,0 +1,5 @@@
++libs3 (all) unstable; urgency=low
++
++  * This file is not maintained.  See project source code for changes.
++
++ -- Bryan Ischo <bryan at ischo.com>  Wed, 06 Aug 2008 09:36:43 -0400
diff --cc src/libs3/debian/changelog.Debian
index 0000000,0000000..81072be
new file mode 100644
--- /dev/null
+++ b/src/libs3/debian/changelog.Debian
@@@ -1,0 -1,0 +1,6 @@@
++libs3 (all) unstable; urgency=low
++
++      * libs3 Debian maintainer and upstream author are identical.
++        Therefore see normal changelog file for Debian changes.
++
++ -- Bryan Ischo <bryan at ischo.com>  Wed, 06 Aug 2008 09:36:43 -0400
diff --cc src/libs3/debian/control
index 0000000,0000000..28ddc6b
new file mode 100644
--- /dev/null
+++ b/src/libs3/debian/control
@@@ -1,0 -1,0 +1,12 @@@
++Package: libs3
++Source: THIS LINE WILL BE REMOVED, dpkg-shlibdepends NEEDS IT
++Version: LIBS3_VERSION
++Architecture: DEBIAN_ARCHITECTURE
++Section: net
++Priority: extra
++Maintainer: Bryan Ischo <bryan at ischo.com>
++Homepage: http://libs3.ischo.com/index.html
++Description: C Library and Tools for Amazon S3 Access
++ This package includes the libs3 shared object library, needed to run
++ applications compiled against libs3, and additionally contains the s3
++ utility for accessing Amazon S3.
diff --cc src/libs3/debian/control.dev
index 0000000,0000000..5ee5ae7
new file mode 100644
--- /dev/null
+++ b/src/libs3/debian/control.dev
@@@ -1,0 -1,0 +1,26 @@@
++Package: libs3-dev
++Version: LIBS3_VERSION
++Architecture: DEBIAN_ARCHITECTURE
++Section: libdevel
++Priority: extra
++Depends: libs3 (>= LIBS3_VERSION)
++Maintainer: Bryan Ischo <bryan at ischo.com>
++Homepage: http://libs3.ischo.com/index.html
++Description: C Development Library for Amazon S3 Access
++ This library provides an API for using Amazon's S3 service (see
++ http://s3.amazonaws.com).  Its design goals are:
++ .
++  - To provide a simple and straightforward API for accessing all of S3's
++    functionality
++  - To not require the developer using libs3 to need to know anything about:
++      - HTTP
++      - XML
++      - SSL
++    In other words, this API is meant to stand on its own, without requiring
++    any implicit knowledge of how S3 services are accessed using HTTP
++    protocols.
++  - To be usable from multithreaded code
++  - To be usable by code which wants to process multiple S3 requests
++    simultaneously from a single thread
++  - To be usable in the simple, straightforward way using sequentialized
++    blocking requests
diff --cc src/libs3/debian/postinst
index 0000000,0000000..2d1871b
new file mode 100755
--- /dev/null
+++ b/src/libs3/debian/postinst
@@@ -1,0 -1,0 +1,3 @@@
++#!/bin/sh
++
++ldconfig

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