[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/5.1.3-1-7-gf3e6f89

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 8ebb5f2ca37bf046e347962638fd744e5c0f7623
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 9 10:25:10 2009 +0100

    New upstream release
    
      - Building the libraries statically now works, so do that, since we don't
        want to use them outside this source package
      - Install the new man pages for all executables
      - Remove GConf build dependency (which is now optional) since we're not
        going to install mc-account-convert anyway

diff --git a/debian/changelog b/debian/changelog
index fd498b2..1e49bb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+telepathy-mission-control-5 (5.1.4-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - Building the libraries statically now works, so do that, since we don't
+      want to use them outside this source package
+    - Install the new man pages for all executables
+    - Remove GConf build dependency (which is now optional) since we're not
+      going to install mc-account-convert anyway
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 09 Jul 2009 10:18:08 +0100
+
 telepathy-mission-control-5 (5.1.3-1) unstable; urgency=low
 
   * Initial upload of Mission Control 5 (Closes: #534750), which will
diff --git a/debian/control b/debian/control
index 94e07eb..f4134e5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends: cdbs,
                debhelper (>= 5),
                libdbus-1-dev (>= 1.0),
                libdbus-glib-1-dev (>= 0.80),
-               libgconf2-dev (>= 2.0),
                libglib2.0-dev (>= 2.16),
                libtelepathy-glib-dev (>= 0.7.33),
                pkg-config (>= 0.21),
diff --git a/debian/rules b/debian/rules
index 738e953..785a64a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,7 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-# The library isn't stable, and shouldn't be used on mainstream distributions:
-# however, the daemon needs it, so we only install the versioned binary (with
-# no headers, development symlink, documentation or pkgconfig).
+# The library isn't stable, and shouldn't be used on mainstream distributions.
 #
 # The AccountManager.service is inappropriate on mainstream distributions,
 # as per telepathy-spec - clients should activate a particular implementation,
@@ -18,7 +16,6 @@ remove-cruft:
 	rm -rf debian/tmp/usr/include
 	rm -f debian/tmp/usr/lib/libmcclient.a
 	rm -f debian/tmp/usr/lib/libmcclient.la
-	rm -f debian/tmp/usr/lib/libmcclient.so
 	rm -rf debian/tmp/usr/lib/pkgconfig
 	rm -f debian/tmp/usr/share/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service
 	rm -rf debian/tmp/usr/share/gtk-doc
@@ -27,11 +24,15 @@ DEB_DH_STRIP_ARGS := --dbg-package=telepathy-mission-control-5-dbg
 
 DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
 
+# link the libraries statically, since they shouldn't be used outside this
+# source package
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--disable-Werror \
 	--disable-gtk-doc \
 	--disable-plugins \
-	--enable-server
+	--enable-server \
+	--disable-shared \
+	--enable-static
 
 # we symlink some of the doc directories together
 DEB_INSTALL_DOCS_telepathy-mission-control-5-dbg := --no-act
diff --git a/debian/telepathy-mission-control-5.install b/debian/telepathy-mission-control-5.install
index 2a6bcb1..6b221dc 100644
--- a/debian/telepathy-mission-control-5.install
+++ b/debian/telepathy-mission-control-5.install
@@ -1,5 +1,4 @@
 debian/tmp/usr/bin/mc-tool
 debian/tmp/usr/bin/mc-wait-for-name
 debian/tmp/usr/lib/telepathy/mission-control-5
-debian/tmp/usr/lib/libmcclient-5.*.so
 debian/tmp/usr/share/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service
diff --git a/debian/telepathy-mission-control-5.manpages b/debian/telepathy-mission-control-5.manpages
new file mode 100644
index 0000000..c22a910
--- /dev/null
+++ b/debian/telepathy-mission-control-5.manpages
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man8/mission-control-5.8
+debian/tmp/usr/share/man/man1/mc-tool.1
+debian/tmp/usr/share/man/man1/mc-wait-for-name.1

-- 
MC 5 packaging