[Pkg-ceph-commits] [ceph] 07/08: Misc other updates for package splits and renames

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu-yakkety
in repository ceph.

commit 1d0f238503e8114de0f4fc5ddd1cb9d6983f539e
Author: James Page <james.page at ubuntu.com>
Date:   Wed Jul 13 10:53:50 2016 +0100

    Misc other updates for package splits and renames
---
 debian/{ceph.init => ceph-base.ceph.init} |  0
 debian/ceph-base.lintian-overrides        | 29 --------------------------
 debian/control                            | 34 +++++++++++++++++++++++--------
 debian/rules                              | 14 +++++--------
 4 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/debian/ceph.init b/debian/ceph-base.ceph.init
similarity index 100%
rename from debian/ceph.init
rename to debian/ceph-base.ceph.init
diff --git a/debian/ceph-base.lintian-overrides b/debian/ceph-base.lintian-overrides
deleted file mode 100644
index 91955c4..0000000
--- a/debian/ceph-base.lintian-overrides
+++ /dev/null
@@ -1,29 +0,0 @@
-# False-positives:
-spelling-error-in-binary * tEH the
-
-# Ceph upstart configurations don't have init.d equivalents
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-create-keys
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-create-keys
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-mon
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd-all
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-osd-all
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon-all
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-mon-all
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-osd
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-all
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-all
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon-all-starter
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-mon-all-starter
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd-all-starter
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-osd-all-starter
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon-all-starter
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd-all
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-create-keys
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon-all
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/rbdmap
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-all
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd-all-starter
diff --git a/debian/control b/debian/control
index 830efa0..81fa453 100644
--- a/debian/control
+++ b/debian/control
@@ -74,6 +74,19 @@ Description: distributed storage and file system
  storage system that runs on commodity hardware and delivers object,
  block and file system storage.
 
+Package: ceph-dbg
+Architecture: linux-any
+Section: debug
+Priority: extra
+Depends: ceph (= ${binary:Version}), ${misc:Depends}
+Replaces: ceph-test-dbg (<< 9.2.0-0ubuntu1~)
+Breaks: ceph-test-dbg (<< 9.2.0-0ubuntu1~)
+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-base
 Architecture: linux-any
 Depends: binutils,
@@ -110,18 +123,19 @@ Description: common ceph daemon libraries and management tools
  the three Ceph server daemons (ceph-mon, ceph-osd, ceph-mds). These tools are
  necessary for creating, running, and administering a Ceph storage cluster.
 
-Package: ceph-dbg
+Package: ceph-base-dbg
 Architecture: linux-any
 Section: debug
 Priority: extra
-Depends: ceph (= ${binary:Version}), ${misc:Depends}
-Replaces: ceph-test-dbg (<< 9.2.0-0ubuntu1~)
-Breaks: ceph-test-dbg (<< 9.2.0-0ubuntu1~)
-Description: debugging symbols for ceph
- Ceph is a distributed storage system designed to provide excellent
- performance, reliability, and scalability.
+Depends: ceph-base (= ${binary:Version}), ${misc:Depends}
+Breaks: ceph-dbg (<< 10.2.2-0ubuntu2~),
+Replaces: ceph-dbg (<< 10.2.2-0ubuntu2~),
+Description: debugging symbols for ceph-base
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
  .
- This package contains the debugging symbols for ceph.
+ This package contains the debugging symbols for ceph-base.
 
 Package: rbd-mirror
 Architecture: linux-any
@@ -262,6 +276,8 @@ Architecture: linux-any
 Section: debug
 Priority: extra
 Depends: ceph-mon (= ${binary:Version}), ${misc:Depends}
+Breaks: ceph-dbg (<< 10.2.2-0ubuntu2~),
+Replaces: ceph-dbg (<< 10.2.2-0ubuntu2~),
 Description: debugging symbols for ceph-mon
  Ceph is a massively scalable, open-source, distributed
  storage system that runs on commodity hardware and delivers object,
@@ -289,6 +305,8 @@ Architecture: linux-any
 Section: debug
 Priority: extra
 Depends: ceph-osd (= ${binary:Version}), ${misc:Depends}
+Breaks: ceph-dbg (<< 10.2.2-0ubuntu2~),
+Replaces: ceph-dbg (<< 10.2.2-0ubuntu2~),
 Description: debugging symbols for ceph-osd
  Ceph is a massively scalable, open-source, distributed
  storage system that runs on commodity hardware and delivers object,
diff --git a/debian/rules b/debian/rules
index fb4d4ca..13f9242 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,14 +62,6 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	dh_auto_configure -- $(extraopts)
 
-override_dh_auto_build:
-	dh_auto_build
-	cp -v src/upstart/rbdmap.conf debian/ceph-common.rbdmap.upstart
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -fv debian/*.upstart
-
 override_dh_auto_install:
 	dh_auto_install --destdir=$(CURDIR)/debian/tmp
 	# NOTE: manually install python modules to avoid virtualenvs
@@ -86,7 +78,8 @@ override_dh_auto_install:
 
 override_dh_installinit:
 	dh_installinit --no-start
-	dh_installinit -pceph-common --no-start --name=rbdmap
+	dh_installinit -pceph-common --name=rbdmap --no-start
+	dh_installinit -pceph-base --name ceph --no-start
 	# install the systemd stuff manually since we have funny service names
 	# and need to update the paths in all of the files post install
 	# systemd:ceph-common
@@ -138,7 +131,10 @@ override_dh_systemd_start:
 
 override_dh_strip:
 	dh_strip -pceph --dbg-package=ceph-dbg
+	dh_strip -pceph-base --dbg-package=ceph-base-dbg
 	dh_strip -pceph-mds --dbg-package=ceph-mds-dbg
+	dh_strip -pceph-mon --dbg-package=ceph-mon-dbg
+	dh_strip -pceph-osd --dbg-package=ceph-osd-dbg
 	dh_strip -pceph-fuse --dbg-package=ceph-fuse-dbg
 	dh_strip -prbd-fuse --dbg-package=rbd-fuse-dbg
 	dh_strip -prbd-mirror --dbg-package=rbd-mirror-dbg

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