[sheepdog] [PATCH stable-0.7 5/7] Install collie as a symoble link to dog

Hitoshi Mitake mitake.hitoshi at gmail.com
Mon Nov 4 09:27:30 CET 2013


From: YunQiang Su <wzssyqa at gmail.com>

Install bash-completion for both collie and dog
Don't do link in postinst/postrm, as it will not in
   track of dpkg.
   Use dh_links instead

Signed-off-by: YunQiang Su <wzssyqa at gmail.com>
Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
 debian/sheepdog.bash-completion | 1 +
 debian/sheepdog.links           | 1 +
 debian/sheepdog.postinst        | 2 --
 debian/sheepdog.postrm          | 2 --
 4 files changed, 2 insertions(+), 4 deletions(-)
 create mode 100644 debian/sheepdog.links

diff --git a/debian/sheepdog.bash-completion b/debian/sheepdog.bash-completion
index ba7fc2b..0aeca14 100644
--- a/debian/sheepdog.bash-completion
+++ b/debian/sheepdog.bash-completion
@@ -1 +1,2 @@
 script/bash_completion_dog dog
+script/bash_completion_dog collie
diff --git a/debian/sheepdog.links b/debian/sheepdog.links
new file mode 100644
index 0000000..40940d1
--- /dev/null
+++ b/debian/sheepdog.links
@@ -0,0 +1 @@
+/usr/sbin/dog /usr/sbin/collie
diff --git a/debian/sheepdog.postinst b/debian/sheepdog.postinst
index c0d3c0f..bc72f06 100644
--- a/debian/sheepdog.postinst
+++ b/debian/sheepdog.postinst
@@ -24,8 +24,6 @@ if [ "$1" = "configure" ] ; then
 	db_stop || true
 fi
 
-ln -s -f /usr/sbin/dog /usr/sbin/collie
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/sheepdog.postrm b/debian/sheepdog.postrm
index 9ff442b..1611169 100644
--- a/debian/sheepdog.postrm
+++ b/debian/sheepdog.postrm
@@ -6,8 +6,6 @@ if [ "${1}" = "purge" ] ; then
 	rm -f /etc/default/sheepdog
 fi
 
-rm -f /usr/sbin/collie
-
 #DEBHELPER#
 
 exit 0
-- 
1.8.1.2




More information about the sheepdog mailing list