[SCM] KDE Discover packaging branch, kubuntu_unstable, updated. 3984cfb53ba8a155f04283ab7a3f339b003fe0a7

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 8305603204c42bd9a608cf7346b8ffa661dba2e7
Merge: 415c4c66cff27e7b5ee9b6bdb15b45e58f984520 fd10db8025d7fc09a2a148470ffbb879b0edb961
Author: Philip Muškovac <yofel at gmx.net>
Date:   Sat Jan 16 10:48:17 2016 +0100

    Merge branch 'kubuntu_xenial_archive' into kubuntu_unstable

 debian/TODO                                        |   6 +
 debian/changelog                                   |  22 ++-
 debian/control                                     | 157 ++++++++++++---------
 debian/copyright                                   |   1 +
 ...bdiscover.install => libdiscovercommon.install} |   2 -
 debian/libdiscovercommon.lintian-overrides.in      |   3 +
 debian/muon-discover.lintian-overrides             |   1 -
 debian/muon-updater.install                        |   4 -
 debian/muon-updater.lintian-overrides              |   1 -
 debian/muon.postinst                               |  11 --
 debian/not-installed                               |   3 +-
 debian/patches/series                              |   2 +
 .../upstream_fix_crash_on_pkglist_refresh.diff     |  30 ++++
 .../upstream_prevent_misleading_notification.diff  |  29 ++++
 ...mmon.install => plasma-discover-common.install} |   0
 ...ier.install => plasma-discover-updater.install} |   7 +-
 debian/plasma-discover-updater.lintian-overrides   |   1 +
 ...on-discover.install => plasma-discover.install} |   2 +-
 debian/plasma-discover.lintian-overrides           |   1 +
 debian/rules                                       |  26 +++-
 debian/watch                                       |   4 +-
 21 files changed, 215 insertions(+), 98 deletions(-)

diff --cc debian/control
index 1ec207c,ac02ce9..95f1abf
--- a/debian/control
+++ b/debian/control
@@@ -2,29 -2,29 +2,30 @@@ Source: plasma-discove
  Section: kde
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: Maximiliano Curia <maxy at debian.org>
+ Uploaders: Maximiliano Curia <maxy at debian.org>,
+            Matthias Klumpp <mak at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
-                kinit-dev,
-                kio-dev,
+                extra-cmake-modules (>= 5.18.0~),
+                kinit-dev (>= 5.18.0~),
+                kio-dev (>= 5.18.0~),
 +               libappstreamqt-dev,
                 libdebconf-kde-dev (>= 1.0.0),
-                libkf5attica-dev,
-                libkf5config-dev,
-                libkf5configwidgets-dev,
-                libkf5coreaddons-dev,
-                libkf5dbusaddons-dev,
-                libkf5declarative-dev,
-                libkf5i18n-dev,
-                libkf5iconthemes-dev,
-                libkf5itemviews-dev,
-                libkf5kdelibs4support-dev,
-                libkf5newstuff-dev,
-                libkf5notifications-dev,
-                libkf5solid-dev,
-                libkf5wallet-dev,
-                libkf5widgetsaddons-dev,
+                libkf5attica-dev (>= 5.18.0~),
+                libkf5config-dev (>= 5.18.0~),
+                libkf5configwidgets-dev (>= 5.18.0~),
+                libkf5coreaddons-dev (>= 5.18.0~),
+                libkf5dbusaddons-dev (>= 5.18.0~),
+                libkf5declarative-dev (>= 5.18.0~),
+                libkf5i18n-dev (>= 5.18.0~),
+                libkf5iconthemes-dev (>= 5.18.0~),
+                libkf5itemviews-dev (>= 5.18.0~),
+                libkf5kdelibs4support-dev (>= 5.18.0~),
+                libkf5newstuff-dev (>= 5.18.0~),
+                libkf5notifications-dev (>= 5.18.0~),
+                libkf5solid-dev (>= 5.18.0~),
+                libkf5wallet-dev (>= 5.18.0~),
+                libkf5widgetsaddons-dev (>= 5.18.0~),
                 libphonon4qt5-dev,
                 libphonon4qt5experimental-dev,
                 libqapt-dev (>= 3.0.0),
@@@ -37,29 -37,33 +38,31 @@@
                 qtdeclarative5-dev (>= 5.4.0~)
  Standards-Version: 3.9.6
  Homepage: https://projects.kde.org/projects/kde/workspace/discover
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/discover.git
- Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/discover.git
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/plasma-discover.git
+ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/plasma-discover.git
  
- Package: muon-discover
+ Package: plasma-discover
  Architecture: any
--Depends: app-install-data,
--         apt-xapian-index,
-          libdiscover (= ${binary:Version}),
 -         appstream,
++Depends: appstream,
+          libdiscovercommon (= ${binary:Version}),
           libqapt3-runtime,
-          muon-common (= ${source:Version}),
+          plasma-discover-common (= ${source:Version}),
           ${misc:Depends},
           ${shlibs:Depends}
- Recommends: app-install-data-partner, ubuntu-sso-client
+ Breaks: muon-discover (<< 4:5.5.3a)
+ Replaces: muon-discover (<< 4:5.5.3a)
 -Recommends: software-properties-kde, app-install-data-partner
++Recommends: software-properties-kde
+ Suggests: plasma-discover-updater
  Description: Utility for browsing, installing, and removing applications
-  Muon Discover will help you browse through the huge applications library you
+  Plasma Discover will help you browse through the huge applications library you
   have available and help you find the applications you're looking for.
   .
-  To install or remove software using the Center, you need administrator
+  To install or remove software using Discover, you need administrator
   access on the computer.
  
- Package: muon-updater
+ Package: plasma-discover-updater
  Architecture: any
- Depends: libdiscover (= ${binary:Version}),
+ Depends: libdiscovercommon (= ${binary:Version}),
           libqapt3-runtime,
           ${misc:Depends},
           ${shlibs:Depends}

-- 
KDE Discover packaging