[Debian-ha-commits] [crmsh] 01/03: Keep /usr/sbin/crm for now

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository crmsh.

commit b16c171ceed530a172be71ca518ad95e2398e479
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Thu Nov 3 09:52:05 2016 +0100

    Keep /usr/sbin/crm for now
    
    Move to /usr/bin is planned by upstream later on:
    https://github.com/ClusterLabs/crmsh/pull/163
---
 debian/crmsh.install | 2 +-
 debian/rules         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/crmsh.install b/debian/crmsh.install
index 4cc091a..18b686d 100644
--- a/debian/crmsh.install
+++ b/debian/crmsh.install
@@ -1,4 +1,4 @@
 etc/crm/*
-usr/bin/*
+usr/sbin/*
 usr/share/*
 usr/lib/python*/*
diff --git a/debian/rules b/debian/rules
index cbcbed0..a484e31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,9 @@ override_dh_auto_install:
 	dh_auto_install
 # remove redundant COPYING files
 	rm -v $(DOC)/COPYING $(DOC)/ChangeLog
+# keep crm in /usr/sbin for now
+	install -D debian/tmp/usr/bin/crm debian/tmp/usr/sbin/crm
+	rm debian/tmp/usr/bin/crm
 
 override_dh_compress:
 	find $(CURDIR)/debian/crmsh/ -name '*.pyo' | xargs rm -rf

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