[Crosstoolchain-logs] [device-tree-compiler] 05/08: Import Debian patch 1.4.0-2

[Hector Oron]

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

zumbi pushed a commit to branch debian/master
in repository device-tree-compiler.

commit 125dcb17becc8996f3898d7ee8c62d594272f129
Author: Riku Voipio <riku.voipio at linaro.org>
Date:   Fri Aug 23 14:58:19 2013 +0300

    Import Debian patch 1.4.0-2
---
 debian/changelog          | 6 ++++++
 debian/control            | 2 ++
 debian/libfdt-dev.install | 4 ++--
 debian/libfdt1.install    | 4 ++--
 debian/rules              | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2fa0329..79e3cc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+device-tree-compiler (1.4.0-2) unstable; urgency=low
+
+  * Convert to multiarch
+
+ -- Riku Voipio <riku.voipio at linaro.org>  Fri, 23 Aug 2013 14:58:19 +0300
+
 device-tree-compiler (1.4.0-1) unstable; urgency=low
 
   * Added myself to maintainers
diff --git a/debian/control b/debian/control
index ce93581..a52558c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=crosstoolchain/device-tree-comp
 Package: device-tree-compiler
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
 Description: Device Tree Compiler for Flat Device Trees
  Device Tree Compiler, dtc, takes as input a device-tree in
  a given format and outputs a device-tree in another format
@@ -23,6 +24,7 @@ Description: Device Tree Compiler for Flat Device Trees
 Package: libfdt1
 Architecture: any
 Section: libs
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Flat Device Trees manipulation library
  This is a library containing functions for manipulating Flat Device Trees.
diff --git a/debian/libfdt-dev.install b/debian/libfdt-dev.install
index e65e814..9df2f44 100644
--- a/debian/libfdt-dev.install
+++ b/debian/libfdt-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/libfdt.a
-usr/lib/libfdt.so
+usr/lib/*/libfdt.a
+usr/lib/*/libfdt.so
diff --git a/debian/libfdt1.install b/debian/libfdt1.install
index 53545f2..d9781f7 100644
--- a/debian/libfdt1.install
+++ b/debian/libfdt1.install
@@ -1,2 +1,2 @@
-usr/lib/libfdt-*.so
-usr/lib/libfdt.so.*
+usr/lib/*/libfdt-*.so
+usr/lib/*/libfdt.so.*
diff --git a/debian/rules b/debian/rules
index 3e23276..b295a07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ install: build
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_install --list-missing --sourcedir=debian/tmp
 	touch install-stamp
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/device-tree-compiler.git