debian: fix init script hackery

Copy src/init-ceph to debian/ceph.init _after_ we make, so that
the autoconf paths are substituted in properly.

diff --git a/build_upload_debian_packages.sh b/build_upload_debian_packages.sh
index 712aeda78879702d5e7b5c05eec3e810f13399db..020aa2f87b135bbfc2fe63bd1281fe88b3a78098 100755 (executable)
--- a/build_upload_debian_packages.sh
+++ b/build_upload_debian_packages.sh
@@ -64,7 +64,7 @@ tar zxf ceph_$finalvers.orig.tar.gz
 
 # copy in debian dir, fix up changelog
 echo setting up debian dir
-cp -aL ../debian ceph-$finalvers
+cp -a ../debian ceph-$finalvers
 if [ "$vers" != "$finalvers" ]; then
     cd ceph-$finalvers
     DEBEMAIL="sage@newdream.net" dch -v $finalvers-1 'git snapshot'

diff --git a/debian/ceph.init b/debian/ceph.init
deleted file mode 120000 (symlink)
index b538109..0000000
--- a/debian/ceph.init
+++ /dev/null
@@ -1 +0,0 @@
-../src/init-ceph
\ No newline at end of file

diff --git a/debian/libcrush1-dev.dirs b/debian/libcrush1-dev.dirs
index 2540a7f76dbc2eb07ddf9d3aa6f2f88da863157c..5cb8e9a21395909ae3e02181a7ae74cc6d9d45e6 100644 (file)
--- a/debian/libcrush1-dev.dirs
+++ b/debian/libcrush1-dev.dirs
@@ -1,2 +1,2 @@
 /usr/lib
-/usr/include/crush
\ No newline at end of file
+/usr/include/crush

diff --git a/debian/rados.dirs b/debian/rados.dirs
index 1e881eda3a544eaa86b6019cbe7067ffc58bfafc..e77248175524d9f63749c2d6ca67159eeb4aa635 100644 (file)
--- a/debian/rados.dirs
+++ b/debian/rados.dirs
@@ -1 +1 @@
-usr/bin
\ No newline at end of file
+usr/bin

diff --git a/debian/rules b/debian/rules
index 6ebbbe89bdb1ac44438221aa0f8750012e24b393..fc0fe90917929c07115af33fe5817675c50b4291 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ build-stamp: configure-stamp
        ./autogen.sh
        ./configure --prefix=/usr
        $(MAKE)
+       cp src/init-ceph debian/ceph.init
 
        touch $@
 clean: