[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 180c377c958f58df09a37989450454537e486237
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Apr 13 15:09:07 2012 +0100

    Don't bother building static libraries which we're not going to install

diff --git a/debian/changelog b/debian/changelog
index 5e9fbdc..f999d1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ telepathy-mission-control-5 (1:5.12.0-1) UNRELEASED; urgency=low
       MSN accounts to telepathy-haze, as required by Empathy 3.4
     - requires GLib 2.30
   * Enable parallel builds
+  * Don't bother building static libraries which we're not going to install
 
  -- Simon McVittie <smcv at debian.org>  Fri, 13 Apr 2012 14:57:30 +0100
 
diff --git a/debian/rules b/debian/rules
index 3022853..653d60b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,21 @@
 
 CONFIGURE_FLAGS = --libexecdir=\$${prefix}/lib/telepathy \
                   --disable-Werror \
-                  --disable-mcd-plugins \
                   --enable-gtk-doc \
                   --enable-server \
                   --enable-gnome-keyring \
                   --with-html-dir=\$${prefix}/share/doc/libmission-control-plugins-doc \
                   --enable-upower
 
+# Having a static library for a plugin loader is pretty useless, so get rid
+# of it.
+CONFIGURE_FLAGS += --enable-shared --disable-static
+
+# Explicitly disable old-style plugins, which has the side-effect of disabling
+# their associated documentation, making their libraries static, and disabling
+# their headers
+CONFIGURE_FLAGS += --disable-mcd-plugins
+
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
 CONFIGURE_FLAGS += --with-connectivity=nm
 endif
@@ -19,11 +27,8 @@ endif
 override_dh_makeshlibs:
 	dh_makeshlibs -V
 
-# Having a static library for a plugin loader is pretty useless, so get rid
-# of it. We don't want the libtool stuff either.
 override_dh_auto_install:
 	dh_auto_install
-	rm -f debian/tmp/usr/lib/libmission-control-plugins*.a
 	rm -f debian/tmp/usr/lib/libmission-control-plugins*.la
 
 override_dh_strip:
@@ -33,9 +38,6 @@ override_dh_strip:
 override_dh_auto_test:
 	:
 
-# Explicitly disable old-style plugins, which has the side-effect of disabling
-# their associated documentation, making their libraries static, and disabling
-# their headers
 override_dh_auto_configure:
 	dh_auto_configure -- ${CONFIGURE_FLAGS}
 

-- 
MC 5 packaging