[SCM] ktp-common-internals packaging branch, master, updated. debian/0.8.1-4-65-g0e003ae
Maximiliano Curia
maxy at moszumanska.debian.org
Wed May 20 09:15:25 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=cfa2f71
The following commit has been merged in the master branch:
commit cfa2f719fd6218d4efd24fce53feed212ad1a3c6
Merge: 901360747ce77d4e16146a0f2990d0c2b43f10e7 32b9ddb540dcf537bf379adadf9df8e55f57580e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Apr 28 12:11:36 2015 +0200
Merge remote-tracking branch 'origin/kubuntu_stable'
Conflicts:
debian/control
debian/kde-telepathy-data.install
debian/kde-telepathy-kpeople.install
debian/libktpcommoninternalsprivate8.install
debian/libktpcommoninternalsprivate8.symbols
debian/libktploggerprivate8.install
debian/libktploggerprivate8.symbols
debian/libktpmodelsprivate8.install
debian/libktpmodelsprivate8.symbols
debian/libktpotrprivate8.install
debian/libktpwidgetsprivate8.install
debian/libktpwidgetsprivate8.symbols
debian/watch
debian/changelog | 97 +++++
debian/control | 133 ++++---
debian/kde-telepathy-data.install | 8 +-
debian/kde-telepathy-declarative.install | 2 -
debian/kde-telepathy-kaccounts.install | 1 +
debian/kde-telepathy-kpeople.install | 16 +-
debian/libktp-dev.install | 3 +
debian/libktpcommoninternals9.install | 2 +
debian/libktpcommoninternals9.symbols | 426 ++++++++++++++++++++++
debian/libktpcommoninternalsprivate-dev.install | 2 -
debian/libktpcommoninternalsprivate8.install | 2 -
debian/libktpcommoninternalsprivate8.symbols | 449 ------------------------
debian/libktplogger9.install | 3 +
debian/libktplogger9.symbols | 192 ++++++++++
debian/libktploggerprivate8.install | 3 -
debian/libktploggerprivate8.symbols | 185 ----------
debian/libktpmodels9.install | 2 +
debian/libktpmodels9.symbols | 323 +++++++++++++++++
debian/libktpmodelsprivate8.install | 2 -
debian/libktpmodelsprivate8.symbols | 319 -----------------
debian/libktpotr9.install | 6 +
debian/libktpotr9.symbols | 128 +++++++
debian/libktpotrprivate8.install | 6 -
debian/libktpotrprivate8.symbols | 125 -------
debian/libktpwidgets9.install | 2 +
debian/libktpwidgets9.symbols | 209 +++++++++++
debian/libktpwidgetsprivate8.install | 2 -
debian/libktpwidgetsprivate8.symbols | 183 ----------
debian/qml-module-org-kde-telepathy.install | 1 +
debian/rules | 6 +-
30 files changed, 1497 insertions(+), 1341 deletions(-)
diff --cc debian/changelog
index b2aed71,120722f..1d4247a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,59 +1,80 @@@
+ ktp-common-internals (15.03.80-0ubuntu1) UNRELEASED; urgency=medium
+
+ * 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.
+
+ -- Harald Sitter <sitter at kde.org> Fri, 06 Mar 2015 11:05:05 +0100
+
+ktp-common-internals (0.9.0-1) UNRELEASED; urgency=medium
+
+ [ 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.
+
+ -- Diane Trout <diane at ghic.org> Tue, 16 Sep 2014 22:03:11 -0700
+
+ ktp-common-internals (0.9.0-0ubuntu3) vivid; urgency=medium
+
+ * kde-telepathy-kpeople breaks/replaces old kde-telepathy-data
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 05 Nov 2014 12:27:52 +0100
+
+ ktp-common-internals (0.9.0-0ubuntu2) vivid; urgency=medium
+
+ * Make -dev package depend on libktpotrprivate8
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 03 Nov 2014 16:10:47 +0100
+
+ ktp-common-internals (0.9.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+ * Merge with Debian, no changes
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 28 Oct 2014 13:14:01 +0100
+
-ktp-common-internals (0.8.80-1) UNRELEASED; urgency=medium
+ktp-common-internals (0.8.1-4) unstable; urgency=medium
+
+ * Make sure telepathy-logger is installed (Closes: #774552)
+
+ -- Diane Trout <diane at ghic.org> Sun, 11 Jan 2015 21:19:37 -0800
+
+ktp-common-internals (0.8.1-3) unstable; urgency=medium
- * New upstream release.
- * 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
* Update kde-telepathy-kpeople description.
- * 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
- kde-telepathy-kpeople package.
- * Update copyright file.
* Fix typo thanks Filipus Klutiero (Closes: #759756)
- -- Diane Trout <diane at ghic.org> Tue, 16 Sep 2014 22:03:11 -0700
+ -- Diane Trout <diane at ghic.org> Sun, 02 Nov 2014 11:54:54 -0800
ktp-common-internals (0.8.1-2) unstable; urgency=medium
diff --cc debian/control
index 76d7ff1,76f8b45..336fc44
--- a/debian/control
+++ b/debian/control
@@@ -1,34 -1,69 +1,69 @@@
Source: ktp-common-internals
++Section: libs
Priority: optional
- Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Maintainer: Debian/Kubuntu KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
++Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Diane Trout <diane at ghic.org>,
Michał Zając <quintasan at kubuntu.org>,
Mark Purcell <msp at debian.org>
Build-Depends: cmake,
debhelper (>= 9),
- kdelibs5-dev,
- kdepimlibs5-dev,
- libgcrypt11-dev,
- libkpeople-dev (>= 0.3.0),
+ doxygen,
+ extra-cmake-modules,
+ gettext,
+ kio-dev,
+ libaccounts-qt5-dev,
+ libkaccounts-dev,
+ libkf5attica-dev,
+ libkf5auth-dev,
+ libkf5bookmarks-dev,
+ libkf5codecs-dev,
+ libkf5completion-dev,
+ libkf5config-dev,
+ libkf5configwidgets-dev,
+ libkf5coreaddons-dev,
+ libkf5dbusaddons-dev,
+ libkf5globalaccel-dev,
+ libkf5guiaddons-dev,
+ libkf5i18n-dev,
+ libkf5iconthemes-dev,
+ libkf5itemviews-dev,
+ libkf5jobwidgets-dev,
+ libkf5kcmutils-dev,
+ libkf5notifications-dev,
+ libkf5notifyconfig-dev,
+ libkf5parts-dev,
+ libkf5people-dev,
+ libkf5service-dev,
+ libkf5solid-dev,
+ libkf5sonnet-dev,
+ libkf5texteditor-dev,
+ libkf5textwidgets-dev,
+ libkf5wallet-dev,
+ libkf5widgetsaddons-dev,
+ libkf5windowsystem-dev,
+ libkf5xmlgui-dev,
libotr5-dev,
- libtelepathy-logger-dev,
- libtelepathy-logger-qt4-dev (>= 0.8.0),
- libtelepathy-qt4-dev (>= 0.9.5),
- pkg-kde-tools
+ libtelepathy-logger-qt-dev (>= 0.9.80),
+ libtelepathy-qt5-dev,
+ pkg-kde-tools (>> 0.15.15),
+ qtbase5-dev,
+ qtdeclarative5-dev
-Standards-Version: 3.9.5
-Section: libs
+Standards-Version: 3.9.6
- Section: libs
Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-common-internals
- Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git
+ 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
- Package: libktpcommoninternalsprivate-dev
+ Package: libktp-dev
Section: libdevel
Architecture: any
- Depends: libktpcommoninternalsprivate8 (= ${binary:Version}),
- libktploggerprivate8 (= ${binary:Version}),
- libktpotrprivate8 (= ${binary:Version}),
- libktpwidgetsprivate8 (= ${binary:Version}),
+ Depends: libktpcommoninternals9 (= ${binary:Version}),
+ libktplogger9 (= ${binary:Version}),
+ libktpotr9 (= ${binary:Version}),
+ libktpwidgets9 (= ${binary:Version}),
+ libtelepathy-logger-qt-dev (>= 0.9.80),
${misc:Depends}
+ Breaks: libktpcommoninternalsprivate-dev (<< 15.03.80)
+ Replaces: libktpcommoninternalsprivate-dev (<< 15.03.80)
Description: KDE Telepathy internal library - Development headers
Internal library which consists of the most reused
parts across KDE Telepathy.
@@@ -104,36 -154,26 +154,27 @@@ Package: kde-telepathy-dat
Architecture: all
Depends: ${misc:Depends}
Description: Shared data for all the KDE Telepathy components
- KDE telepathy shared data.
+ This package contains KDE Telepathy shared data.
.
- This package contains various data files that are used by nearly all
- the different KDE Telepathy components.
+ These various data files are used by nearly all the different KDE
+ Telepathy components, and include files such as icons and
+ translations.
- Package: libktpcommoninternalsprivate-dbg
- Architecture: any
+ Package: libktp-dbg
-Architecture: any
Section: debug
Priority: extra
- Depends: libktpcommoninternalsprivate8 (= ${binary:Version}), ${misc:Depends}
++Architecture: any
+ Depends: libktpcommoninternals9 (= ${binary:Version}) | libktplogger9 (= ${binary:Version}) | libktpmodels9 (= ${binary:Version}) | libktpotr9 (= ${binary:Version}) | libktpwidgets9 (= ${binary:Version}),
+ ${misc:Depends}
Description: KDE Telepathy internal library - debug symbols
Internal library which consists of the most reused
parts across KDE Telepathy.
.
This package contains debugging symbols for the ktp-common-internals library.
- Package: kde-telepathy-kpeople
- Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Breaks: kde-telepathy-data (<< 0.9.0)
- Replaces: kde-telepathy-data (<< 0.9.0)
- Description: kpeople plugins for kde-telepathy
- This contains plugins to allow kde-telepathy to use kpeople,
- This is necessary for grouping multiple IM accounts into
- meta-contacts.
-
Package: kde-telepathy-debugger
--Architecture: any
Priority: extra
++Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Debugging tool for KDE Telepathy
This package contains a GUI debugging tool which can be used to debug
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list