[med-svn] [trinityrnaseq] 01/01: Split install of arch-dependent & arch-independent files, fixes FTBFS

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository trinityrnaseq.

commit bcbc351b9b51ca44d3748e17015162d9dbdcff73
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Sun Feb 7 01:51:38 2016 -0800

    Split install of arch-dependent & arch-independent files, fixes FTBFS
---
 debian/changelog |  7 +++++++
 debian/rules     | 16 ++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1bbcc34..608c3a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+trinityrnaseq (2.1.1+dfsg-2) UNRELEASED; urgency=medium
+
+  * Split install of arch-dependent & arch-independent files, fixes FTBFS
+    (Closes: #813958)
+
+ -- Michael R. Crusoe <crusoe at ucdavis.edu>  Sun, 07 Feb 2016 01:21:41 -0800
+
 trinityrnaseq (2.1.1+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #777697)
diff --git a/debian/rules b/debian/rules
index 2d46e5a..9063482 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,8 +38,8 @@ override_dh_auto_install:
 	for target in ${SOURCE_DIRECTORIES}; do dh_auto_install \
 		-O--sourcedirectory=$${target}; done
 
-override_dh_install:
-	dh_install
+override_dh_install-arch:
+	dh_install -a
 	find debian/trinityrnaseq -name '*.p?' | xargs sed -i \
 		's=^#!/usr/local/bin/perl=#!/usr/bin/perl='
 	chmod u+x \
@@ -47,14 +47,18 @@ override_dh_install:
 		${BASEDIR}/Analysis/FL_reconstruction_analysis/count_by_expression_quintile.pl \
 		${BASEDIR}/util/misc/capture_orig_n_unmapped_reads.pl \
 		${BASEDIR}/util/support_scripts/plugin_install_tests.sh \
-		${BASEDIR}/util/support_scripts/trinity_install_tests.sh \
+		${BASEDIR}/util/support_scripts/trinity_install_tests.sh
+	chmod -R a-x ${BASEDIR}/PerlLib/*.pm
+	chmod -R a-x ${BASEDIR}/PerlLib/*/*.pm
+	chmod a-x ${BASEDIR}/util/support_scripts/tests/test.py
+
+override_dh_install-indep:
+	dh_install -i
+	chmod u+x \
 		${EXBASEDIR}/sample_data/__regression_tests/test_GraphFromFasta/runMe.sh \
 		${EXBASEDIR}/sample_data/test_Inchworm/runMe_MPI.sh \
 		${EXBASEDIR}/sample_data/test_Trinity_Assembly/__indiv_ex_sample_derived/ex05/runMe.clean.sh \
 		${EXBASEDIR}/sample_data/test_Trinity_Assembly/__indiv_ex_sample_derived/ex05/runMe.sh
-	chmod -R a-x ${BASEDIR}/PerlLib/*.pm
-	chmod -R a-x ${BASEDIR}/PerlLib/*/*.pm
-	chmod a-x ${BASEDIR}/util/support_scripts/tests/test.py
 
 get-orig-source:
 	uscan --verbose --force-download --repack --compression xz

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