[Pkg-telepathy-commits] [telepathy-salut] 01/07: Merge tag 'debian/0.8.0-3' into debian, discarding gbp.conf change

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-salut.

commit 8f1cfd25a155a525fa74457e37a8b9999c16c582
Merge: 708cddb d2abe58
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 27 13:54:05 2014 +0000

    Merge tag 'debian/0.8.0-3' into debian, discarding gbp.conf change

 debian/changelog               | 18 ++++++++++++++++
 debian/compat                  |  2 +-
 debian/control                 | 18 ++++++++++++++--
 debian/rules                   | 48 +++++++++++++++++++++++++++++-------------
 debian/telepathy-salut.docs    |  3 +++
 debian/telepathy-salut.install |  7 ++++++
 6 files changed, 78 insertions(+), 18 deletions(-)

diff --cc debian/changelog
index e1f99ff,d299609..577a7bc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,13 +1,30 @@@
++telepathy-salut (0.8.1-2) UNRELEASED; urgency=medium
++
++  * merge from experimental
++    - add telepathy-salut-dbg
++    - switch from cdbs to dh 9
++
++ -- Simon McVittie <smcv at debian.org>  Mon, 27 Jan 2014 13:52:52 +0000
++
+ telepathy-salut (0.8.0-3) experimental; urgency=low
+ 
+   * gbp.conf: branch for experimental
+   * Add debug-symbols package
+   * Include default hardening flags from dpkg
+   * Update to debhelper 9 compat level
+   * Switch from cdbs to dh, based on the telepathy-gabble package
+ 
+  -- Simon McVittie <smcv at debian.org>  Tue, 07 Aug 2012 11:03:30 +0100
+ 
 +telepathy-salut (0.8.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - interoperates with iChat again (Closes: #693880)
 +    - no longer crashes when you "Join Room...", then close the dialog,
 +      in Empathy (Closes: #693881)
 +
 + -- Simon McVittie <smcv at debian.org>  Wed, 21 Nov 2012 13:30:35 +0000
 +
  telepathy-salut (0.8.0-2) unstable; urgency=low
  
    * Release to unstable

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-salut.git