[SCM] ktp-common-internals packaging branch, master, updated. debian/0.8.1-4-65-g0e003ae

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=fb6ccb2

The following commit has been merged in the master branch:
commit fb6ccb2c375701cd99b144fb99e526fbfd891b3f
Merge: a0c358e70d3abe92926ec78f972ff74dee4cdb32 3796825c15d6a74a4543e9e10265a23e332c6e33
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Apr 28 11:50:04 2015 +0200

    Merge remote-tracking branch 'kde-extras/master'
    
    Conflicts:
    	debian/changelog

 debian/changelog                             | 19 +++++++++-------
 debian/control                               | 20 ++++++++--------
 debian/copyright                             |  2 +-
 debian/libktpcommoninternalsprivate8.symbols | 23 +++++++++++++++----
 debian/libktploggerprivate8.symbols          |  2 +-
 debian/libktpmodelsprivate8.symbols          | 34 ++++++++++++++++++++++++----
 debian/libktpwidgetsprivate8.symbols         | 32 ++++++++++++++++++++------
 debian/watch                                 |  3 +--
 8 files changed, 97 insertions(+), 38 deletions(-)

diff --cc debian/changelog
index e14e655,d5575c4..b2aed71
--- a/debian/changelog
+++ b/debian/changelog
@@@ -21,11 -15,14 +15,14 @@@ ktp-common-internals (0.9.0-1) UNRELEAS
    * Bump libtelepathy-qt4-dev build-depends to 0.9.5
    * Remove shared-desktop-ontolgies build-dep
    * Bump libkpeople build-dep to 0.3.0
-   * Make kde-telepathy-kpeople a dependency.
    * Add libotr5-dev and libgcrypt11-dev build-dep to enable OTR support.
 -  * Add kpeople_chat_plugin.so and associated desktop file to 
 +  * Add kpeople_chat_plugin.so and associated desktop file to
      kde-telepathy-kpeople package.
    * Update copyright file.
+   * Update description to use better English (Closes: #769362)
+     Thanks Filipus Klutiero
+   * Update Standards-Version to 3.9.6.0. No changes needed.
+   * Update debian/watch file.
  
   -- Diane Trout <diane at ghic.org>  Tue, 16 Sep 2014 22:03:11 -0700
  

-- 
ktp-common-internals packaging