[med-svn] [ncbi-vdb] 01/06: Use wildcard instead of $(CPU) in install to fix FTBFS on i386

[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 b366c12e2f424e8ff29aa10e1a28cf99968c0110
Author: Andreas Tille <tille at debian.org>
Date:   Fri Nov 4 08:20:40 2016 +0100

    Use wildcard instead of $(CPU) in install to fix FTBFS on i386
---
 debian/changelog |  8 ++++++++
 debian/rules     | 26 +++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c1e1f5..4623cc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ncbi-vdb (2.7.0+dfsg-5) UNRELEASED; urgency=medium
+
+  * Use wildcard instead of $(CPU) in install to fix FTBFS on i386 (thanks
+    for the patch to Logan Rosen <logan at ubuntu.com>)
+    Closes: #843129
+
+ -- Andreas Tille <tille at debian.org>  Fri, 04 Nov 2016 08:19:31 +0100
+
 ncbi-vdb (2.7.0+dfsg-4) unstable; urgency=medium
 
   * Fix schema paths
diff --git a/debian/rules b/debian/rules
index 3e2f46d..3aa46c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,30 +58,30 @@ override_dh_auto_install:
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/lib/libncbi-ngs-c++.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/ilib/libkapp.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/ilib/libkapp-norsrc.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/ilib/libkff.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/ilib/libktst.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/ilib/libkxfs.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/ilib/libkxml.a usr/lib/$(BUILDTYPE) \
-                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/ilib/libload.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/ilib/libtui.a usr/lib/$(BUILDTYPE) \
-                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/ilib/libtui_cpp.a usr/lib/$(BUILDTYPE) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-ngs-c++.a usr/lib/$(BUILDTYPE) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp.a usr/lib/$(BUILDTYPE) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp-norsrc.a usr/lib/$(BUILDTYPE) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkff.a usr/lib/$(BUILDTYPE) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libktst.a usr/lib/$(BUILDTYPE) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxfs.a usr/lib/$(BUILDTYPE) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxml.a usr/lib/$(BUILDTYPE) \
+                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libload.a usr/lib/$(BUILDTYPE) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui.a usr/lib/$(BUILDTYPE) \
+                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui_cpp.a usr/lib/$(BUILDTYPE) \
 		    --movedev interfaces usr/include \
-		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/lib/libncbi-vdb.so
+		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-vdb.so
 	mv debian/libncbi-vdb-dev/usr/include/interfaces debian/libncbi-vdb-dev/usr/include/$(DEBPKGNAME)
 	d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \
 		    --override s/libhdf5_serial[0-9]*-dev/libhdf5-dev/ \
-		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/lib/libkdf5.so
+		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libkdf5.so
 	d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \
-		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/lib/libncbi-wvdb.so
+		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-wvdb.so
 	find debian/lib* -name .gitignore -delete
 	# move schemata from development packages to library packages since these are used in executables
 	mkdir -p $(SCHEMADIR)

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