[med-svn] [ncbi-vdb] 01/03: Fix install target, DEP3

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ncbi-vdb.

commit d783354b6271f508b54b11199216dd51b0cbad49
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jul 15 23:57:32 2016 +0200

    Fix install target, DEP3
---
 debian/patches/debug_configure.patch    |  5 +++++
 debian/patches/find_ngs-sdk.patch       |  4 ++++
 debian/patches/fix_install_target.patch | 18 ++++++++++++++++++
 debian/patches/series                   |  1 +
 debian/patches/skip_failing_test.patch  |  5 +++++
 5 files changed, 33 insertions(+)

diff --git a/debian/patches/debug_configure.patch b/debian/patches/debug_configure.patch
index a1c658d..15986ef 100644
--- a/debian/patches/debug_configure.patch
+++ b/debian/patches/debug_configure.patch
@@ -1,3 +1,8 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 12 Jul 2016 16:15:32 +0200
+Description: Force debugging output (--with-debug in d/rules is ignored
+ by the build system)
+
 --- a/setup/konfigure.perl
 +++ b/setup/konfigure.perl
 @@ -426,6 +426,7 @@ if ($TOOLS =~ /gcc$/ && check_no_array_b
diff --git a/debian/patches/find_ngs-sdk.patch b/debian/patches/find_ngs-sdk.patch
index 2853f9b..3b5a2e7 100644
--- a/debian/patches/find_ngs-sdk.patch
+++ b/debian/patches/find_ngs-sdk.patch
@@ -1,3 +1,7 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 12 Jul 2016 16:15:32 +0200
+Description: Enable finding ngs-sdk
+
 --- a/setup/konfigure.perl
 +++ b/setup/konfigure.perl
 @@ -1285,7 +1285,9 @@ sub find_in_dir {
diff --git a/debian/patches/fix_install_target.patch b/debian/patches/fix_install_target.patch
new file mode 100644
index 0000000..cd0e1f0
--- /dev/null
+++ b/debian/patches/fix_install_target.patch
@@ -0,0 +1,18 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 12 Jul 2016 16:15:32 +0200
+Description: Install target tries to install to /usr/lib64 which is broken on
+ one hand and on the other hand I have not found a proper method to stop this
+ by less invasive means
+
+--- a/Makefile
++++ b/Makefile
+@@ -65,7 +65,8 @@ $(SUBDIRS_STD):
+ install: 
+ 	@ echo "Checking make status of object libraries..."
+ 	@ $(MAKE) -s --no-print-directory TOP=$(CURDIR) $(SUBDIRS)
+-	@ $(MAKE) -s --no-print-directory TOP=$(CURDIR) -f build/Makefile.install install
++	# Skip useless broken part of install target
++	#@ $(MAKE) -s --no-print-directory TOP=$(CURDIR) -f build/Makefile.install install
+ 
+ uninstall:    
+ 	@ $(MAKE) -s TOP=$(CURDIR) -f build/Makefile.install uninstall
diff --git a/debian/patches/series b/debian/patches/series
index 60a0479..00fb80b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ debug_configure.patch
 find_hdf5_serial.patch
 find_ngs-sdk.patch
 skip_failing_test.patch
+fix_install_target.patch
diff --git a/debian/patches/skip_failing_test.patch b/debian/patches/skip_failing_test.patch
index 42cda7b..2d09abd 100644
--- a/debian/patches/skip_failing_test.patch
+++ b/debian/patches/skip_failing_test.patch
@@ -1,3 +1,8 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 12 Jul 2016 16:15:32 +0200
+Description: Skip some tests that are failing in pbuilder.
+ FIXME: There are more tests to skip but I have given up for the moment.
+
 --- a/test/kfs/cacheteetest.cpp
 +++ b/test/kfs/cacheteetest.cpp
 @@ -484,7 +484,7 @@ TEST_CASE( CacheTee_Multiple_Users_Singl

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