From 3f67cba6b3789ec1bbcda2678f28fe47dee7e9de Mon Sep 17 00:00:00 2001
From: Stefan Kisdaroczi <kisda@domain.hid>
Date: Tue, 23 Feb 2010 17:07:13 +0100
Subject: [PATCH] debian: wrapper script /usr/bin/xeno to call executables in /usr/lib/xenomai/

---
 debian/rules                    |    9 ++++++---
 debian/xeno                     |   10 ++++++++++
 debian/xeno.1                   |   17 +++++++++++++++++
 debian/xenomai-runtime.dirs     |    1 +
 debian/xenomai-runtime.manpages |    1 +
 5 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 debian/xeno
 create mode 100644 debian/xeno.1
 create mode 100644 debian/xenomai-runtime.dirs
 create mode 100644 debian/xenomai-runtime.manpages

diff --git a/debian/rules b/debian/rules
index fa93f62..ee6cde7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,13 +87,16 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
 	dh_install --sourcedir=$(CURDIR)/debian/tmp
 	# xeno-config should be only in libxenomai-dev
 	rm -f $(CURDIR)/debian/xenomai-runtime/usr/bin/xeno-config
 	rm -f $(CURDIR)/debian/xenomai-runtime/usr/share/man/man1/xeno-config.1
+	mv $(CURDIR)/debian/xenomai-runtime/usr/bin/* \
+		$(CURDIR)/debian/xenomai-runtime/usr/lib/xenomai/
+	install -m 755 debian/xeno $(CURDIR)/debian/xenomai-runtime/usr/bin/xeno
 	for f in $(CURDIR)/ksrc/nucleus/udev/*.rules ; do \
 	    cat $$f >> $(CURDIR)/debian/libxenomai1/etc/udev/xenomai.rules ; \
 	done
@@ -108,8 +111,8 @@ binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdocs -i -A CREDITS README.INSTALL TROUBLESHOOTING
-	dh_installchangelogs -i
 	dh_link -i
+	dh_installchangelogs -i
 	dh_strip -i
 	dh_compress -i -X.pdf
 	dh_fixperms -i
@@ -131,8 +134,8 @@ binary-arch: build install
 	dh_testroot -s
 	dh_installman -s
 	dh_installdocs -s -A CREDITS README.INSTALL TROUBLESHOOTING
-	dh_installchangelogs -s
 	dh_link -s
+	dh_installchangelogs -s
 	dh_strip -s
 	dh_compress -s
 	dh_fixperms -s
diff --git a/debian/xeno b/debian/xeno
new file mode 100644
index 0000000..721914e
--- /dev/null
+++ b/debian/xeno
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Wrapper script to call original /usr/bin executables from /usr/lib/xenomai
+#
+# e.g. "xeno latency"
+#
+
+BINDIR=/usr/lib/xenomai
+
+"$BINDIR/$@"
diff --git a/debian/xeno.1 b/debian/xeno.1
new file mode 100644
index 0000000..cec55b1
--- /dev/null
+++ b/debian/xeno.1
@@ -0,0 +1,17 @@
+.TH xeno 1 "14 February 2010" "Version 1" "Xeno Manual"
+
+.SH NAME
+xeno \- Wrapper for Xenomai executables
+
+.SH SYNOPSIS
+xeno [xenomai command]
+
+.SH DESCRIPTION
+.B xeno
+is a wrapper script that makes the common Xenomai userland executables
+available to the user because they don't reside in /usr/bin anymore to prevent
+filename collisions.
+
+.SH AUTHOR
+The wrapper script xeno and this manpage were initially written by Roland
+Stigge <stigge@domain.hid> for the Debian project but may be used elsewhere.
diff --git a/debian/xenomai-runtime.dirs b/debian/xenomai-runtime.dirs
new file mode 100644
index 0000000..6bea564
--- /dev/null
+++ b/debian/xenomai-runtime.dirs
@@ -0,0 +1 @@
+usr/lib/xenomai
diff --git a/debian/xenomai-runtime.manpages b/debian/xenomai-runtime.manpages
new file mode 100644
index 0000000..9555541
--- /dev/null
+++ b/debian/xenomai-runtime.manpages
@@ -0,0 +1 @@
+debian/xeno.1
-- 
1.5.6.5