[Pkg-ceph-commits] [ceph] 01/01: d/rules, ceph.install: Correct install paths for ceph-* helpers.

[James Downing Page]

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

jamespage pushed a commit to branch master
in repository ceph.

commit 5ba1739a479733127894eaf7d45f89863beeb40b
Author: James Page <james.page at ubuntu.com>
Date:   Tue Nov 26 22:12:35 2013 +0000

    d/rules,ceph.install: Correct install paths for ceph-* helpers.
---
 debian/ceph.install | 8 ++++----
 debian/changelog    | 6 ++++++
 debian/rules        | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/ceph.install b/debian/ceph.install
index e3025a6..cad69ad 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -2,10 +2,6 @@
 ../../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/ceph-create-keys
-sbin/ceph-disk
-sbin/ceph-disk-activate
-sbin/ceph-disk-prepare
 sbin/mkcephfs
 usr/bin/ceph-clsinfo
 usr/bin/ceph-debugpack
@@ -18,6 +14,10 @@ usr/bin/monmaptool
 usr/bin/osdmaptool
 usr/lib/*/ceph/ceph_common.sh
 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
diff --git a/debian/changelog b/debian/changelog
index 71333bd..1f35188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.72.1-3) UNRELEASED; urgency=low
+
+  * d/rules,ceph.install: Correct install paths for ceph-* helpers. 
+
+ -- James Page <james.page at ubuntu.com>  Tue, 26 Nov 2013 22:11:19 +0000
+
 ceph (0.72.1-2) unstable; urgency=low
 
   * Fix upgrade failures from ceph < 0.67.3-1 (Closes: #728164):
diff --git a/debian/rules b/debian/rules
index e25f036..5d503f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ extraopts += --with-system-libs3
 	dh $@ --with javahelper --with python2 --with autoreconf --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- --sbindir=/sbin $(extraopts)
+	dh_auto_configure -- $(extraopts)
 
 override_dh_auto_build:
 	dh_auto_build

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git