[freeimage] 11/18: Add multi-arch support.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/experimental
in repository freeimage.

commit 5146283db6c98f0dad351439b9423e9fd8ba0ca9
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Nov 4 18:48:39 2015 +0000

    Add multi-arch support.
---
 debian/control                      |  6 ++++++
 debian/libfreeimage-dev.install     |  2 +-
 debian/libfreeimage3.install        |  4 ++--
 debian/libfreeimageplus-dev.install |  2 +-
 debian/libfreeimageplus3.install    |  4 ++--
 debian/rules                        | 12 ++++++++++--
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 86ae090..c34e622 100644
--- a/debian/control
+++ b/debian/control
@@ -39,8 +39,10 @@ Description: Support library for graphics image formats (development files)
 
 Package: libfreeimage3
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: Support library for graphics image formats (library)
  FreeImage is an Open Source C/C++ library project for developers who would
  like to support popular graphics image formats like PNG, BMP, JPEG, TIFF
@@ -52,6 +54,7 @@ Description: Support library for graphics image formats (library)
 
 Package: libfreeimage3-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: libfreeimage3 (= ${binary:Version}),
@@ -82,8 +85,10 @@ Description: C++ wrappers for FreeImage (development files)
 
 Package: libfreeimageplus3
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: C++ wrappers for freeimage (library)
  FreeImage is an Open Source C/C++ library project for developers who would
  like to support popular graphics image formats like PNG, BMP, JPEG, TIFF
@@ -95,6 +100,7 @@ Description: C++ wrappers for freeimage (library)
 
 Package: libfreeimageplus3-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: libfreeimageplus3 (= ${binary:Version}),
diff --git a/debian/libfreeimage-dev.install b/debian/libfreeimage-dev.install
index 8224bc7..12ab325 100644
--- a/debian/libfreeimage-dev.install
+++ b/debian/libfreeimage-dev.install
@@ -1,2 +1,2 @@
 usr/include/FreeImage.h
-usr/lib/libfreeimage.so
+usr/lib/*/libfreeimage.so
diff --git a/debian/libfreeimage3.install b/debian/libfreeimage3.install
index 1ac73b4..02d9279 100644
--- a/debian/libfreeimage3.install
+++ b/debian/libfreeimage3.install
@@ -1,2 +1,2 @@
-usr/lib/libfreeimage-*.so
-usr/lib/libfreeimage.so.*
+usr/lib/*/libfreeimage-*.so
+usr/lib/*/libfreeimage.so.*
diff --git a/debian/libfreeimageplus-dev.install b/debian/libfreeimageplus-dev.install
index f285479..33590e1 100644
--- a/debian/libfreeimageplus-dev.install
+++ b/debian/libfreeimageplus-dev.install
@@ -1,2 +1,2 @@
 usr/include/FreeImagePlus.h
-usr/lib/libfreeimageplus.so
+usr/lib/*/libfreeimageplus.so
diff --git a/debian/libfreeimageplus3.install b/debian/libfreeimageplus3.install
index 0b83953..e53a775 100644
--- a/debian/libfreeimageplus3.install
+++ b/debian/libfreeimageplus3.install
@@ -1,2 +1,2 @@
-usr/lib/libfreeimageplus-*.so
-usr/lib/libfreeimageplus.so.*
+usr/lib/*/libfreeimageplus-*.so
+usr/lib/*/libfreeimageplus.so.*
diff --git a/debian/rules b/debian/rules
index bb32245..1b66bd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,14 @@ CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -fPIC
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -fPIC
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
+# Environment information.
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+# Installation paths.
+DESTDIR = $(CURDIR)/debian/tmp
+INSTALL_INCDIR = $(DESTDIR)/usr/include
+INSTALL_LIBDIR = $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --with=autoreconf --parallel
 
@@ -22,8 +30,8 @@ override_dh_auto_build:
 	$(MAKE) -f Makefile.fip CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_install:
-	dh_auto_install
-	$(MAKE) -f Makefile.fip install DESTDIR=$(CURDIR)/debian/tmp
+	dh_auto_install -- INCDIR="$(INSTALL_INCDIR)" INSTALLDIR="$(INSTALL_LIBDIR)"
+	$(MAKE) -f Makefile.fip install INCDIR="$(INSTALL_INCDIR)" INSTALLDIR="$(INSTALL_LIBDIR)"
 
 override_dh_auto_clean:
 	dh_auto_clean

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