[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian, updated. debian/0.13.7-1-7-g3fc27af

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 7761789f8716c96a9122b848207a7542f072b466
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jan 26 16:37:41 2012 +0000

    Use debhelper 9, for better debug symbols and hardened build flags (Closes: #656517)

diff --git a/debian/changelog b/debian/changelog
index 1f67dd8..f9f08a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ telepathy-gabble (0.14.1-1) UNRELEASED; urgency=low
 
   * New upstream stable release (Closes: #656601)
   * Specifically mention Facebook Chat in the Description (Closes: #650459)
+  * Use debhelper 9, for better debug symbols and hardened build flags
+    (Closes: #656517)
 
  -- Simon McVittie <smcv at debian.org>  Thu, 26 Jan 2012 14:31:39 +0000
 
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 bcda6d6..01b1faf 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Dafydd Harries <daf at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>,
            Jonny Lamb <jonny at debian.org>
 Build-Depends: autotools-dev (>= 20100122.1~),
-               debhelper (>= 8),
+               debhelper (>= 9),
                gnutls-bin,
                libdbus-1-dev (>= 1.1.0),
                libdbus-glib-1-dev (>= 0.82),
diff --git a/debian/rules b/debian/rules
index 05de6a2..e083b1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,10 @@
 %:
 	dh $@ --with autotools_dev
 
-# dh_auto_configure defaults to one libexecdir per source package, which is
-# overkill for Telepathy.
+# Now that we use debhelper 9, dh_auto_configure defaults to
+# $libexecdir=$libdir, which might be better than this, but doesn't match
+# our historical practice (so it'd break old debugging instructions).
+# Leaving it as it was for now...
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--libexecdir="\$${prefix}/lib/telepathy" \

-- 
telepathy-gabble packaging