From: Sage Weil <sage@newdream.net>
Date: Thu, 11 Feb 2010 18:36:38 +0000 (-0800)
Subject: debian: fix init script hackery
X-Git-Tag: v0.19~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe58fdb71fcb0f91f258da5f044b1718488e4e2c;p=ceph.git

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 712aeda78879..020aa2f87b13 100755
--- 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
index b538109d2e09..000000000000
--- 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 2540a7f76dbc..5cb8e9a21395 100644
--- 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 1e881eda3a54..e77248175524 100644
--- 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 6ebbbe89bdb1..fc0fe9091792 100755
--- 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: