[SCM] kglobalaccel packaging branch, master, updated. debian/5.37.0-2-87-ge66c79b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kglobalaccel.git;a=commitdiff;h=f2a254a

The following commit has been merged in the master branch:
commit f2a254afb68244ae40625d8e45394d4d1896056d
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Aug 5 01:40:24 2015 +0200

    Revert "Move file from -bin to -dev"
    
    This reverts commit 05b17371df5a2f1caed3a446c263604ef42152e2.
    the bloody library is bloody private
---
 debian/changelog                     | 6 ------
 debian/control                       | 6 ++----
 debian/libkf5globalaccel-bin.install | 1 +
 debian/libkf5globalaccel-dev.install | 1 -
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 375072a..cfb8afc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-kglobalaccel (5.12.0-0ubuntu2) wily; urgency=medium
-
-  * Move file from -bin to -dev
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 05 Aug 2015 00:22:25 +0200
-
 kglobalaccel (5.12.0-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
diff --git a/debian/control b/debian/control
index f4e9374..56cf898 100644
--- a/debian/control
+++ b/debian/control
@@ -37,10 +37,8 @@ Depends: libkf5globalaccel5 (= ${binary:Version}),
          libkf5globalaccelprivate5 (= ${binary:Version}),
          qtbase5-dev (>= 5.4),
          ${misc:Depends}
-Breaks: libkf5globalaccel-bin (<= 5.12.0-0ubuntu2),
-        libkf5globalaccel5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa3)
-Replaces: libkf5globalaccel-bin (<= 5.12.0-0ubuntu2),
-          libkf5globalaccel5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa3)
+Breaks: libkf5globalaccel5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa3)
+Replaces: libkf5globalaccel5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa3)
 Description: development files for kglobalaccel
  KGlobalAccel allows you to have global accelerators that are
  independent of the focused window. Unlike regular shortcuts,
diff --git a/debian/libkf5globalaccel-bin.install b/debian/libkf5globalaccel-bin.install
index b6a01e9..8040bb6 100644
--- a/debian/libkf5globalaccel-bin.install
+++ b/debian/libkf5globalaccel-bin.install
@@ -1,2 +1,3 @@
 usr/bin/kglobalaccel5
+usr/lib/*/libKF5GlobalAccelPrivate.so
 usr/lib/*/qt5/plugins/org.kde.kglobalaccel5.platforms/KF5GlobalAccelPrivateXcb.so
diff --git a/debian/libkf5globalaccel-dev.install b/debian/libkf5globalaccel-dev.install
index 8c77431..86aaecf 100644
--- a/debian/libkf5globalaccel-dev.install
+++ b/debian/libkf5globalaccel-dev.install
@@ -2,7 +2,6 @@ usr/include/KF5/KGlobalAccel/
 usr/include/KF5/kglobalaccel_version.h
 usr/lib/*/cmake/KF5GlobalAccel/
 usr/lib/*/libKF5GlobalAccel.so
-usr/lib/*/libKF5GlobalAccelPrivate.so
 usr/lib/*/qt5/mkspecs/modules/qt_KGlobalAccel.pri
 usr/share/dbus-1/interfaces/kf5_org.kde.KGlobalAccel.xml
 usr/share/dbus-1/interfaces/kf5_org.kde.kglobalaccel.Component.xml

-- 
kglobalaccel packaging