[SCM] ktp-common-internals packaging branch, master, updated. debian/0.8.1-4-31-gbac12a1
Diane Trout
diane-guest at moszumanska.debian.org
Tue Mar 10 04:07:10 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git;a=commitdiff;h=83d46b4
The following commit has been merged in the master branch:
commit 83d46b4466892f9f3e7654e6301bf2bbe7ad04bd
Merge: fd145b2f5a41f9d126c0618ece4ce8dfa8e63754 894b34e3e9a4ca5c7daed36dab058d7453955fab
Author: Diane Trout <diane at ghic.org>
Date: Mon Mar 9 21:02:58 2015 -0700
Merge branch 'jessie'
I needed to reorder the changelog to include the 0.8.1 series
releases that were sent to jessie.
Conflicts:
debian/changelog
debian/changelog | 8 ++++++++
debian/control | 9 +++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --cc debian/changelog
index dde28e8,0874abb..c0861ba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,16 +1,35 @@@
-ktp-common-internals (0.8.1-5) UNRELEASED; urgency=medium
-
+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
- -- Diane Trout <diane at ghic.org> Mon, 09 Mar 2015 20:54:35 -0700
+ -- Diane Trout <diane at ghic.org> Tue, 16 Sep 2014 22:03:11 -0700
+ 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
* Update kde-telepathy-kpeople description.
diff --cc debian/control
index 6c069c2,f9aba5f..5e6bcbe
--- a/debian/control
+++ b/debian/control
@@@ -67,11 -63,9 +67,11 @@@ Description: KDE Telepathy common inter
.
This also includes common widgets like the contact grid.
-Package: libktploggerprivate7
+Package: libktploggerprivate8
+Breaks: libktploggerprivate7 (<< 0.8.80~)
+Replaces: libktploggerprivate7 (<< 0.8.80~)
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
+ Depends: ${shlibs:Depends}, ${misc:Depends}, telepathy-logger
Description: KDE Telepathy internal logger library
Internal library which consists of the most reused
parts across KDE Telepathy.
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list