[Pkg-telepathy-commits] [SCM] telepathy-farstream packaging branch, debian, updated. debian/0.2.3-1-8-g6df420f

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 5fea39277584580ba16ee09f9ca042f495e80d23
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Apr 11 18:10:33 2012 +0200

    Build for multiarch

diff --git a/debian/changelog b/debian/changelog
index c4c0d9a..821e669 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
 telepathy-farstream (0.4.0-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Build for multiarch
   * debian/control:
     - Add Uploaders field
     - Bump Standards-Version to 3.9.3 (no further changes)
+    - Bump debhelper to 9
+    - Bump cdbs build-dependency
 
- -- Laurent Bigonville <bigon at debian.org>  Wed, 11 Apr 2012 18:04:35 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 11 Apr 2012 18:09:46 +0200
 
 telepathy-farstream (0.2.3-1) experimental; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 7ce34f0..acb355f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
 Uploaders: Sjoerd Simons <sjoerd at debian.org>, Laurent Bigonville <bigon at debian.org>
-Build-Depends: debhelper (>= 7),
-               cdbs,
+Build-Depends: debhelper (>= 9),
+               cdbs (>= 0.4.93~),
                libglib2.0-dev (>= 2.16),
                libdbus-1-dev (>= 0.60),
                libdbus-glib-1-dev (>= 0.60),
@@ -20,6 +20,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-telepathy/telepathy-farstre
 Package: libtelepathy-farstream2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Glue library between telepathy and farstream
  Telepathy-farstream is a helper library to glue together Telepathy's media
  signalling and the media streaming capabilities of Farsight2.
@@ -37,6 +39,7 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: libtelepathy-farstream2 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Glue library between telepathy and farstream (debug symbols)
  Telepathy-farstream is a helper library to glue together Telepathy's media
  signalling and the media streaming capabilities of Farsight2.
diff --git a/debian/libtelepathy-farstream-dev.install b/debian/libtelepathy-farstream-dev.install
index 006fc36..f4ef775 100644
--- a/debian/libtelepathy-farstream-dev.install
+++ b/debian/libtelepathy-farstream-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libtelepathy-farstream.so
-usr/lib/libtelepathy-farstream.a
-usr/lib/pkgconfig/*
+usr/lib/*/libtelepathy-farstream.so
+usr/lib/*/libtelepathy-farstream.a
+usr/lib/*/pkgconfig/*
 usr/include/*
diff --git a/debian/libtelepathy-farstream2.install b/debian/libtelepathy-farstream2.install
index 679e606..418e832 100644
--- a/debian/libtelepathy-farstream2.install
+++ b/debian/libtelepathy-farstream2.install
@@ -1 +1 @@
-usr/lib/libtelepathy-farstream.so.*
+usr/lib/*/libtelepathy-farstream.so.*
diff --git a/debian/rules b/debian/rules
index 3168a91..76ced52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,8 @@ common-binary-post-install-arch:: list-missing
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-gtk-doc \
+DEB_CONFIGURE_EXTRA_FLAGS = --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+                            --enable-gtk-doc \
                             --disable-python
 
 ifneq (,$(findstring coverage,$(DEB_BUILD_OPTIONS)))

-- 
telepathy-farstream packaging