[med-svn] [manta] 01/02: Replace libexec by /usr/lib/manta

[Andreas Tille]

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

tille pushed a commit to branch master
in repository manta.

commit ab7675013a57f232b4d02c35cf90d9a867385d9d
Author: Andreas Tille <tille at debian.org>
Date:   Tue May 2 11:04:16 2017 +0200

    Replace libexec by /usr/lib/manta
---
 debian/manta.install                     |  3 ++-
 debian/patches/force_debian_pathes.patch | 16 ++++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  3 +--
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/manta.install b/debian/manta.install
index ae274f5..34505b1 100644
--- a/debian/manta.install
+++ b/debian/manta.install
@@ -1,3 +1,4 @@
-usr/libexec/*		usr/lib/manta
+usr/lib/manta
 usr/lib/python/*	usr/share/manta
 usr/bin			usr
+debian/bin		usr
diff --git a/debian/patches/force_debian_pathes.patch b/debian/patches/force_debian_pathes.patch
new file mode 100644
index 0000000..88dd987
--- /dev/null
+++ b/debian/patches/force_debian_pathes.patch
@@ -0,0 +1,16 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 15 Nov 2016 14:29:08 +0100
+Description: libexec seems Redhat specific, in Debian the according files can
+ be found in /usr/lib/manta
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,7 +181,7 @@ check_prefix()
+ set(THIS_EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
+ set(THIS_BINDIR "${THIS_EXEC_PREFIX}/bin")
+ set(THIS_LIBDIR "${THIS_EXEC_PREFIX}/lib")
+-set(THIS_LIBEXECDIR "${THIS_EXEC_PREFIX}/libexec")
++set(THIS_LIBEXECDIR "/usr/lib/manta")
+ 
+ # paths w/o architecture dependency
+ set(THIS_PYTHON_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/python")
diff --git a/debian/patches/series b/debian/patches/series
index 6c1cc14..18c0a8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ use_debian_packaged_htslib.patch
 use_debian_packaged_samtools.patch
 fix_comparison.patch
 config_path.patch
+force_debian_pathes.patch
diff --git a/debian/rules b/debian/rules
index 547abe1..5857ba1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ override_dh_auto_install:
 
 override_dh_install:
 	dh_install
-	rmdir $(CURDIR)/debian/$(DEBPKGNAME)/usr/libexec
 	for py in $(CURDIR)/debian/$(DEBPKGNAME)/usr/lib/$(DEBPKGNAME)/*.py ; do \
 	    mv $$py $(CURDIR)/debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME)/ ; \
 	    ln -s ../../share/$(DEBPKGNAME)/`basename $$py` $(CURDIR)/debian/$(DEBPKGNAME)/usr/lib/$(DEBPKGNAME) ; \
@@ -32,5 +31,5 @@ override_dh_install:
 	mkdir -p $(CURDIR)/debian/$(DEBPKGNAME)/etc/$(DEBPKGNAME)
 	mv $(CURDIR)/debian/$(DEBPKGNAME)/usr/bin/configManta.py.ini $(CURDIR)/debian/$(DEBPKGNAME)/etc/$(DEBPKGNAME)/configManta.ini
 	for py in $(CURDIR)/debian/$(DEBPKGNAME)/usr/bin/*.py ; do \
-	    mv $$py $(CURDIR)/debian/$(DEBPKGNAME)/usr/bin/`basename $$py .py` ; \
+	    mv $$py $(CURDIR)/debian/$(DEBPKGNAME)/usr/share/manta/ ; \
 	done

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