[SCM] muon packaging branch, master, updated. fecb6967b6d2f05711b66df5e98eb142a66d44c4

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 8b2902b464d976d240785ce76010b6219e9357d9
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Aug 3 20:36:57 2011 +0200

    Add remove_canonical_support_info.diff.
---
 debian/patches/remove_canonical_support_info.diff |   38 +++++++++++++++++++++
 debian/patches/series                             |    1 +
 2 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/debian/patches/remove_canonical_support_info.diff b/debian/patches/remove_canonical_support_info.diff
new file mode 100644
index 0000000..4730486
--- /dev/null
+++ b/debian/patches/remove_canonical_support_info.diff
@@ -0,0 +1,38 @@
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Forwarded: no
+Description: This patch hides useless information about Canonical support which
+ doesn't make sense in Debian. This is just a quick patch, perhaps this issue
+should be fixed in libqapt.
+---
+ libmuon/DetailsTabs/MainTab.cpp |   20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+--- a/libmuon/DetailsTabs/MainTab.cpp
++++ b/libmuon/DetailsTabs/MainTab.cpp
+@@ -194,16 +194,16 @@ void MainTab::refresh()
+     m_descriptionBrowser->setText(m_package->longDescription());
+ 
+     // Append a newline to give a bit of separation for the support string
+-    m_descriptionBrowser->append(QString());
+-    if (m_package->isSupported()) {
+-        m_descriptionBrowser->append(i18nc("@info Tells how long Canonical, Ltd. will support a package",
+-                                        "Canonical provides critical updates for %1 until %2.",
+-                                        m_package->latin1Name(), m_package->supportedUntil()));
+-    } 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->latin1Name()));
+-    }
++//    m_descriptionBrowser->append(QString());
++//    if (m_package->isSupported()) {
++//        m_descriptionBrowser->append(i18nc("@info Tells how long Canonical, Ltd. will support a package",
++//                                        "Canonical provides critical updates for %1 until %2.",
++//                                        m_package->latin1Name(), m_package->supportedUntil()));
++//    } 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->latin1Name()));
++//    }
+ }
+ 
+ void MainTab::emitSetInstall()
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8618fc7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove_canonical_support_info.diff

-- 
muon packaging