[Debian-islamic-commits] [SCM] Packaging for libitl branch, master, updated. debian/0.7.0-3-6-g700d018

[أحمد المحمو =?UTF-8?Q?=D8=AF=D9=8A=20?=(Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit f5a2cc9bc2f2ed6a547733a5d0ef21efa891658a
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Fri Jul 8 18:19:10 2011 +0200

    Multiarch support
    
    * Bumped compat level to 9
    * debian/control: Build-Dep on debhelper (>= 8.1.3)
    * debian/*.install: usr/lib/ -> /usr/lib/*/
    * debian/rules: override libdir setting in dh_auto_configure

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 9d7bd53..5f12b13 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Islamic Maintainers <debian-islamic-maintainers at lists.alioth.debian.org>
 Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8)
+Build-Depends: debhelper (>= 8.1.3)
 Standards-Version: 3.9.2
 Homepage: http://www.arabeyes.org/project.php?proj=ITL
 Vcs-Git: git://git.debian.org/git/debian-islamic/packages/libitl.git
@@ -27,6 +27,7 @@ Description: Islamic tools & libraries project - development files
 Package: libitl0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: Islamic tools & libraries project - shared library
  This library allows applications to convert between Hijri/Gregorian
  dates and compute Muslim prayer times and Qibla direction based on
diff --git a/debian/libitl-dev.install b/debian/libitl-dev.install
index 3ae7149..809e794 100644
--- a/debian/libitl-dev.install
+++ b/debian/libitl-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/itl/*
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/lib*.so
+usr/include/itl/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff --git a/debian/libitl0.install b/debian/libitl0.install
index c45ebcf..3ddde58 100644
--- a/debian/libitl0.install
+++ b/debian/libitl0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index e134736..82a801c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,13 @@
 
 major=0
 DOCDIR = debian/libitl$(major)/usr/share/doc/libitl$(major)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- prefix=$(CURDIR)/debian/tmp/usr
+	dh_auto_configure -- prefix=$(CURDIR)/debian/tmp/usr libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_build:
 	$(MAKE) static

-- 
Packaging for libitl