[SCM] muon packaging branch, master, updated. debian/5.4.1-1-1-ga712eb3

[Scott Kitterman]

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

The following commit has been merged in the master branch:
commit a712eb394c8b5edcde489bff64d4292f370e90d9
Author: Scott Kitterman <scott at kitterman.com>
Date:   Tue Sep 15 00:09:36 2015 -0400

    * Patch out Canonical support information used for Ubuntu - We're Debian (Closes: #791875)
      - Added debian/patches/no-canonical-support
---
 debian/changelog                    |  9 ++++++++
 debian/patches/no-canonical-support | 44 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d345867..e7e4d74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+muon (4:5.4.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Patch out Canonical support information used for Ubuntu - We're Debian
+    (Closes: #791875)
+    - Added debian/patches/no-canonical-support
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 14 Sep 2015 23:59:24 -0400
+
 muon (4:5.4.1-1) unstable; urgency=medium
 
   * New upstream release (5.4.1).
diff --git a/debian/patches/no-canonical-support b/debian/patches/no-canonical-support
new file mode 100644
index 0000000..337b6b6
--- /dev/null
+++ b/debian/patches/no-canonical-support
@@ -0,0 +1,44 @@
+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 at kitterman.com>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791875
+Forwarded: not-needed
+Last-Update: 2015-09-15
+
+--- muon-5.4.1.orig/muon/DetailsTabs/MainTab.cpp
++++ muon-5.4.1/muon/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 --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5e52632
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-canonical-support

-- 
muon packaging