[SCM] akonadi-search packaging branch, kubuntu_stable, updated. debian/15.08.3-1-43-g8652940

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi-search.git;a=commitdiff;h=8652940

The following commit has been merged in the kubuntu_stable branch:
commit 8652940882c852d58c874d2a5f8ccbdc5a4bcae6
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Feb 17 14:07:10 2016 -0800

    Remove duplication of searchdebug
---
 debian/changelog                       | 1 +
 debian/control                         | 9 +--------
 debian/libkf5akonadisearch-bin.install | 2 +-
 debian/libkf5akonadisearch-dev.install | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa21f29..2da41b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ akonadi-search (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Scarlett Clark ]
   * Debian merge: No remaining changes. ( New merge to grab new changes ) 
+  * Remove duplication of searchdebug 
 
  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:21:55 +0000
 
diff --git a/debian/control b/debian/control
index 19741bc..cfe2096 100644
--- a/debian/control
+++ b/debian/control
@@ -86,7 +86,7 @@ Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Akonadi search xapian library
  Internal library used to search in the Akonadi PIM data server.
- 
+
 Package: libkf5akonadisearchdebug5
 Architecture: any
 Multi-Arch: same
@@ -104,10 +104,3 @@ Recommends: libkf5akonadisearch-bin,
             libkf5akonadisearch-plugins (= ${binary:Version})
 Description: Akonadi search core library
  Internal library used to search in the Akonadi PIM data server.
-
-Package: libkf5akonadisearchdebug5
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Akonadi search debug library
- Internal library used to search in the Akonadi PIM data server.
diff --git a/debian/libkf5akonadisearch-bin.install b/debian/libkf5akonadisearch-bin.install
index 1959281..36cf527 100644
--- a/debian/libkf5akonadisearch-bin.install
+++ b/debian/libkf5akonadisearch-bin.install
@@ -1,4 +1,4 @@
 usr/bin/akonadi_indexing_agent
 usr/share/akonadi/agents/akonadiindexingagent.desktop
 usr/share/kservices5/plasma-krunner-pimcontacts.desktop
-usr/share/kservices5/plasma-krunner-pimcontacts_config.desktop 
+usr/share/kservices5/plasma-krunner-pimcontacts_config.desktop
diff --git a/debian/libkf5akonadisearch-dev.install b/debian/libkf5akonadisearch-dev.install
index c8a42c1..1484f3d 100644
--- a/debian/libkf5akonadisearch-dev.install
+++ b/debian/libkf5akonadisearch-dev.install
@@ -1,9 +1,9 @@
 usr/include/KF5/AkonadiSearch/
+usr/include/KF5/AkonadiSearch/Debug/
 usr/include/KF5/akonadi_search_version.h
 usr/lib/*/cmake/KF5AkonadiSearch/
 usr/lib/*/libKF5AkonadiSearchCore.so
 usr/lib/*/libKF5AkonadiSearchDebug.so
+usr/lib/*/libKF5AkonadiSearchDebug.so
 usr/lib/*/libKF5AkonadiSearchPIM.so
 usr/lib/*/libKF5AkonadiSearchXapian.so
-usr/include/KF5/AkonadiSearch/Debug/
-usr/lib/*/libKF5AkonadiSearchDebug.so
\ No newline at end of file

-- 
akonadi-search packaging