[Debian-ha-svn-commits] [SCM] corosync Debian packaging branch, master, updated. debian/1.0.0-5

Guido Günther agx at sigxcpu.org
Sat Aug 29 11:15:38 UTC 2009


The following commit has been merged in the master branch:
commit 51b386c45129ac496130a796cc2b234afe59258e
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Aug 28 06:19:57 2009 +0200

    install lcrso into default location

diff --git a/debian/corosync.install b/debian/corosync.install
index 5eb3b8b..32b893e 100644
--- a/debian/corosync.install
+++ b/debian/corosync.install
@@ -1,6 +1,6 @@
 usr/sbin
 usr/share/man/man5
 usr/share/man/man8
-usr/lib/corosync/lcrso
+usr/lib/lcrso
 usr/share/doc/corosync/html/
 etc/corosync/
diff --git a/debian/rules b/debian/rules
index 442aa06..e13c34d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,6 @@ configure-stamp: patch
 		    --libexecdir=/usr/lib/ \
 		    --localstatedir=/var \
 		    --sysconfdir=/etc \
-		    --with-lcrso-dir=/usr/lib/corosync/lcrso \
 		    --with-socket-dir=/var/run/corosync
 	touch configure-stamp
 
@@ -50,12 +49,12 @@ install: build
 	dh_installlogrotate
 	dh_strip --dbg-package=corosync-dbg
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/corosync/usr/lib/corosync/lcrso/*
+	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/corosync/usr/lib/lcrso/*
 endif
 	# install example configuration file
 	cp -ax $(CURDIR)/debian/corosync.example-config $(CURDIR)/debian/corosync/etc/corosync/corosync.conf
 	dh_compress
-	chmod 644 debian/corosync/usr/lib/corosync/lcrso/*.lcrso
+	chmod 644 debian/corosync/usr/lib/lcrso/*.lcrso
 	dh_fixperms
 	dh_makeshlibs -V
 	dh_installdeb

-- 
corosync Debian packaging



More information about the Debian-ha-svn-commits mailing list