[SCM] KDE Discover packaging branch, master, updated. 354988eb04e7a3f44e53f8ae0260864c11cdda65

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit f6d74e104524604a39afcd83846b0a32e55c65f3
Author: Matthias Klumpp <mak at debian.org>
Date:   Mon Jan 11 23:32:50 2016 +0100

    Refresh install files and drop unneeded files
---
 debian/copyright                                          |  1 +
 debian/libdiscover.install                                | 12 ------------
 debian/muon-common.install                                |  1 -
 debian/muon-discover.lintian-overrides                    |  1 -
 debian/muon-notifier.install                              |  5 -----
 debian/muon-updater.install                               |  4 ----
 debian/muon-updater.lintian-overrides                     |  1 -
 debian/muon.postinst                                      | 11 -----------
 debian/not-installed                                      |  4 ++--
 debian/plasma-discover-common.install                     |  1 +
 debian/plasma-discover-updater.install                    |  9 +++++++++
 debian/{muon-discover.install => plasma-discover.install} |  8 ++++----
 12 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 0c304c3..3dceb21 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -145,6 +145,7 @@ License: GPL-3 or LGPL-2.1-QTexception-1.1
 Files: debian/*
 Copyright: 2010, Jonathan Thomas <echidnaman at kubuntu.org>
            2015, Jonathan Riddell <jr at jriddell.org>
+           2016, Matthias Klumpp <mak at debian.org>
 License: GPL-3+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/libdiscover.install b/debian/libdiscover.install
deleted file mode 100644
index 2538f40..0000000
--- a/debian/libdiscover.install
+++ /dev/null
@@ -1,12 +0,0 @@
-etc/dbus-1/system.d/org.kde.muon.repo.conf
-usr/lib/*/libDiscoverCommon.so
-usr/lib/*/libDiscoverNotifiers.so
-usr/lib/*/libMuonApt.a
-usr/lib/*/libexec/muon_repo_helper
-usr/lib/*/qt5/plugins/discover-notifier/
-usr/lib/*/qt5/plugins/discover/
-usr/lib/*/qt5/qml/org/kde/discover/
-usr/share/dbus-1/system-services/org.kde.muon.repo.service
-usr/share/libdiscover/
-usr/share/locale/*/LC_MESSAGES/libdiscover.mo
-usr/share/polkit-1/actions/org.kde.muon.repo.policy
diff --git a/debian/muon-common.install b/debian/muon-common.install
deleted file mode 100644
index a32f7d5..0000000
--- a/debian/muon-common.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/icons/hicolor/*/apps/muondiscover.*
diff --git a/debian/muon-discover.lintian-overrides b/debian/muon-discover.lintian-overrides
deleted file mode 100644
index afa5759..0000000
--- a/debian/muon-discover.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-muon-discover: binary-without-manpage usr/bin/muon-discover
diff --git a/debian/muon-notifier.install b/debian/muon-notifier.install
deleted file mode 100644
index c4545b0..0000000
--- a/debian/muon-notifier.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/knotifications5/
-usr/share/kservices5/plasma-applet-org.kde.discovernotifier.desktop
-usr/share/locale/*/LC_MESSAGES/muon-notifier.mo
-usr/share/locale/*/LC_MESSAGES/plasma_applet_org.kde.muonnotifier.mo
-usr/share/plasma/plasmoids/org.kde.discovernotifier/
diff --git a/debian/muon-updater.install b/debian/muon-updater.install
deleted file mode 100644
index 83f2bd2..0000000
--- a/debian/muon-updater.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/muon-updater
-usr/share/applications/muon-updater.desktop
-usr/share/kxmlgui5/muonupdater/
-usr/share/locale/*/LC_MESSAGES/muon-updater.mo
diff --git a/debian/muon-updater.lintian-overrides b/debian/muon-updater.lintian-overrides
deleted file mode 100644
index 0c1b54e..0000000
--- a/debian/muon-updater.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-muon-updater: binary-without-manpage usr/bin/muon-updater
diff --git a/debian/muon.postinst b/debian/muon.postinst
deleted file mode 100644
index d535e7b..0000000
--- a/debian/muon.postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-# make sure we update the index so that on first install
-# we have something to show (LP: #617397)
-if [ "$1" = "configure" ];then
-    update-apt-xapian-index -u || true
-fi
diff --git a/debian/not-installed b/debian/not-installed
index c204cba..236d80a 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1,2 @@
-./usr/bin/muon-exporter
-usr/share/locale/*/LC_MESSAGES/muon-exporter.mo
+./usr/bin/plasma-discover-exporter
+usr/share/locale/*/LC_MESSAGES/plasma-discover-exporter.mo
diff --git a/debian/plasma-discover-common.install b/debian/plasma-discover-common.install
new file mode 100644
index 0000000..00c7869
--- /dev/null
+++ b/debian/plasma-discover-common.install
@@ -0,0 +1 @@
+usr/share/icons/hicolor/*/apps/plasmadiscover.*
diff --git a/debian/plasma-discover-updater.install b/debian/plasma-discover-updater.install
new file mode 100644
index 0000000..76309ca
--- /dev/null
+++ b/debian/plasma-discover-updater.install
@@ -0,0 +1,9 @@
+usr/bin/plasma-discover-updater
+usr/share/applications/plasma-discover-updater.desktop
+usr/share/kxmlgui5/plasmadiscoverupdater/
+usr/share/locale/*/LC_MESSAGES/plasma-discover-updater.mo
+usr/share/knotifications5/
+usr/share/kservices5/plasma-applet-org.kde.discovernotifier.desktop
+usr/share/locale/*/LC_MESSAGES/plasma-discover-notifier.mo
+usr/share/locale/*/LC_MESSAGES/plasma_applet_org.kde.plasmadiscovernotifier.mo
+usr/share/plasma/plasmoids/org.kde.discovernotifier/
diff --git a/debian/muon-discover.install b/debian/plasma-discover.install
similarity index 57%
rename from debian/muon-discover.install
rename to debian/plasma-discover.install
index fef0024..566f377 100644
--- a/debian/muon-discover.install
+++ b/debian/plasma-discover.install
@@ -1,7 +1,7 @@
-usr/bin/muon-discover
+usr/bin/plasma-discover
 usr/lib/*/qt5/qml/org/kde/discovernotifier/libDiscoverNotifierDeclarativePlugin.so
 usr/lib/*/qt5/qml/org/kde/discovernotifier/qmldir
 usr/share/applications/org.kde.discover.desktop
-usr/share/kxmlgui5/muondiscover/
-usr/share/locale/*/LC_MESSAGES/muon-discover.mo
-usr/share/muondiscover/
+usr/share/kxmlgui5/plasmadiscover/
+usr/share/locale/*/LC_MESSAGES/plasma-discover.mo
+usr/share/plasmadiscover/

-- 
KDE Discover packaging