Please convert libfontenc to multiarch

From 317780117638f896e40333d7bac5d37c4d1ba539 Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@linaro.org>
Date: Mon, 2 Jan 2012 16:50:43 +0200
Subject: [PATCH] libfontenc: multiarch conversion

The following patch converts libfontench to multi-arch
---
 debian/changelog                |    6 ++++++
 debian/control                  |    5 ++++-
 debian/libfontenc-dev.install   |    6 +++---
 debian/libfontenc1-udeb.install |    2 +-
 debian/libfontenc1.install      |    2 +-
 debian/rules                    |    2 ++
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 830dce6..52a263a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@ 
+libfontenc (1:1.1.0-1.1) unstable; urgency=low
+
+  * Multi-Arch conversion
+
+ -- Riku Voipio <riku.voipio@linaro.org>  Mon, 02 Jan 2012 16:28:19 +0200
+
 libfontenc (1:1.1.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 2149c3c..b7274d1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@  Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
 Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
  x11proto-core-dev (>= 6.8.99.15+cvs.20050722),
  zlib1g-dev,
  pkg-config,
@@ -20,6 +20,8 @@  Package: libfontenc1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: X11 font encoding library
  libfontenc is a library which helps font libraries portably determine
  and deal with different encodings of fonts.
@@ -60,6 +62,7 @@  Package: libfontenc-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libfontenc1 (= ${binary:Version}), zlib1g-dev
+Multi-Arch: same
 Description: X11 font encoding library (development headers)
  libfontenc is a library which helps font libraries portably determine
  and deal with different encodings of fonts.
diff --git a/debian/libfontenc-dev.install b/debian/libfontenc-dev.install
index fd2e598..9929f91 100644
--- a/debian/libfontenc-dev.install
+++ b/debian/libfontenc-dev.install
@@ -1,4 +1,4 @@ 
 usr/include/X11/*
-usr/lib/libfontenc.a
-usr/lib/libfontenc.so
-usr/lib/pkgconfig/fontenc.pc
+usr/lib/*/libfontenc.a
+usr/lib/*/libfontenc.so
+usr/lib/*/pkgconfig/fontenc.pc
diff --git a/debian/libfontenc1-udeb.install b/debian/libfontenc1-udeb.install
index c3876f6..16b37f9 100644
--- a/debian/libfontenc1-udeb.install
+++ b/debian/libfontenc1-udeb.install
@@ -1 +1 @@ 
-usr/lib/libfontenc.so.1*
+usr/lib/*/libfontenc.so.1*
diff --git a/debian/libfontenc1.install b/debian/libfontenc1.install
index c3876f6..16b37f9 100644
--- a/debian/libfontenc1.install
+++ b/debian/libfontenc1.install
@@ -1 +1 @@ 
-usr/lib/libfontenc.so.1*
+usr/lib/*/libfontenc.so.1*
diff --git a/debian/rules b/debian/rules
index 8c867eb..7526477 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@  ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -40,6 +41,7 @@  build-stamp:
 	mkdir -p build
 	cd build && \
 	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+	             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	             --infodir=\$${prefix}/share/info $(confflags) \
 		     --with-encodingsdir=\$${datadir}/fonts/X11/encodings \
 	             CFLAGS="$(CFLAGS)" 
-- 
1.7.5.4