[caffe] 03/07: add multi-arch support

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch master
in repository caffe.

commit dc1608026cc57fdd246156464ef29604a093b4df
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Fri May 6 09:10:57 2016 +0000

    add multi-arch support
---
 debian/control             | 4 ++++
 debian/libcaffe.install.in | 2 +-
 debian/rules               | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 988c135..b5a25f4 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,7 @@ X-Python-Version: >= 2.7
 
 Package: caffe-cpu
 Architecture: any
+Multi-Arch: foreign
 Depends: libcaffe-cpu1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -53,6 +54,7 @@ Description: Fast, open framework for Deep Learning (CPU_ONLY)
 Package: libcaffe-cpu1
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: libcaffe-cuda1
 Description: library of Caffe, a deep learning framework (CPU_ONLY)
@@ -65,6 +67,7 @@ Description: library of Caffe, a deep learning framework (CPU_ONLY)
 Package: libcaffe-cpu-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: foreign
 Conflicts: libcaffe-cuda-dev
 Depends: libcaffe-cpu1 (= ${binary:Version}), ${misc:Depends}
 Description: development files for Caffe (CPU_ONLY)
@@ -77,6 +80,7 @@ Description: development files for Caffe (CPU_ONLY)
 Package: python-caffe-cpu
 Section: python
 Architecture: any
+Multi-Arch: foreign
 Depends: libcaffe-cpu1 (= ${binary:Version}),
          python-skimage,
          python-protobuf,
diff --git a/debian/libcaffe.install.in b/debian/libcaffe.install.in
index 7a1b3dd..3c88a8c 100644
--- a/debian/libcaffe.install.in
+++ b/debian/libcaffe.install.in
@@ -1 +1 @@
-debian/tmp/#CAFFE_CONFIGURE#/lib/libcaffe.so.#CAFFE_SOVER# usr/lib/
+debian/tmp/#CAFFE_CONFIGURE#/lib/libcaffe.so.#CAFFE_SOVER# usr/lib/#DEB_HOST_MULTIARCH#/
diff --git a/debian/rules b/debian/rules
index 02f41d8..6a7cbbc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 include /usr/share/dpkg/buildflags.mk
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 RULES         := debian/rules
 ORIG_SOURCE   := "https://github.com/BVLC/caffe/archive/rc3.tar.gz"
 CAFFE_SOVER   := "1.0.0-rc3"
@@ -61,7 +62,7 @@ CONFFLAG_CPU = \
 		--with python2,bash-completion
 
 autogen:
-	python3 debian/template_autogen.py $(CAFFE_SOVER)
+	python3 debian/template_autogen.py $(CAFFE_SOVER) $(DEB_HOST_MULTIARCH)
 
 override_dh_auto_configure: autogen
 	dh_auto_configure --builddirectory=$(BUILDDIR) \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe.git