[Pkg-telepathy-commits] [folks] 04/15: Merge branch 'debian' into evo38

[Simon McVittie]

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

smcv pushed a commit to branch telepathy1
in repository folks.

commit 80b1c89623e63a13d8b43b61cc2d0888eb99eba9
Merge: 148f856 0df0f7f
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Mar 26 13:38:05 2014 +0000

    Merge branch 'debian' into evo38

 debian/changelog | 7 +++++++
 debian/gbp.conf  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 3800442,5c73899..33124b5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,10 +1,50 @@@
 +folks (0.9.6-2) UNRELEASED; urgency=medium
 +
 +  * Team upload
 +  * Disable fatal deprecation warnings
 +  * Add patch to reduce dependency on evolution-data-server: it's only
 +    the BlueZ backend, which we don't compile, that needs a newer version
 +    than 3.8.
 +  * Pull in some patches from upstream that were applied in Ubuntu:
 +    + fix display-names in the EDS persona store (GNOME #726787)
 +    + fix unsetting favourite contacts (GNOME #724809)
 +    + do not fix GNOME #724058 for now, it's new API and should
 +      be received in an upstream release instead
 +
 + -- Simon McVittie <smcv at debian.org>  Tue, 25 Mar 2014 15:37:49 +0000
 +
 +folks (0.9.6-1) experimental; urgency=medium
 +
 +  * New upstream release
 +    - debian/control: Adjust the build-dependencies
 +    - Adjust the symbols files
 +  * Drop d/p/Generate-backends-GIR-files-using-valac-rather.patch: Applied
 +    upstream
 +  * Explicitly disable bluez backend
 +  * debian/control:
 +    - Update Homepage URL
 +    - Bump Standards-Version to 3.9.5 (no further changes)
 +
 + -- Laurent Bigonville <bigon at debian.org>  Fri, 27 Dec 2013 17:11:39 +0100
 +
 +folks (0.9.5-1) experimental; urgency=low
 +
 +  * New upstream release
 +  * Update build-depends
 +  * d/p/Generate-backends-GIR-files-using-valac-rather.patch
 +    + Added. Fix build (From upstream git)
 +  * Install all introspection files
 +  * debian/libfolks25.symbols: Updated
 +
 + -- Sjoerd Simons <sjoerd at debian.org>  Sat, 26 Oct 2013 14:02:09 +0200
 +
+ folks (0.9.2-2) unstable; urgency=low
+ 
+   * Team upload.
+   * Upload to unstable.
+ 
+  -- Andreas Henriksson <andreas at fatal.se>  Tue, 17 Sep 2013 23:09:37 +0200
+ 
  folks (0.9.2-1) experimental; urgency=low
  
    [ Emilio Pozuelo Monfort ]

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