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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5286f5ca5522203320b93a3d7d6356a6d333f676
Merge: 0e003aee92bc4f587d8657d62a56b34d3fbff8d1 097f70ce1c28692143457f78bee3669d535e545d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 20 11:22:42 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_stable'
    
    Conflicts:
    	debian/control

 debian/changelog                  | 26 ++++++++++++++++++++++++++
 debian/control                    |  2 +-
 debian/kde-telepathy-data.install |  1 -
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index be6bd88,c3961db..1a501d1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,29 +1,75 @@@
 +ktp-common-internals (15.04.1-1~) UNRELEASED; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * KDE Frameworks 5 port
 +    + rename lib packages for sobump
 +    + rename -dev package to libktp-dev to match the cmake config one
 +      would be looking for. Also it contains more than one library anyway.
 +    + rename -dbg to libktp-dbg to align with the dev and also because it
 +      affects more than one lib
 +      + Add all library packages as possibly depends for the dbg package. Any
 +        one of them may be neeeded depending on the app one wants to debug.
 +    + Remove kde-telepathy-kpeople for now as kpeople is not released.
 +    + Rename kde-telepathy-declarative to qml-module-org-kde-telepathy to
 +      align with the implicit naming policy for qml modules in Qt5 (no
 +      conflicts)
 +    + Update watch file. The source now is released as part of applications.
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +  * Merge with Debian, no changes
 +  * Make -dev package depend on libktpotrprivate8
 +  * kde-telepathy-kpeople breaks/replaces old kde-telepathy-data
 +
 +  [ Diane Trout ]
 +  * Pull changes from Kubuntu.
 +  * Update libktpcommoninternalsprivate7 SONAME to 8
 +    - libktploggerprivate7 -> libktploggerprivate8
 +    - libktpmodelsprivate7 -> libktpmodelsprivate8
 +    - libktpwidgetsprivate7 -> libktpwidgetsprivate8
 +  * Bump libtelepathy-qt4-dev build-depends to 0.9.5
 +  * Remove shared-desktop-ontolgies build-dep
 +  * Bump libkpeople build-dep to 0.3.0
 +  * Add libotr5-dev and libgcrypt11-dev build-dep to enable OTR support.
 +  * 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.
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (15.04.1).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 18 May 2015 14:24:06 +0200
 +
+ ktp-common-internals (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   [ Harald Sitter ]
+   * KDE Frameworks 5 port
+     + rename lib packages for sobump
+     + rename -dev package to libktp-dev to match the cmake config one
+       would be looking for. Also it contains more than one library anyway.
+     + rename -dbg to libktp-dbg to align with the dev and also because it
+       affects more than one lib
+       + Add all library packages as possibly depends for the dbg package. Any
+         one of them may be neeeded depending on the app one wants to debug.
+     + Remove kde-telepathy-kpeople for now as kpeople is not released.
+     + Rename kde-telepathy-declarative to qml-module-org-kde-telepathy to
+       align with the implicit naming policy for qml modules in Qt5 (no
+       conflicts)
+     + Update watch file. The source now is released as part of applications.
+ 
+   [ Scarlett Clark ]
+   * New upstream release
 -  * This needs libtelepathy-logger-qt5-dev it is a kf5 app. 
 -  * Remove the non existant version dep for above. 
 -  * Try libtelepthy-logger-qt-dev again. 
 -  * OTR requires telepathy-qt5 >= 0.9.5 
++  * This needs libtelepathy-logger-qt5-dev it is a kf5 app.
++  * Remove the non existant version dep for above.
++  * Try libtelepthy-logger-qt-dev again.
++  * OTR requires telepathy-qt5 >= 0.9.5
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 13 May 2015 22:35:47 -0700
+ 
  ktp-common-internals (0.9.0-0ubuntu3) vivid; urgency=medium
  
    * kde-telepathy-kpeople breaks/replaces old kde-telepathy-data
diff --cc debian/control
index edd7f32,6beb97b..089627a
--- a/debian/control
+++ b/debian/control
@@@ -42,13 -41,14 +42,13 @@@ Build-Depends: cmake (>= 2.8.12~)
                 libkf5widgetsaddons-dev,
                 libkf5windowsystem-dev,
                 libkf5xmlgui-dev,
 -               libotr5-dev,
 -               libtelepathy-logger-qt-dev,
 +               libotr5-dev (>= 4.0.0~),
 +               libtelepathy-logger-qt-dev (>= 0.9.80),
-                libtelepathy-qt5-dev (>= 0.9.2.1~),
+                libtelepathy-qt5-dev (>= 0.9.5),
                 pkg-kde-tools (>> 0.15.15),
 -               qtbase5-dev,
 -               qtdeclarative5-dev
 -Standards-Version: 3.9.5
 -Section: libs
 +               qtbase5-dev (>= 5.4),
 +               qtdeclarative5-dev (>= 5.4)
 +Standards-Version: 3.9.6
  Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-common-internals
  Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/ktp-common-internals.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/ktp-common-internals.git

-- 
ktp-common-internals packaging