[SCM] libindi packaging branch, master, updated. f66a43d308df19a62e4b13b3378539e171e3f0b6

[Pino Toscano]

The following commit has been merged in the master branch:
commit 4388920f5af6bb78e5d787e01dcccbcbafeb47b4
Author: Pino Toscano <pino at debian.org>
Date:   Thu Sep 29 14:22:34 2011 +0200

    convert to multiarch
    
    - bump debhelper build dependency to 8.1.3~
    - add "Pre-Depends: ${misc:Pre-Depends}" for libindi0 and indi-dbg
    - set libindi0 "Multi-Arch: same" and libindi-data "Multi-Arch: foreign"
    - pass a custom LIB_DESTINATION to cmake
    - adjust paths in .install files
---
 debian/control             |    6 +++++-
 debian/libindi-dev.install |    4 +++-
 debian/libindi0.install    |    4 ++--
 debian/rules               |    4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index f41f2fc..038c90c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Krap Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Pino Toscano <pino at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
  cmake (>= 2.4.7),
  libboost-dev,
  libcfitsio3-dev,
@@ -19,7 +19,9 @@ Package: libindi0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libindi-data (>= ${source:Version})
+Pre-Depends: ${misc:Pre-Depends}
 Suggests: indi
+Multi-Arch: same
 Description: ... -- shared library
  ...
  .
@@ -37,6 +39,7 @@ Description: ... -- development files
 Package: libindi-data
 Architecture: all
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: ... -- shared data
  ...
  .
@@ -55,6 +58,7 @@ Priority: extra
 Section: debug
 Architecture: any
 Depends: libindi0 (= ${binary:Version}), ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: ... -- debug symbols
  ...
  .
diff --git a/debian/libindi-dev.install b/debian/libindi-dev.install
index 8a070b9..9665f03 100644
--- a/debian/libindi-dev.install
+++ b/debian/libindi-dev.install
@@ -1,2 +1,4 @@
 usr/include/libindi
-usr/lib/libindi.so
+usr/lib/*/libindi.so
+usr/lib/*/libindi*.a
+usr/lib/*/pkgconfig/libindi.pc
diff --git a/debian/libindi0.install b/debian/libindi0.install
index d7c52a3..6cbd064 100644
--- a/debian/libindi0.install
+++ b/debian/libindi0.install
@@ -1,2 +1,2 @@
-usr/lib/libindi.so.0
-usr/lib/libindi.so.0.8.0
+usr/lib/*/libindi.so.0
+usr/lib/*/libindi.so.0.8.0
diff --git a/debian/rules b/debian/rules
index 25f6c9e..ad9edd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
@@ -8,7 +10,7 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_USE_RELATIVE_PATHS=ON
+	dh_auto_configure -- -DCMAKE_USE_RELATIVE_PATHS=ON -DLIB_DESTINATION=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_strip:
 	dh_strip --dbg-package=indi-dbg

-- 
libindi packaging