[SCM] ktp-contact-list packaging branch, master, updated. debian/0.7.0-1-26-g6c618b5

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-contact-list.git;a=commitdiff;h=6c618b5

The following commit has been merged in the master branch:
commit 6c618b59065d841d2ef90246e261c6abc9d5a72f
Merge: 70214098a3acec3b811345302148c06da75bea32 1604b1d28cb58f94df15bfd36ec628ad0f36b9a8
Author: Diane Trout <diane at ghic.org>
Date:   Mon Nov 3 11:02:16 2014 -0800

    merge debian/changelog for minor jessie bug-fix release

 debian/changelog | 9 +++++++++
 debian/control   | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 73e1815,9f85d74..f4609f0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,20 @@@
 +ktp-contact-list (0.8.80-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Update libktpcommoninternalsprivate-dev build-dep to 0.8.80
 +  * Change kde-telepathy-data to source:Upstream-Version
 +
 + -- Diane Trout <diane at ghic.org>  Sun, 21 Sep 2014 10:56:47 -0700
 +
+ ktp-contact-list (0.8.1-2) unstable; urgency=medium
+ 
+   * Add kde-telepathy-kpeople as a dependency to ktp-contactlist
+     this should force installing of the kpeople components to
+     prevent the contact list from being empty.
+     (Closes: #753305)
+ 
+  -- Diane Trout <diane at ghic.org>  Tue, 21 Oct 2014 22:07:01 -0700
+ 
  ktp-contact-list (0.8.1-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 3914739,4cfb477..0e323b3
--- a/debian/control
+++ b/debian/control
@@@ -19,7 -19,7 +19,9 @@@ Vcs-Browser: http://anonscm.debian.org/
  
  Package: kde-telepathy-contact-list
  Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, kde-telepathy-data (>= ${source:Upstream-Version})
 -Depends: ${shlibs:Depends}, ${misc:Depends}, kde-telepathy-data (>= 0.8.1), kde-telepathy-kpeople
++Depends: ${shlibs:Depends}, ${misc:Depends}, 
++ kde-telepathy-data (>= ${source:Upstream-Version}),
++ kde-telepathy-kpeople
  Recommends: kde-telepathy
  Description: Telepathy contact list for the KDE Plasma Desktop
   This package provides a contact list application based on telepathy,

-- 
ktp-contact-list packaging