[med-svn] [gubbins] 03/05: gubbins executable prints that it is not intended for direct usage - so hide this from the user and move wrapper scripts into PATH

[Andreas Tille]

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

tille pushed a commit to branch master
in repository gubbins.

commit 3166b796f0ed15852a5a0c1a2c78fe8dc76c1c92
Author: Andreas Tille <tille at debian.org>
Date:   Mon Nov 30 12:05:40 2015 +0100

    gubbins executable prints that it is not intended for direct usage - so hide this from the user and move wrapper scripts into PATH
---
 debian/links                                |  2 ++
 debian/patches/gubbins_exe_in_usr_lib.patch | 18 ++++++++++++++++++
 debian/patches/series                       |  1 +
 debian/rules                                |  9 +++++++++
 4 files changed, 30 insertions(+)

diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..b25370a
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,2 @@
+usr/share/gubbins/run_gubbins.py	usr/bin/run_gubbins
+usr/share/gubbins/gubbins_drawer.py	usr/bin/gubbins_drawer
diff --git a/debian/patches/gubbins_exe_in_usr_lib.patch b/debian/patches/gubbins_exe_in_usr_lib.patch
new file mode 100644
index 0000000..ed761d7
--- /dev/null
+++ b/debian/patches/gubbins_exe_in_usr_lib.patch
@@ -0,0 +1,18 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 19 Nov 2015 10:45:48 +0100
+Description: gubbins executable prints that it is not intended for direct usage
+ While default install procedure installs gubbins executable to /usr/bin
+ it prints that it is intended to be called from run_gubbins.  So it makes
+ sense to rather install it to /usr/lib/gubbins instead of /usr/bin.
+
+--- a/python/gubbins/common.py
++++ b/python/gubbins/common.py
+@@ -148,7 +148,7 @@ class GubbinsCommon():
+     FASTTREE_EXEC = GubbinsCommon.choose_executable(fasttree_executables)
+     
+     FASTTREE_PARAMS = '-nosupport -gtr -gamma -nt'
+-    GUBBINS_EXEC = 'gubbins'
++    GUBBINS_EXEC = '/usr/lib/gubbins/gubbins'
+ 
+     FASTML_EXEC = Fastml('fastml').fastml_parameters
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b4f2541..1bb9bdc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 add_missing_lib_for_check.patch
 do_not_handle_python_by_upstream_build_system.patch
+gubbins_exe_in_usr_lib.patch
diff --git a/debian/rules b/debian/rules
index e7dfa8e..6ef7d4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+
 %:
 	dh $@  --with autoreconf --with python3
 
@@ -17,6 +19,13 @@ override_dh_auto_test:
 	cd python && \
 	python3 setup.py test
 
+override_dh_install:
+	dh_install
+	find debian -name "*.la" -delete
+	find debian -name "*.a" -delete
+	mkdir -p debian/$(DEBPKGNAME)/usr/lib/$(DEBPKGNAME)
+	mv debian/$(DEBPKGNAME)/usr/bin/gubbins debian/$(DEBPKGNAME)/usr/lib/$(DEBPKGNAME)
+
 override_dh_clean:
 	dh_clean
 	rm -rf python/*.egg-info python/build  python/Makefile

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