debian: more cleanups

https://code.launchpad.net/~clint-fewbar/review-new-branches/ceph-new-pkg/+merge/31303

diff --git a/ceph.spec.in b/ceph.spec.in
index a8a5e25485ad62add0093777f40edbfbb30096d6..c3ba8382140264b3743ad3b39517f615827ce533 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -121,8 +121,8 @@ fi
 %{_sbindir}/mkcephfs
 /sbin/mount.ceph
 %{_libdir}/ceph
-%config(noreplace) %{_sysconfdir}/ceph/sample.ceph.conf
-%config(noreplace) %{_sysconfdir}/ceph/sample.fetch_config
+%{_docdir}/sample.ceph.conf
+%{_docdir}/sample.fetch_config
 %config(noreplace) %{_sysconfdir}/logrotate.d/ceph
 %{_mandir}/man8/cmon.8*
 %{_mandir}/man8/cmds.8*

diff --git a/debian/ceph.dirs b/debian/ceph.dirs
index dfad8a61fa39e4740ac46a30e2fc96911862fa15..79d07671d37e62868564e3a76ce609412688851c 100644 (file)
--- a/debian/ceph.dirs
+++ b/debian/ceph.dirs
@@ -1,3 +1,4 @@
+etc/ceph
 var/log/ceph
 var/log/ceph/stat
 var/lib/ceph/tmp

diff --git a/debian/ceph.install b/debian/ceph.install
index e0dcf894abd4711b8cea43bcc30e303054c765a3..5efd2e945f56e74e11d48e8e802384db8d339eb5 100644 (file)
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -17,8 +17,8 @@ sbin/mount.ceph
 usr/sbin/mkcephfs
 usr/lib/ceph/ceph_common.sh
 usr/lib/rados-classes/*
-etc/ceph/sample.ceph.conf
-etc/ceph/sample.fetch_config
+usr/share/doc/ceph/sample.ceph.conf
+usr/share/doc/ceph/sample.fetch_config
 usr/share/man/man8/cmon.8
 usr/share/man/man8/cmds.8
 usr/share/man/man8/cosd.8

diff --git a/debian/ceph.postrm b/debian/ceph.postrm
new file mode 100644 (file)
index 0000000..e387d5a
--- /dev/null
+++ b/debian/ceph.postrm
@@ -0,0 +1,46 @@
+#!/bin/sh
+# postrm script for ceph
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove)
+    ;;
+
+    purge)
+       rm -rf /var/log/ceph 
+    ;;
+
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

diff --git a/debian/copyright b/debian/copyright
index 1eea9dea8b81d16e57e9bfd3bc20f03103af0f19..b21fa1113e69c84c3791c527e0db936bcf67269b 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,10 @@
-This package was debianized for Ubuntu by Clint Byrum <clint@ubuntu.com> on
-Tue Jul 20 12:55:12 UTC 2010
-
-This package was originally debianized by Sage Weil <sage@newdream.net> on
-Mon, 28 Jan 2008 14:58:17 -0800.
-(see changelog.upstream)
-
-It was downloaded from <http://ceph.newdream.net/>.
-
-Upstream Author: Sage Weil <sage@newdream.net>
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: ceph
+Maintainer: Sage Weil <sage@newdream.net>
+Source: http://ceph.newdream.net/
 
 Files: *
 Copyright: (c) 2004-2010 by Sage Weil <sage@newdream.net>
-
 License: LGPL2.1 (see /usr/share/common-licenses/LGPL-2.1)
 
 Files: src/client/fuse.cc
@@ -30,7 +23,11 @@ License: LGPL2 or later
 
 Files: src/os/btrfs_ioctl.h
 Copyright: Copyright (C) 2007 Oracle.  All rights reserved.
-License: LGPL2
+License: GPL2
+
+Files: src/include/ceph_hash.cc
+Copyright: None
+License: Public domain
 
 Files: src/common/sctp_crc32.c: 
 Copyright:

diff --git a/debian/rados.install b/debian/rados.install
deleted file mode 100644 (file)
index c70f4e9..0000000
--- a/debian/rados.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/rados

diff --git a/debian/rules b/debian/rules
index 77e26f3c7c1441899ffb38cd69973be39d31bee8..7ac9fa32852b2c170533a3a7535acf10323f31dc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,9 +31,6 @@ install: build
 
        $(MAKE) DESTDIR=$(CURDIR) install
 
-       mkdir -p etc/ceph
-       mv usr/etc/ceph/* etc/ceph
-
 
 # Add here commands to install the package into debian/testpack.
 # Build architecture-independent files here.

diff --git a/src/Makefile.am b/src/Makefile.am
index c8a2754dc007329283567481f5b30a932592484d..7166d922068f98b216086c261e7f409c1036bc43 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -283,8 +283,9 @@ install-data-local:
        mkdir -p $(DESTDIR)$(libdir)/ceph
        $(install_sh_SCRIPT) -m 0755 ceph_common.sh $(DESTDIR)$(libdir)/ceph/ceph_common.sh
        mkdir -p $(DESTDIR)$(sysconfdir)/ceph
-       $(install_sh_SCRIPT) -m 0600 sample.ceph.conf $(DESTDIR)$(sysconfdir)/ceph/sample.ceph.conf
-       $(install_sh_SCRIPT) -m 0755 fetch_config $(DESTDIR)$(sysconfdir)/ceph/sample.fetch_config
+       mkdir -p $(DESTDIR)$(docdir)
+       $(install_sh_SCRIPT) -m 0600 sample.ceph.conf $(DESTDIR)$(docdir)/sample.ceph.conf
+       $(install_sh_SCRIPT) -m 0755 fetch_config $(DESTDIR)$(docdir)/sample.fetch_config
        mkdir -p $(DESTDIR)$(includedir)/ceph
        $(install_sh_SCRIPT) -m 0644 client/libceph.h $(DESTDIR)$(includedir)/ceph/libceph.h
        mkdir -p $(DESTDIR)$(includedir)/rados