diff -pruN 4:5.8.0-1/debian/changelog 4:5.8.0-1ubuntu5/debian/changelog
--- 4:5.8.0-1/debian/changelog	2018-04-27 04:12:37.000000000 +0000
+++ 4:5.8.0-1ubuntu5/debian/changelog	2020-03-23 06:20:16.000000000 +0000
@@ -1,3 +1,41 @@
+muon (4:5.8.0-1ubuntu5) focal; urgency=medium
+
+  * No-change rebuild for libgcc-s1 package name change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 23 Mar 2020 07:20:16 +0100
+
+muon (4:5.8.0-1ubuntu4) cosmic; urgency=medium
+
+  * Add depends on kde-cli-tools for kdesu, so launching software-
+    proprties-qt from Muon works under any DE.
+
+ -- Rik Mills <rikmills@kubuntu.org>  Sat, 01 Sep 2018 01:34:44 +0100
+
+muon (4:5.8.0-1ubuntu3) cosmic; urgency=medium
+
+  * Add breaks/replaces on software-properties-kde.
+
+ -- Rik Mills <rikmills@kubuntu.org>  Thu, 02 Aug 2018 14:55:51 +0100
+
+muon (4:5.8.0-1ubuntu2) cosmic; urgency=medium
+
+  * Switch depends from software-properties-kde to newly ported
+    software-properties-qt.
+  * Provide a compatibility symlink so Muon can still launch software-
+    properties. Can be dropped when a new Muon release adapts to the
+    kde -> qt binary name change.
+
+ -- Rik Mills <rikmills@kubuntu.org>  Thu, 02 Aug 2018 11:23:30 +0100
+
+muon (4:5.8.0-1ubuntu1) cosmic; urgency=medium
+
+  * Merge from debian unstable. Remaining changes:
+    - Don't adopt debian/patches/no-canonical-support patch
+    - debian/control: Depends on software-properties-kde
+    - Keep Kubuntu VCS fields
+
+ -- Rik Mills <rikmills@kubuntu.org>  Mon, 25 Jun 2018 06:33:16 +0100
+
 muon (4:5.8.0-1) unstable; urgency=medium
 
   * Team upload.
@@ -12,6 +50,22 @@ muon (4:5.8.0-1) unstable; urgency=mediu
 
  -- Pino Toscano <pino@debian.org>  Fri, 27 Apr 2018 06:12:37 +0200
 
+muon (4:5.8.0-0ubuntu1) bionic; urgency=medium
+
+  * New upstream bugfix release (5.8.0)
+
+ -- Rik Mills <rikmills@kubuntu.org>  Tue, 20 Mar 2018 18:14:36 +0000
+
+muon (4:5.7.0-1ubuntu1) bionic; urgency=medium
+
+  * Sync with debian changes: remaining changes
+    - Don't adopt debian/patches/no-canonical-support patch
+    - Depends on software-properties-kde and drop obsolete recommends
+      on muon-updater
+    - Keep Kubuntu VCS fields
+
+ -- Rik Mills <rikmills@kubuntu.org>  Fri, 01 Dec 2017 13:22:01 +0000
+
 muon (4:5.7.0-1) unstable; urgency=medium
 
   * Team upload.
@@ -44,6 +98,26 @@ muon (4:5.7.0-1) unstable; urgency=mediu
 
  -- Pino Toscano <pino@debian.org>  Wed, 29 Nov 2017 08:28:34 +0100
 
+muon (4:5.7.0-0ubuntu3) artful; urgency=medium
+
+  * Drop obsolete recommends on muon-updater
+
+ -- Rik Mills <rikmills@kubuntu.org>  Tue, 27 Jun 2017 20:03:21 +0100
+
+muon (4:5.7.0-0ubuntu2) artful; urgency=medium
+
+  * Switch build depends to new KF5 -dev package names
+    - plasma-framework-dev -> libkf5plasma-dev 
+    - kio-dev -> libkf5kio-dev 
+
+ -- Rik Mills <rikmills@kubuntu.org>  Sat, 06 May 2017 16:56:18 +0100
+
+muon (4:5.7.0-0ubuntu1) zesty; urgency=medium
+
+  * New upstream bugfix release (5.7.0)
+
+ -- Rik Mills <rikmills@kubuntu.org>  Thu, 06 Apr 2017 17:43:05 +0100
+
 muon (4:5.6.0-1) unstable; urgency=medium
 
   * Team upload.
@@ -60,6 +134,18 @@ muon (4:5.6.0-1) unstable; urgency=mediu
 
  -- Scott Kitterman <scott@kitterman.com>  Thu, 14 Jul 2016 21:27:43 -0400
 
