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

Simon McVittie smcv at debian.org
Fri Apr 13 15:29:13 UTC 2012


The following commit has been merged in the debian-experimental branch:
commit 627b7af1e69d8082011b4d3975ace38ae446a93d
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Apr 13 15:45:24 2012 +0100

    Use default.mk to get the dpkg-recommended build flags

diff --git a/debian/changelog b/debian/changelog
index ab65027..c09ccef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,13 +6,14 @@ 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
+  * Use debhelper 9 for compressed debug info
     - 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
   * Install upstream man pages with .install file, not .manpages file,
     since that stops dh_install claiming they're not installed
   * Standards-Version: 3.9.3
+  * Use default.mk to get the dpkg-recommended build flags
 
  -- Simon McVittie <smcv at debian.org>  Fri, 13 Apr 2012 14:57:30 +0100
 
diff --git a/debian/control b/debian/control
index c7c3781..3555cfc 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders: Simon McVittie <smcv at debian.org>,
            Laurent Bigonville <bigon at debian.org>
 Build-Depends: autotools-dev (>= 20100122-1~),
                debhelper (>= 9),
+               dpkg-dev (>= 1.16.1~),
                gtk-doc-tools,
                libdbus-1-dev (>= 1.0),
                libdbus-glib-1-dev (>= 0.82),
diff --git a/debian/rules b/debian/rules
index 62eb29e..1504219 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/default.mk
+
 CONFIGURE_FLAGS = --libexecdir=\$${prefix}/lib/telepathy \
                   --disable-Werror \
                   --enable-gtk-doc \

-- 
MC 5 packaging



More information about the Pkg-telepathy-commits mailing list