Merged with Debian

8 files changed, 116 insertions, 126 deletions

diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 52fe38e..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-- libdiscover package name clashes with the discover (hardware identification
-  system) namespace.
-  From the install file the libs lack soversion, and could at least be further splitted in
-  discover-common discover-notifiers muon-apt qml-module-org-kde-discover
-  muon-repo
-  Do these libs even need to be in their own packages?
diff --git a/debian/changelog b/debian/changelog
index 7ab2916..82bf97a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,52 @@
-plasma-discover (5.7.1-0ubuntu1) UNRELEASED; urgency=medium
+plasma-discover (5.7.1-1ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release (5.7.1)
+  * Merged with Debian
 
  -- Clive Johnston <clivejo@kubuntu.org>  Sat, 16 Jul 2016 00:26:08 +0100
 
+plasma-discover (5.7.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release: 5.7.1
+
+ -- Matthias Klumpp <mak@debian.org>  Fri, 15 Jul 2016 16:42:30 +0200
+
+plasma-discover (5.7.0-3) unstable; urgency=medium
+
+  * Add more Breaks/Replaces (Closes: #830948)
+
+ -- Matthias Klumpp <mak@debian.org>  Thu, 14 Jul 2016 15:00:38 +0200
+
+plasma-discover (5.7.0-2) unstable; urgency=medium
+
+  * Adjust packaging for the 5.7 release
+    - Drop plasma-discover-updater, no longer needed
+    - Merge plasma-discover-private into main package,
+      it is no longer necessary to have this split.
+    - Install new files
+    - Write better package description
+  * Refresh debian/copyright
+  * Drop the TODO file, all items have been addressed
+
+ -- Matthias Klumpp <mak@debian.org>  Tue, 12 Jul 2016 15:48:48 +0200
+
+plasma-discover (5.7.0-1) unstable; urgency=medium
+
+  [ Matthias Klumpp ]
+  * Drop obsolete recommends
+
+  [ Automatic packaging ]
+  * Update build-deps and deps with the info from cmake
+
+ -- Maximiliano Curia <maxy@debian.org>  Tue, 12 Jul 2016 14:18:41 +0200
+
+plasma-discover (5.6.5-1) unstable; urgency=medium
+
+  [ Automatic packaging ]
+  * Refresh patches
+
+ -- Maximiliano Curia <maxy@debian.org>  Wed, 22 Jun 2016 21:44:37 +0200
+
 plasma-discover (5.6.5-0ubuntu1) yakkety; urgency=medium
 
   [ Clive Johnston ]
@@ -15,6 +58,26 @@ plasma-discover (5.6.5-0ubuntu1) yakkety; urgency=medium
 
  -- Clive Johnston <clivejo@kubuntu.org>  Fri, 15 Jul 2016 20:49:56 +0100
 
+plasma-discover (5.6.4-1) unstable; urgency=medium
+
+  [ Automatic packaging ]
+  * Update build-deps and deps with the info from cmake
+  * Bump Standards-Version to 3.9.8
+  * Drop upstream applied patch: 01_components-without-pkgname.patch
+
+  [ Matthias Klumpp ]
+  * Use versioned breaks against libmuon
+  * Use PackageKit backend by default
+  * Drop unneeded build dependencies
+  * only-fetch-needed-pkgs.patch: Only fetch package information that we
+    require. This should speed up loading the application.
+
+  [ Maximiliano Curia ]
+  * Add missing breaks replaces against libmuon
+  * debian/control: Update Vcs-Browser and Vcs-Git fields
+
+ -- Matthias Klumpp <mak@debian.org>  Wed, 11 May 2016 22:02:48 +0200
+
 plasma-discover (5.6.4-0ubuntu1) yakkety; urgency=medium
 
   [ Clive Johnston ]
diff --git a/debian/control b/debian/control
index c43b0c1..2d68641 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: cmake (>= 2.8.12),
                kio-dev (>= 5.24.0~),
                libappstreamqt-dev (>= 0.9),
                libdebconf-kde-dev (>= 1.0.0),
+               libkf5archive-dev,
                libkf5attica-dev (>= 5.24.0~),
                libkf5config-dev (>= 5.24.0~),
                libkf5configwidgets-dev (>= 5.24.0~),
@@ -23,8 +24,11 @@ Build-Depends: cmake (>= 2.8.12),
                libkf5newstuff-dev (>= 5.24.0~),
                libkf5notifications-dev (>= 5.24.0~),
                libkf5solid-dev (>= 5.24.0~),
+               libkf5textwidgets-dev,
                libkf5wallet-dev (>= 5.24.0~),
                libkf5widgetsaddons-dev (>= 5.24.0~),
+               libkf5xmlgui-dev,
+               libpackagekitqt5-dev (>= 0.9.5),
                libqapt-dev (>= 3.0.0),
                libqca-qt5-2-dev,
                libqt5svg5-dev (>= 5.4.0~),
@@ -33,70 +37,56 @@ Build-Depends: cmake (>= 2.8.12),
                plasma-framework-dev (>= 5.24.0~),
                qtbase5-dev (>= 5.4.0~),
                qtdeclarative5-dev (>= 5.4.0~)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/projects/kde/workspace/discover
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/discover
 Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/discover
 
 Package: plasma-discover
 Architecture: any
-Depends: appstream,
-         libqapt3-runtime,
+Depends: appstream (>= 0.8),
+         packagekit (>= 1.0),
          plasma-discover-common (= ${source:Version}),
-         plasma-discover-private (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: muon-discover (<< 4:5.5.3a)
-Replaces: muon-discover (<< 4:5.5.3a)
-Recommends: software-properties-kde
-Suggests: plasma-discover-updater
-Description: Utility for browsing, installing, and removing applications
- 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 Discover, you need administrator
- access on the computer.
-
-Package: plasma-discover-updater
-Architecture: any
-Depends: libqapt3-runtime,
-         plasma-discover-private (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: libmuon (<< 4:5.6),
+        muon-discover (<< 4:5.5.3a),
         muon-notifier (<< 4:5.5.3a),
-        muon-updater (<< 4:5.5.3a)
+        muon-updater (<< 4:5.5.3a),
+        plasma-discover-common (<< 5.7.0),
+        plasma-discover-private (<< 5.7.0),
+        plasma-discover-updater (<< 5.7.0)
 Replaces: libmuon (<< 4:5.6),
+          muon-discover (<< 4:5.5.3a),
           muon-notifier (<< 4:5.5.3a),
-          muon-updater (<< 4:5.5.3a)
-Description: Update manager for KDE
- Plasma Discover Updater is a graphical update manager for KDE. It is part of
- the Discover family of software and provides an interface similar to that of
- Discover.
-
-Package: plasma-discover-private
-Architecture: any
-Depends: policykit-1,
-         python3,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: libmuon (<< 4:5.6)
-Replaces: libmuon (<< 4:5.6)
-Description: Private runtime libraries for the Discover suite
- The Discover suite is a collection of software management applications
- built on the KDE platform.
+          muon-updater (<< 4:5.5.3a),
+          plasma-discover-common (<< 5.7.0),
+          plasma-discover-private (<< 5.7.0),
+          plasma-discover-updater (<< 5.7.0)
+Recommends: software-properties-kde
+Description: Discover software management suite
+ Discover is a graphical software manager for the Plasma workspace.
+ It helps users easily and quickly find applications and other software
+ they might want to install.
+ .
+ By allowing to navigate a software library by search, categories, top lists
+ along with detailed application information that includes screenshots
+ and reviews, users can more quickly find applications that suit their needs.
  .
- This package contains private runtime libraries
+ Discover will also keep the system up to date by notifying about updates and
+ installing them.
 
 Package: plasma-discover-common
 Architecture: all
 Depends: ${misc:Depends}
 Breaks: muon-common (<< 4:5.5.3a),
-        plasma-discover (<< 5.6),
-        plasma-discover-updater (<< 5.6)
+        plasma-discover (<< 5.7.0-2),
+        plasma-discover-private (<< 5.7.0),
+        plasma-discover-updater (<< 5.7.0)
 Replaces: muon-common (<< 4:5.5.3a),
-          plasma-discover (<< 5.6),
-          plasma-discover-updater (<< 5.6)
+          plasma-discover (<< 5.7.0-2),
+          plasma-discover-private (<< 5.7.0),
+          plasma-discover-updater (<< 5.7.0)
 Description: Discover software manager suite (common data files)
  Discover is a graphical software manager for the Plasma workspace.
  .
@@ -107,8 +97,7 @@ Package: muon-discover
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: plasma-discover,
-         ${misc:Depends}
+Depends: plasma-discover, ${misc:Depends}
 Description: Transitional package (muon-discover -> plasma-discover)
  This is a transitional package for plasma-discover and can safely be
  removed.
@@ -117,8 +106,7 @@ Package: muon-updater
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: plasma-discover-updater,
-         ${misc:Depends}
+Depends: plasma-discover-updater, ${misc:Depends}
 Description: Transitional package (muon-updater -> plasma-discover-updater)
  This is a transitional package updating muon-updater to plasma-discover-updater
  and can safely be removed.
@@ -127,8 +115,7 @@ Package: muon-notifier
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: plasma-discover-updater,
-         ${misc:Depends}
+Depends: plasma-discover-updater, ${misc:Depends}
 Description: Transitional package (muon-notifier -> plasma-discover-updater)
  This is a transitional package updating muon-notifier to
  plasma-discover-updater and can safely be removed.
diff --git a/debian/copyright b/debian/copyright
index edeb434..a10d776 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -76,7 +76,6 @@ License: BSD-3-clause
 
 Files: ./libdiscover/*
  ./notifier/*
- ./updater/*
  ./discover/*
  ./exporter/MuonExporter.cpp
  ./exporter/MuonExporter.h
@@ -119,35 +118,18 @@ Files: ./libdiscover/Category/Category.cpp
  ./libdiscover/backends/ApplicationBackend/libmuonapt/MuonStrings.h
  ./libdiscover/backends/ApplicationBackend/libmuonapt/QAptActions.cpp
  ./libdiscover/backends/ApplicationBackend/libmuonapt/QAptActions.h
- ./updater/ChangelogWidget.cpp
- ./updater/ChangelogWidget.h
- ./updater/MainWindow.h
- ./updater/ProgressWidget.cpp
- ./updater/ProgressWidget.h
- ./updater/UpdateDelegate.cpp
- ./updater/UpdateDelegate.h
- ./updater/UpdaterWidget.cpp
- ./updater/UpdaterWidget.h
- ./updater/main.cpp
 Copyright: 2010-2013, Jonathan Thomas <echidnaman@kubuntu.org>
 License: GPL-2+3+KDEeV
 
-Files: ./libdiscover/backends/AkabeiBackend/*
- ./libdiscover/backends/DummyBackend/DummyNotifier.cpp
+Files: ./libdiscover/backends/DummyBackend/DummyNotifier.cpp
  ./libdiscover/backends/DummyBackend/DummyNotifier.h
  ./libdiscover/backends/PackageKitBackend/PackageKitNotifier.h
  ./libdiscover/backends/PackageKitBackend/PackageKitUpdater.cpp
  ./libdiscover/backends/PackageKitBackend/PackageKitUpdater.h
- ./libdiscover/backends/AkabeiBackend/AkabeiBackend.cpp
- ./libdiscover/backends/AkabeiBackend/AkabeiBackend.h
- ./libdiscover/backends/AkabeiBackend/AkabeiResource.cpp
- ./libdiscover/backends/AkabeiBackend/AkabeiResource.h
 Copyright: 2013, Lukas Appelhans <boom1992@chakra-project.org>
 License: GPL-2+3+KDEeV
 
-Files: ./libdiscover/backends/AkabeiBackend/AppAkabeiResource.cpp
- ./libdiscover/backends/AkabeiBackend/AppAkabeiResource.h
- ./libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
+Files: ./libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
  ./libdiscover/backends/PackageKitBackend/PackageKitMessages.cpp
  ./libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
  ./libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
@@ -163,42 +145,11 @@ Files: ./libdiscover/backends/ApplicationBackend/qoauth/src/interface.cpp
 Copyright: 2009, Dominik Kapusta <d@ayoy.net>
 License: LGPL-2.1+
 
-Files: ./cmake/FindAkabeiClient.cmake
- ./cmake/FindAkabeiCore.cmake
-Copyright: 2007, Charles Connell <charles@connells.org> (This was based upon FindKopete.cmake)
-  2007, Joris Guisson <joris.guisson@gmail.com> (This was based upon FindKTorrent.cmake)
-  2010, Lukas Appelhans <l.appelhans@gmx.de>
-License: BSD-3-clause
-
 Files: ./libdiscover/backends/ApplicationBackend/tests/NotifierTest.cpp
  ./libdiscover/backends/ApplicationBackend/tests/NotifierTest.h
 Copyright: 2015, Harald Sitter <sitter@kde.org>
 License: GPL-2+3+KDEeV
 
-Files: ./libdiscover/backends/ApplicationBackend/tests/modeltest.cpp
- ./libdiscover/backends/ApplicationBackend/tests/modeltest.h
-Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies)
-License: GPL-3 or LGPL-2.1-QTexception-1.1
- GNU Lesser General Public License Usage
- This file may be used under the terms of the GNU Lesser General Public
- License version 2.1 as published by the Free Software Foundation and
- appearing in the file LICENSE.LGPL included in the packaging of this
- file. Please review the following information to ensure the GNU Lesser
- General Public License version 2.1 requirements will be met:
- http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- .
- In addition, as a special exception, Nokia gives you certain additional
- rights. These rights are described in the Nokia Qt LGPL Exception
- version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
- .
- GNU General Public License Usage
- Alternatively, this file may be used under the terms of the GNU General
- Public License version 3.0 as published by the Free Software Foundation
- and appearing in the file LICENSE.GPL included in the packaging of this
- file. Please review the following information to ensure the GNU General
- Public License version 3.0 requirements will be met:
- http://www.gnu.org/copyleft/gpl.html.
-
 Files: ./cmake/FindQtOAuth.cmake
 Copyright: 2010, Harald Sitter <apachelogger@ubuntu.com>
   2010, Mehrdad Momeny <mehrdad.momeny@gmail.com>
diff --git a/debian/plasma-discover-common.install b/debian/plasma-discover-common.install
index c41f83e..216ca28 100644
--- a/debian/plasma-discover-common.install
+++ b/debian/plasma-discover-common.install
@@ -1,2 +1,6 @@
+etc/xdg/discover_ktexteditor_codesnippets_core.knsrc
 usr/share/icons/hicolor/*/apps/plasmadiscover.*
+usr/share/kxmlgui5/plasmadiscover/*
+usr/share/libdiscover/*
 usr/share/locale/*
+usr/share/plasmadiscover/*
diff --git a/debian/plasma-discover-private.install b/debian/plasma-discover-private.install
deleted file mode 100644
index 7ef5100..0000000
--- a/debian/plasma-discover-private.install
+++ /dev/null
@@ -1,8 +0,0 @@
-etc/dbus-1/system.d/org.kde.muon.repo.conf
-usr/lib/*/libexec/muon_repo_helper
-usr/lib/*/plasma-discover/*
-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/
diff --git a/debian/plasma-discover-updater.install b/debian/plasma-discover-updater.install
deleted file mode 100644
index f831313..0000000
--- a/debian/plasma-discover-updater.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/plasma-discover-updater
-usr/share/applications/plasma-discover-updater.desktop
-usr/share/knotifications5/
-usr/share/kservices5/plasma-applet-org.kde.discovernotifier.desktop
-usr/share/kxmlgui5/plasmadiscoverupdater/
-usr/share/plasma/plasmoids/org.kde.discovernotifier/
-usr/share/polkit-1/actions/org.kde.muon.repo.policy
diff --git a/debian/plasma-discover.install b/debian/plasma-discover.install
index 60dcabf..27ebe88 100644
--- a/debian/plasma-discover.install
+++ b/debian/plasma-discover.install
@@ -1,6 +1,12 @@
 usr/bin/plasma-discover
+usr/lib/*/plasma-discover/*
+usr/lib/*/qt5/plugins/discover-notifier/
+usr/lib/*/qt5/plugins/discover/
+usr/lib/*/qt5/qml/org/kde/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/plasmadiscover/
-usr/share/plasmadiscover/
+usr/share/appdata/*
+usr/share/applications/*
+usr/share/knotifications5/*
+usr/share/kservices5/*
+usr/share/plasma/plasmoids/*