+muon (4:5.6.0-0ubuntu2) zesty; urgency=medium
+
+  * Add software-properties-kde dependency. (LP: #1612392)
+
+ -- Carlo Vanini <silhusk@gmail.com>  Thu, 11 Aug 2016 18:46:57 +0200
+
+muon (4:5.6.0-0ubuntu1) xenial; urgency=medium
+
+  * New upstream release 5.6.0 (Closes LP: #1562406) 
+
+ -- Clive Johnston <clivejo@aol.com>  Sat, 26 Mar 2016 20:50:44 +0000
+
 muon (4:5.4.3-1) unstable; urgency=medium
 
   * New upstream release (5.4.3).
diff -pruN 4:5.8.0-1/debian/control 4:5.8.0-1ubuntu5/debian/control
--- 4:5.8.0-1/debian/control	2018-04-27 04:11:49.000000000 +0000
+++ 4:5.8.0-1ubuntu5/debian/control	2018-09-01 00:34:44.000000000 +0000
@@ -18,16 +18,20 @@ Build-Depends: cmake (>= 2.8.12),
                qtbase5-dev (>= 5.4.0~),
 Standards-Version: 4.1.4
 Homepage: https://projects.kde.org/projects/kde/workspace/muon
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde-extras/muon
-Vcs-Git: https://salsa.debian.org/qt-kde-team/kde-extras/muon.git
+Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/muon
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/muon
 
 Package: muon
 Architecture: any
 Depends: apt-xapian-index,
+         kde-cli-tools,
          libqapt3 (>= 3.0.2),
          libqapt3-runtime (>= 3.0.2),
+         software-properties-qt,
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: software-properties-kde
+Replaces: software-properties-kde
 Description: graphical package manager
  Muon is a graphical package manager.
  .
diff -pruN 4:5.8.0-1/debian/muon.links 4:5.8.0-1ubuntu5/debian/muon.links
--- 4:5.8.0-1/debian/muon.links	1970-01-01 00:00:00.000000000 +0000
+++ 4:5.8.0-1ubuntu5/debian/muon.links	2018-09-01 00:34:44.000000000 +0000
@@ -0,0 +1 @@
+usr/bin/software-properties-qt usr/bin/software-properties-kde
diff -pruN 4:5.8.0-1/debian/patches/no-canonical-support.diff 4:5.8.0-1ubuntu5/debian/patches/no-canonical-support.diff
--- 4:5.8.0-1/debian/patches/no-canonical-support.diff	2017-11-29 07:06:51.000000000 +0000
+++ 4:5.8.0-1ubuntu5/debian/patches/no-canonical-support.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-Description: Patch out Canonical support information used for Ubuntu - We're Debian
- While in theory this could be managed with dpkg-vendor and some IFDEFery,
- it's just easier to patch it out.  This code hasn't changed in years, so the
- patch shouldn't take any effort to maintain.
-Author: Scott Kitterman <scott@kitterman.com>
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791875
-Forwarded: not-needed
-Last-Update: 2016-07-14
-
---- a/src/DetailsTabs/MainTab.cpp
-+++ b/src/DetailsTabs/MainTab.cpp
-@@ -179,19 +179,19 @@ void MainTab::refresh()
-     m_packageShortDescLabel->setText(m_package->shortDescription());
- 
-     m_descriptionBrowser->setText(m_package->longDescription());
--
-+    // Patch out Ubuntu only support information
-     // Append a newline to give a bit of separation for the support string
--    m_descriptionBrowser->append(QString());
--    if (m_package->isSupported()) {
--        QDateTime endDate = m_package->supportedUntil();
--        m_descriptionBrowser->append(i18nc("@info Tells how long Canonical, Ltd. will support a package",
--                                        "Canonical provides critical updates for %1 until %2.",
--                                        m_package->name(), endDate.date().toString()));
--    } else {
--        m_descriptionBrowser->append(i18nc("@info Tells how long Canonical, Ltd. will support a package",
--                                        "Canonical does not provide updates for %1. Some updates "
--                                        "may be provided by the Ubuntu community.", m_package->name()));
--    }
-+    //m_descriptionBrowser->append(QString());
-+    //if (m_package->isSupported()) {
-+    //    QDateTime endDate = m_package->supportedUntil();
-+    //    m_descriptionBrowser->append(i18nc("@info Tells how long Canonical, Ltd. will support a package",
-+    //                                    "Canonical provides critical updates for %1 until %2.",
-+    //                                    m_package->name(), endDate.date().toString()));
-+    //} else {
-+    //    m_descriptionBrowser->append(i18nc("@info Tells how long Canonical, Ltd. will support a package",
-+    //                                    "Canonical does not provide updates for %1. Some updates "
-+    //                                    "may be provided by the Ubuntu community.", m_package->name()));
-+    //}
- }
- 
- void MainTab::emitSetInstall()
diff -pruN 4:5.8.0-1/debian/patches/series 4:5.8.0-1ubuntu5/debian/patches/series
--- 4:5.8.0-1/debian/patches/series	2017-11-29 07:07:24.000000000 +0000
+++ 4:5.8.0-1ubuntu5/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-no-canonical-support.diff
