[SCM] discover packaging branch, kubuntu_stable, updated. c2c311d207867d20813c12145f2bfa480d780ea2

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_stable branch:
commit f9246f538ba6aea125de40be4c5e8d839d1ee3da
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Jan 5 21:51:22 2016 +0100

    Rename discover to muon-discover to work around a source conflict in the archive
---
 debian/changelog | 16 +++-------------
 debian/control   |  4 ++--
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd81644..ab8a358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,9 @@
-discover (4:5.5.2-0ubuntu1) UNRELEASED; urgency=medium
-
-  [ Scarlett Clark ]
-  * New upstream release Xenial.
-
-  [ Clive Johnston ]
-  * New upstream release
-
- -- Clive Johnston <clivejo at aol.com>  Tue, 29 Dec 2015 22:30:49 +0000
-
-discover (4:5.4.95-0ubuntu1) UNRELEASED; urgency=medium
+muon-discover (4:5.5.2-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Jonathan Riddell ]
   * Initial package split upstream from Muon
 
-  [ Scarlett Clark ]
-  * Debian merge: No remaining changes. 
+  [ Clive Johnston ]
+  * New upstream release
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 22 Nov 2015 14:22:31 +0000
diff --git a/debian/control b/debian/control
index 965edba..4f2526c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: discover
+Source: muon-discover
 Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -111,7 +111,7 @@ Description: Muon package manager suite (common data files)
  .
  This package contains data files shared by various parts of the Muon suite.
 
-Package: discover-dbg
+Package: muon-discover-dbg
 Section: debug
 Priority: extra
 Architecture: any

-- 
discover packaging