[Pkg-ceph-commits] [ceph] 04/10: Include changelog entries from Ubuntu uploads

[James Downing Page]

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

jamespage pushed a commit to branch experimental
in repository ceph.

commit 47365fd9f4281acd91a193321311eeb2f72bbe03
Author: James Page <james.page at ubuntu.com>
Date:   Tue Jun 16 09:08:08 2015 +0100

    Include changelog entries from Ubuntu uploads
---
 debian/changelog      | 29 ++++++++++++++++++++++++++++-
 debian/control        |  1 -
 debian/patches/series |  1 -
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 257a7b7..f5a34d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,35 @@
 ceph (0.94.2-1) UNRELEASED; urgency=medium
 
-  * Resync with Ubuntu, introducing Ceph Hammer stable release.
+  * Resync with Ubuntu, introducing Ceph Hammer stable release:
+    - d/*.symbols: Update inline with upstream additions, use regex
+      for ceph version symbol.
+    - d/lib-systemd/system/ceph-create-keys.service: Automatically create
+      admin and bootstrap keys after ceph mon startup.
+    - d/p/vivid-does-systemd.patch: Ensure that disks prepared on vivid
+      or later use systemd for init.
+    - d/lib-systemd/system/*.service: Align nofile limits and restart config
+      with equivalent upstart configurations.
+    - d/p/fix-cycles-arch.patch: Skip initialization of cycles_per_sec
+      if rtdsc (or equivalent) is not supported.
+    - d/ceph{-common}.install,control: Move ceph_argparse.py down into
+      ceph-common package to fixup ceph cli usage/autopkgtest failure.
+    - d/control,ceph-common.install,librbd1.install: Move rbdnamer and
+      associated udev rules into ceph-common package.
+    - d/control,python-*: Split out rbd, rados and cephfs bindings into
+      separate python packages, move some bits into ceph/ceph-common.
+    - d/control: Move python-flask dependency to ceph package, only required
+      for REST API.
+    - d/control: Use google-perftools on arm64.
+    - d/control: Re-order Recommends to prefer ntp over chrony for Ubuntu.
+    - d/p/ceph-osd-prestart-path.patch: Fixup path for ceph-osd upstart
+      configuration pre-start script.
+    - d/p/fix-argparse-defaults.patch: Workaround behavioural change in
+      argparse set_defaults in python 2.7.9
   * New upstream point release:
     - d/p/*: Refresh.
+  * d/p/use_system_jerasure.patch,d/control: Drop use of libjerasure
+    as the patch is intrusive and expensive to maintain; will revisit if
+    accepted upstream.
 
  -- James Page <james.page at ubuntu.com>  Tue, 09 Jun 2015 17:41:26 +0100
 
diff --git a/debian/control b/debian/control
index 82daf15..00b81bf 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,6 @@ Build-Depends:
  libfcgi-dev,
  libfuse-dev,
  libgoogle-perftools-dev [i386 amd64 powerpc armhf arm64 ppc64el],
- libjerasure-dev (>= 2.0.0-2~),
  libkeyutils-dev,
  libleveldb-dev,
  libnss3-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 8670f49..79de48b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,6 @@ modules.patch
 sample.ceph.conf.patch
 tests-disable.patch
 #use_system_gtest.patch
-use_system_jerasure.patch
 virtualenv-never-download.patch
 ceph-osd-prestart-path.patch
 fix-argparse-defaults.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git