[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian-experimental, updated. debian/0.18.0-1-6-gb2a96ce

[Laurent Bigonville]

The following commit has been merged in the debian-experimental branch:
commit b2a96ceff5d6bed95c26682122f1e7ba41308836
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sun Apr 8 01:11:46 2012 +0200

    Build for multiarch

diff --git a/debian/changelog b/debian/changelog
index 370c06e..b02e211 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ telepathy-glib (0.18.0-2) UNRELEASED; urgency=low
   [ Laurent Bigonville ]
   * debian/control:
     - Put gir1.2-telepathyglib-0.12 in the introspection Section
+  * Build for multiarch
 
- -- Laurent Bigonville <bigon at debian.org>  Sun, 08 Apr 2012 00:58:38 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 08 Apr 2012 01:09:24 +0200
 
 telepathy-glib (0.18.0-1) experimental; urgency=low
 
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 fde6669..871d096 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Uploaders: Dafydd Harries <daf at debian.org>,
            Emilio Pozuelo Monfort <pochu at debian.org>
 Build-Depends: autotools-dev (>= 20100122-1~),
                dbus,
-               debhelper (>= 8),
+               debhelper (>= 9),
                gir1.2-glib-2.0,
                gobject-introspection (>= 1.31.0-2~),
                libgirepository1.0-dev (>= 0.9.6),
@@ -32,6 +32,8 @@ Package: libtelepathy-glib0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: telepathy-gabble (<< 0.7.9), telepathy-sofiasip (<< 0.5.17)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Telepathy framework - GLib library
  This package contains telepathy-glib, a GLib-based library for Telepathy
  components.
@@ -70,6 +72,7 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: libtelepathy-glib0 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: GLib Telepathy library (debug symbols)
  This package contains support for debugging programs that use telepathy-glib,
  a GLib-based library for Telepathy components.
diff --git a/debian/gir1.2-telepathyglib-0.12.install b/debian/gir1.2-telepathyglib-0.12.install
index c93373f..1528c0c 100644
--- a/debian/gir1.2-telepathyglib-0.12.install
+++ b/debian/gir1.2-telepathyglib-0.12.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/TelepathyGLib-0.12.typelib
+usr/lib/*/girepository-1.0/TelepathyGLib-0.12.typelib usr/lib/girepository-1.0/
diff --git a/debian/libtelepathy-glib-dev.install b/debian/libtelepathy-glib-dev.install
index d90e7fe..8c5c745 100644
--- a/debian/libtelepathy-glib-dev.install
+++ b/debian/libtelepathy-glib-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/libtelepathy-glib.so
-debian/tmp/usr/lib/libtelepathy-glib.a
-debian/tmp/usr/include/telepathy-1.0
-debian/tmp/usr/lib/pkgconfig/telepathy-glib.pc
-debian/tmp/usr/share/gir-1.0
-debian/tmp/usr/share/vala/vapi/telepathy-glib.*
+usr/lib/*/libtelepathy-glib.so
+usr/lib/*/libtelepathy-glib.a
+usr/include/telepathy-1.0
+usr/lib/*/pkgconfig/telepathy-glib.pc
+usr/share/gir-1.0
+usr/share/vala/vapi/telepathy-glib.*
diff --git a/debian/libtelepathy-glib-doc.install b/debian/libtelepathy-glib-doc.install
index c99ba7d..e10d269 100644
--- a/debian/libtelepathy-glib-doc.install
+++ b/debian/libtelepathy-glib-doc.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/share/doc/libtelepathy-glib-doc/telepathy-glib
+usr/share/doc/libtelepathy-glib-doc/telepathy-glib
 # Many of the examples are in subdirectories, which dh_installexamples
 # can't do (without copying the whole directory, which we don't want either)
 # so we do them here.
diff --git a/debian/libtelepathy-glib0.install b/debian/libtelepathy-glib0.install
index da5e83d..74886a2 100644
--- a/debian/libtelepathy-glib0.install
+++ b/debian/libtelepathy-glib0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libtelepathy-glib.so.*
+usr/lib/*/libtelepathy-glib.so.*

-- 
telepathy-glib packaging