[SCM] KDE Discover packaging branch, kubuntu_xenial_archive, updated. ubuntu/5.5.5-0ubuntu1-27-gef8e192

[Matthias Klumpp]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 36813a07a3276dde6644f291bea33053e27fd16d
Merge: 5071e6818c246cc779a391489ff9a342f3fb999a 4f02d5a5a24098ff2f1ad97f14bbd3be9f4f7982
Author: Matthias Klumpp <mak at debian.org>
Date:   Wed Apr 20 19:47:01 2016 +0200

    Merge branch 'master' into kubuntu_xenial_archive

 debian/changelog                                   |  49 ++++--
 debian/control                                     | 109 ++++++-------
 debian/copyright                                   | 176 ++++++++++++++-------
 debian/gbp.conf                                    |   6 +
 debian/libdiscovercommon.lintian-overrides.in      |   3 -
 debian/not-installed                               |   6 -
 debian/plasma-discover-common.install              |   3 +-
 ...mon.install => plasma-discover-private.install} |   4 +-
 debian/plasma-discover-updater.install             |   9 +-
 debian/plasma-discover-updater.lintian-overrides   |   1 -
 debian/plasma-discover.install                     |   7 +-
 debian/plasma-discover.lintian-overrides           |   1 -
 debian/rules                                       |  13 --
 debian/upstream/metadata                           |   7 +
 debian/watch                                       |   3 +-
 15 files changed, 225 insertions(+), 172 deletions(-)

diff --cc debian/changelog
index 519ea43,f49c3d2..f57e0e0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,32 +1,40 @@@
- plasma-discover (5.5.5-0ubuntu1) xenial; urgency=medium
++plasma-discover (5.6.2-1ubuntu1) xenial; urgency=medium
 +
-   * New upstream bugfix release
++  * Merge with Debian unstable, remaining changes:
++    - Add Breaks/Replaces for libdiscovercommon on plasma-discover-private
++    - Make plasma-discover-common break the plasma-discover(-updater) << 5.6
 +
-  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 14 Apr 2016 13:49:28 -0700
++ -- Matthias Klumpp <mak at debian.org>  Fri, 15 Apr 2016 19:04:38 +0200
 +
- plasma-discover (5.5.4-0ubuntu1) xenial; urgency=medium
+ plasma-discover (5.6.2-1) unstable; urgency=medium
  
-   [ Jonathan Riddell ]
-   * Initial package split upstream from Muon
+   [ Matthias Klumpp ]
+   * New upstream bugfix release: 5.6.2
+   * Improve package descriptions
+   * Use secure URLs for Vcs-* fields
+ 
+   [ Maximiliano Curia ]
+   * Add upstream metadata (DEP-12)
+ 
+  -- Matthias Klumpp <mak at debian.org>  Thu, 14 Apr 2016 16:22:20 +0200
+ 
+ plasma-discover (5.6.0-1) unstable; urgency=medium
  
-   [ Clive Johnston ]
-   * New upstream release
+   [ Matthias Klumpp ]
+   * Upload to unstable
+   * New upstream release: 5.6.0
+   * Add gbp.conf
+   * Drop all patches: Applied upstream
+ 
+   [ Maximiliano Curia ]
+   * uscan no longer supports this kind of watch files.
+ 
+  -- Matthias Klumpp <mak at debian.org>  Wed, 23 Mar 2016 18:06:56 +0100
  
-   [ Philip Muškovac ]
-   * Add patches from the Plasma/5.5 branch:
-     - upstream_fix_crash_on_pkglist_refresh.diff
-     - upstream_prevent_misleading_notification.diff
+ plasma-discover (5.5.95-1) experimental; urgency=medium
+ 
+   [ Jonathan Riddell ]
+   * Initial package split upstream from Muon.
  
    [ Matthias Klumpp ]
    * Rename the packages to plasma-discover-*,
diff --cc debian/control
index ac02ce9,9a1eb85..cad8aee
--- a/debian/control
+++ b/debian/control
@@@ -52,9 -48,9 +48,9 @@@ Depends: appstream
           ${shlibs:Depends}
  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 software
 +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.
   .
@@@ -86,21 -79,21 +79,27 @@@ Depends: policykit-1
           python3,
           ${misc:Depends},
           ${shlibs:Depends}
- Breaks: libmuon (<< 4:5.5.3a), libdiscover
- Replaces: libmuon (<< 4:5.5.3a), libdiscover
- Description: Shared runtime files for the Discover package management suite
-  The Discover package management suite is a collection of package management
-  applications built on the KDE platform.
 -Breaks: libmuon (<< 4:5.5.3a)
 -Replaces: libmuon (<< 4:5.5.3a)
++Breaks: libdiscovercommon (<< 5.6),
++        libmuon (<< 4:5.5.3a)
++Replaces: libdiscovercommon (<< 5.6),
++          libmuon (<< 4:5.5.3a)
+ Description: Private runtime libraries for the Discover suite
+  The Discover suite is a collection of software management applications
+  built on the KDE platform.
   .
-  This package contains runtime libraries
+  This package contains private runtime libraries
  
  Package: plasma-discover-common
  Architecture: all
  Depends: ${misc:Depends}
--Breaks: muon-common (<< 4:5.5.3a)
--Replaces: muon-common (<< 4:5.5.3a)
- Description: Discover package manager suite (common data files)
-  Discover is a graphical package manager for the Plasma workspace.
++Breaks: muon-common (<< 4:5.5.3a),
++        plasma-discover (<< 5.6),
++        plasma-discover-updater (<< 5.6)
++Replaces: muon-common (<< 4:5.5.3a),
++          plasma-discover (<< 5.6),
++          plasma-discover-updater (<< 5.6)
+ Description: Discover software manager suite (common data files)
+  Discover is a graphical software manager for the Plasma workspace.
   .
   This package contains data files shared by various parts of the
   Discover suite.

-- 
KDE Discover packaging