[SCM] ktp-common-internals packaging branch, kubuntu_unstable, updated. debian/0.8.1-1-25-g70ef789

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b55a02f99be447f83d3c54e564a75e811265c008
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Mar 11 14:22:56 2015 +0100

    lintian says it's a bad idea to split the ktp proxy, so roll back
---
 debian/changelog          |  6 ------
 debian/control            | 13 ++-----------
 debian/ktp-proxy.install  |  4 ----
 debian/libktpotr9.install |  4 ++++
 4 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 522dafb..120722f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,12 +13,6 @@ ktp-common-internals (15.03.80-0ubuntu1) UNRELEASED; urgency=medium
       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.
-    + Split OTR helper proxy binary and related runtime assets out of
-      libktpotr package and into a standalone ktp-proxy package which is
-      depended upon by libktpotr.
-    + ktp-proxy breaks and replaces older version of libktpotrprivate8, this
-      is necessary because the assets didn't change path and previously lived
-      in the lib.
 
  -- Harald Sitter <sitter at kde.org>  Fri, 06 Mar 2015 11:05:05 +0100
 
diff --git a/debian/control b/debian/control
index aa4e438..d75ab8e 100644
--- a/debian/control
+++ b/debian/control
@@ -112,23 +112,14 @@ Description: KDE Telepathy internal logger library
 Package: libktpotr9
 Architecture: any
 Depends: ktp-proxy (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: ktp-proxy (<= ${source:Version}), libktpotrprivate8 (<< 15.03.80)
+Replaces: ktp-proxy (<= ${source:Version}), libktpotrprivate8 (<< 15.03.80)
 Description: KDE Telepathy internal OTR library
  Internal library which consists of the most reused
  parts across KDE Telepathy.
  .
  This includes components to support OTR
 
-Package: ktp-proxy
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libktpotrprivate8 (<< 15.03.80)
-Replaces: libktpotrprivate8 (<< 15.03.80)
-Description: KDE Telepathy internal OTR helper
- Internal helper which consists of the most reused
- parts across KDE Telepathy.
- .
- This includes components to support OTR
-
 Package: qml-module-org-kde-telepathy
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/ktp-proxy.install b/debian/ktp-proxy.install
deleted file mode 100644
index e8bf4de..0000000
--- a/debian/ktp-proxy.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/libexec/ktp-proxy
-usr/share/config.kcfg/ktp-proxy-config.kcfg
-usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.Proxy.service
-usr/share/telepathy/clients/KTp.Proxy.client
diff --git a/debian/libktpotr9.install b/debian/libktpotr9.install
index 27600ea..b9dbc19 100644
--- a/debian/libktpotr9.install
+++ b/debian/libktpotr9.install
@@ -1,2 +1,6 @@
 usr/lib/*/libKTpOTR.so.0.9.*
 usr/lib/*/libKTpOTR.so.9
+usr/lib/*/libexec/ktp-proxy
+usr/share/config.kcfg/ktp-proxy-config.kcfg
+usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.Proxy.service
+usr/share/telepathy/clients/KTp.Proxy.client

-- 
ktp-common-internals packaging