[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian-experimental, updated. debian/1%5.11.0-1-10-g14ed876

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 600c7286430de616217d092662085e341a158980
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Apr 13 15:25:17 2012 +0100

    Use debhelper 9 for compressed debug info and dpkg-buildflags
    
    Specifically don't use multiarch paths, since that would require
    the gnome-online-accounts plugin in Empathy to undergo a transition,
    and only one architecture's version of MC can be installed anyway.

diff --git a/debian/changelog b/debian/changelog
index f999d1b..8acdc60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ telepathy-mission-control-5 (1:5.12.0-1) UNRELEASED; urgency=low
     - requires GLib 2.30
   * Enable parallel builds
   * Don't bother building static libraries which we're not going to install
+  * Use debhelper 9 for compressed debug info and dpkg-buildflags
+    - specifically don't use multiarch paths, since that would require
+      the gnome-online-accounts plugin in Empathy to undergo a transition,
+      and only one architecture's version of MC can be installed anyway
 
  -- Simon McVittie <smcv at debian.org>  Fri, 13 Apr 2012 14:57:30 +0100
 
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 ab36df1..a4236f3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Simon McVittie <smcv at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>,
            Laurent Bigonville <bigon at debian.org>
 Build-Depends: autotools-dev (>= 20100122-1~),
-               debhelper (>= 8),
+               debhelper (>= 9),
                gtk-doc-tools,
                libdbus-1-dev (>= 1.0),
                libdbus-glib-1-dev (>= 0.82),
diff --git a/debian/rules b/debian/rules
index 653d60b..62eb29e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,11 @@ CONFIGURE_FLAGS = --libexecdir=\$${prefix}/lib/telepathy \
                   --with-html-dir=\$${prefix}/share/doc/libmission-control-plugins-doc \
                   --enable-upower
 
+# We specifically do not want multiarch: only one version of MC can be
+# installed anyway, the plugin directory is based on the ${libdir}, and
+# empathy/experimental ships a plugin in the non-multiarch location
+CONFIGURE_FLAGS += --libdir=\$${prefix}/lib
+
 # Having a static library for a plugin loader is pretty useless, so get rid
 # of it.
 CONFIGURE_FLAGS += --enable-shared --disable-static

-- 
MC 5 packaging