[Pkg-telepathy-commits] [SCM] Haze packaging branch, debian, updated. debian/0.3.6-1-3-g67daa3e

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 67daa3e4412941f33a86da94452ea65d9f1a8c14
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Aug 5 16:33:53 2010 +0100

    New upstream release
    
    * New upstream release
    * Bump dependency on libpurple to 2.6.0 (mandatory), then to 2.7.0 (so we
      always get support for VoIP calls)
    * Stop using our local telepathy-haze manpage, which has been accepted
      and improved upstream
    * Stop overriding $bindir, since upstream installs to $libexecdir anyway
    * Standards-Version: 3.9.1 (no changes needed)
    * Explicitly set source format to 1.0

diff --git a/debian/changelog b/debian/changelog
index ae1bbd4..8de9bcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+telepathy-haze (0.4.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Bump dependency on libpurple to 2.6.0 (mandatory), then to 2.7.0 (so we
+    always get support for VoIP calls)
+  * Stop using our local telepathy-haze manpage, which has been accepted
+    and improved upstream
+  * Stop overriding $bindir, since upstream installs to $libexecdir anyway
+  * Standards-Version: 3.9.1 (no changes needed)
+  * Explicitly set source format to 1.0
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 05 Aug 2010 16:22:55 +0100
+
 telepathy-haze (0.3.6-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 81e61c1..4cac078 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,12 @@ Uploaders: Laurent Bigonville <bigon at debian.org>,
 Build-Depends: cdbs,
                debhelper (>= 5),
                pkg-config (>= 0.9.0),
-               libpurple-dev (>= 2.1.1),
+               libpurple-dev (>= 2.7.0),
                libtelepathy-glib-dev (>= 0.9.2),
                libdbus-glib-1-dev (>= 0.73),
                libglib2.0-dev (>= 2.22),
                xsltproc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-haze.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-haze.git
 
diff --git a/debian/rules b/debian/rules
index c2e03c1..2c07a00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,19 +13,7 @@ common-binary-post-install-arch:: list-missing
 common-install-arch::
 	rm -rf debian/telepathy-haze/usr/share/telepathy/
 
-# Man page
-common-post-build-arch::
-	sed -e s!@libexecdir@!/usr/lib/telepathy! \
-		< debian/telepathy-haze.8.in \
-		> debian/telepathy-haze.8
-DEB_INSTALL_MANPAGES_telepathy-haze := debian/telepathy-haze.8
-
-clean::
-	-rm debian/telepathy-haze.8
-
-# Upstream releases are going to move CMs to libexecdir soon...
+# all CMs in Debian share a directory, to keep libexec tidy
 DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
-# but haven't done so yet, so let's give Debian a head start
-DEB_CONFIGURE_EXTRA_FLAGS := --bindir=$(DEB_CONFIGURE_LIBEXECDIR)
 
 include $(CURDIR)/debian/update-patches.mk
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
diff --git a/debian/telepathy-haze.8.in b/debian/telepathy-haze.8.in
deleted file mode 100644
index 4258d71..0000000
--- a/debian/telepathy-haze.8.in
+++ /dev/null
@@ -1,30 +0,0 @@
-.TH TELEPATHY-HAZE "8" "October 2007" "Telepathy" "D-Bus services"
-\" This man page was written by Simon McVittie for the Debian project,
-\" but may be used by others.
-\" Copyright © 2007 Collabora Ltd. <http://www.collabora.co.uk/>
-\" It may be distributed under the same terms as telepathy-haze itself.
-.SH NAME
-telepathy-haze \- Telepathy connection manager using libpurple
-.SH SYNOPSIS
-\fB at libexecdir@/telepathy\-haze\fR
-.SH DESCRIPTION
-Haze implements the Telepathy D-Bus specification using libpurple,
-allowing Telepathy clients like
-.BR empathy (1)
-to connect to any protocol supported by
-.BR pidgin (1).
-.PP
-It is a D-Bus service which runs on the session bus, and should usually be
-started automatically by D-Bus activation. However, it might be useful to
-start it manually for debugging.
-.SH OPTIONS
-There are no command-line options.
-.SH ENVIRONMENT
-.TP
-\fBHAZE_DEBUG\fR=\fItype\fR
-May be set to "all" for full debug output, or various undocumented options
-(which may change from release to release) to filter the output.
-.SH SEE ALSO
-.IR http://telepathy.freedesktop.org/ ,
-.BR empathy (1),
-.BR pidgin (1)

-- 
Haze packaging