[SCM] KDE Discover packaging branch, master, updated. debian/5.5.95-1-9-gf71722a

[Matthias Klumpp]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-discover.git;a=commitdiff;h=4918d40

The following commit has been merged in the master branch:
commit 4918d4049e727ef32f7294472ca7b8c556ec4959
Author: Matthias Klumpp <mak at debian.org>
Date:   Wed Mar 23 18:06:49 2016 +0100

    Drop all patches: Applied upstream
---
 debian/patches/01_libdiscover-private.patch | 61 -----------------------------
 debian/patches/02_notifiers-private.patch   | 49 -----------------------
 debian/patches/series                       |  2 -
 3 files changed, 112 deletions(-)

diff --git a/debian/patches/01_libdiscover-private.patch b/debian/patches/01_libdiscover-private.patch
deleted file mode 100644
index 5ff3403..0000000
--- a/debian/patches/01_libdiscover-private.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Matthias Klumpp <matthias at tenstral.net>
-Date: Mon, 07 Mar 2016 18:20:44 +0000
-Subject: Make libdiscover a private library
-X-Git-Url: http://quickgit.kde.org/?p=discover.git&a=commitdiff&h=645226f28d66986f067b0fc9dc951346163b36a5
----
-Make libdiscover a private library
-
-This is very useful for distributions, especially Debian, since it
-silences lint warnings about e.g. missing SONAMES and relaxes the
-requirements for this shared library in general.
-It also limits its use to the Discover project only, but that is it's
-intended usecase anyway.
-
-Differential Revision: D1081
----
-
-
---- a/discover/CMakeLists.txt
-+++ b/discover/CMakeLists.txt
-@@ -16,6 +16,7 @@
- 
- add_executable(plasma-discover ${plasma_discover_SRCS})
- add_executable(Plasma::Discover ALIAS plasma-discover)
-+set_target_properties(plasma-discover PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover)
- 
- target_link_libraries(plasma-discover LINK_PUBLIC
-                                      KF5::DBusAddons
---- a/exporter/CMakeLists.txt
-+++ b/exporter/CMakeLists.txt
-@@ -1,6 +1,7 @@
- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
- 
- add_executable(plasma-discover-exporter main.cpp MuonExporter.cpp)
-+set_target_properties(plasma-discover-exporter PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover)
- 
- target_link_libraries(plasma-discover-exporter Discover::Common KF5::CoreAddons KF5::I18n)
- 
---- a/libdiscover/CMakeLists.txt
-+++ b/libdiscover/CMakeLists.txt
-@@ -53,5 +53,5 @@
- 
- target_include_directories(DiscoverCommon PRIVATE ${PHONON_INCLUDES} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
- 
--install(TARGETS DiscoverCommon ${INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS DiscoverCommon DESTINATION ${CMAKE_INSTALL_LIBDIR}/plasma-discover)
- install(FILES resources/discoverabstractnotifier.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
---- a/updater/CMakeLists.txt
-+++ b/updater/CMakeLists.txt
-@@ -17,6 +17,7 @@
- )
- 
- add_executable(plasma-discover-updater ${plasmadiscover_updater_SRCS})
-+set_target_properties(plasma-discover-updater PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover)
- 
- target_link_libraries(plasma-discover-updater KF5::CoreAddons
-                                    KF5::I18n
-@@ -34,4 +35,3 @@
- 
- install( FILES plasmadiscoverupdaterui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/plasmadiscoverupdater )
- install( PROGRAMS plasma-discover-updater.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
--
diff --git a/debian/patches/02_notifiers-private.patch b/debian/patches/02_notifiers-private.patch
deleted file mode 100644
index eefb753..0000000
--- a/debian/patches/02_notifiers-private.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Matthias Klumpp <matthias at tenstral.net>
-Date: Mon, 07 Mar 2016 22:29:07 +0000
-Subject: Make libDiscoverNotifiers private too
-X-Git-Url: http://quickgit.kde.org/?p=discover.git&a=commitdiff&h=6e92f5638ddd0a0ff257d2f425d1bbcbb35eba32
----
-Make libDiscoverNotifiers private too
----
-
-
---- a/libdiscover/backends/DummyBackend/CMakeLists.txt
-+++ b/libdiscover/backends/DummyBackend/CMakeLists.txt
-@@ -17,5 +17,6 @@
- 
- add_library(DummyNotifier MODULE DummyNotifier.cpp)
- target_link_libraries(DummyNotifier Discover::Notifiers)
-+set_target_properties(DummyNotifier PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover)
- 
- install(TARGETS DummyNotifier DESTINATION ${PLUGIN_INSTALL_DIR}/discover-notifier)
---- a/libdiscover/backends/PackageKitBackend/CMakeLists.txt
-+++ b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
-@@ -17,5 +17,6 @@
- #notifier
- add_library(DiscoverPackageKitNotifier MODULE PackageKitNotifier.cpp)
- target_link_libraries(DiscoverPackageKitNotifier PRIVATE PK::packagekitqt5 Discover::Notifiers)
-+set_target_properties(DiscoverPackageKitNotifier PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover)
- 
- install(TARGETS DiscoverPackageKitNotifier DESTINATION ${PLUGIN_INSTALL_DIR}/discover-notifier)
---- a/libdiscover/notifiers/CMakeLists.txt
-+++ b/libdiscover/notifiers/CMakeLists.txt
-@@ -7,7 +7,6 @@
- generate_export_header(DiscoverNotifiers)
- 
- target_include_directories(DiscoverNotifiers PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
--install(TARGETS DiscoverNotifiers ${INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS DiscoverNotifiers DESTINATION ${CMAKE_INSTALL_LIBDIR}/plasma-discover)
- 
- add_library(Discover::Notifiers ALIAS DiscoverNotifiers)
--
---- a/notifier/CMakeLists.txt
-+++ b/notifier/CMakeLists.txt
-@@ -10,6 +10,8 @@
- 
-     Discover::Notifiers
- )
-+set_target_properties(DiscoverNotifierDeclarativePlugin PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover)
-+
- install(TARGETS DiscoverNotifierDeclarativePlugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/discovernotifier)
- install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/discovernotifier)
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 26d71ff..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01_libdiscover-private.patch
-02_notifiers-private.patch

-- 
KDE Discover packaging