[SCM] muon packaging branch, master, updated. 0222d0fd919bfa472006ffaff6953ea39fbecb8e
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Fri Sep 7 19:50:34 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/muon.git;a=commitdiff;h=f6100d8
The following commit has been merged in the master branch:
commit f6100d826c0a7a163982ffc8eb22a09d806669bd
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Fri Aug 24 16:00:54 2012 +0200
Update patches.
---
debian/patches/ftbfs_error_return_type.diff | 14 ----
debian/patches/hide_changelog_tab.diff | 32 ++-------
.../list_properly_unofficial_sw_sources.diff | 4 +-
debian/patches/remove_canonical_support_info.diff | 68 ++++++++++----------
debian/patches/remove_reviews_section.diff | 26 ++++----
debian/patches/series | 2 -
6 files changed, 56 insertions(+), 90 deletions(-)
diff --git a/debian/patches/ftbfs_error_return_type.diff b/debian/patches/ftbfs_error_return_type.diff
deleted file mode 100644
index ceb40e5..0000000
--- a/debian/patches/ftbfs_error_return_type.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/libmuon/PackageModel/PackageWidget.cpp
-+++ b/libmuon/PackageModel/PackageWidget.cpp
-@@ -376,10 +376,10 @@ bool PackageWidget::confirmEssentialRemo
- return true;
- break;
- case KMessageBox::Cancel:
-- default:
- return false;
- break;
- }
-+ return false;
- }
-
- void PackageWidget::saveState()
diff --git a/debian/patches/hide_changelog_tab.diff b/debian/patches/hide_changelog_tab.diff
index 89f9baf..a3e4ee8 100644
--- a/debian/patches/hide_changelog_tab.diff
+++ b/debian/patches/hide_changelog_tab.diff
@@ -6,30 +6,14 @@ Description: Quick patch remove the tab for showing changelog because it doesn't
libmuon/DetailsWidget.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---- a/libmuon/DetailsWidget.cpp
-+++ b/libmuon/DetailsWidget.cpp
-@@ -51,13 +51,13 @@ DetailsWidget::DetailsWidget(QWidget *pa
- m_dependsTab = new DependsTab(this);
- m_filesTab = new InstalledFilesTab;
- m_versionTab = new VersionTab();
-- m_changelogTab = new ChangelogTab(this);
-+ //m_changelogTab = new ChangelogTab(this);
-
-
- addTab(m_mainTab, i18nc("@title:tab", "Details"));
- addTab(m_technicalTab, i18nc("@title:tab", "Technical Details"));
- addTab(m_dependsTab, i18nc("@title:tab", "Dependencies"));
-- addTab(m_changelogTab, i18nc("@title:tab", "Changes List"));
-+ //addTab(m_changelogTab, i18nc("@title:tab", "Changes List"));
+--- a/muon/DetailsWidget.cpp
++++ b/muon/DetailsWidget.cpp
+@@ -50,7 +50,7 @@ DetailsWidget::DetailsWidget(QWidget *pa
+ m_detailsTabs.append(new DependsTab(this));
+ m_detailsTabs.append(new InstalledFilesTab(0));
+ m_detailsTabs.append(new VersionTab(0));
+- m_detailsTabs.append(new ChangelogTab(this));
++ //m_detailsTabs.append(new ChangelogTab(this));
// Hide until a package is clicked
hide();
-@@ -93,7 +93,7 @@ void DetailsWidget::setPackage(QApt::Pac
- m_mainTab->setPackage(package);
- m_technicalTab->setPackage(package);
- m_dependsTab->setPackage(package);
-- m_changelogTab->setPackage(package);
-+ //m_changelogTab->setPackage(package);
-
- if (package->availableVersions().size() > 1) {
- addTab(m_versionTab, i18nc("@title:tab", "Versions"));
diff --git a/debian/patches/list_properly_unofficial_sw_sources.diff b/debian/patches/list_properly_unofficial_sw_sources.diff
index cce4be1..236334b 100644
--- a/debian/patches/list_properly_unofficial_sw_sources.diff
+++ b/debian/patches/list_properly_unofficial_sw_sources.diff
@@ -8,7 +8,7 @@ Description: This patch makes muon-installer list properly unofficial packages'
--- a/installer/ApplicationWindow.cpp
+++ b/installer/ApplicationWindow.cpp
-@@ -255,7 +255,11 @@ void ApplicationWindow::populateViews()
+@@ -274,7 +274,11 @@ void ApplicationWindow::populateViews()
QString originLabel = m_backend->originLabel(originName);
QStandardItem *viewItem = new QStandardItem;
viewItem->setEditable(false);
@@ -21,7 +21,7 @@ Description: This patch makes muon-installer list properly unofficial packages'
viewItem->setData(originName, OriginFilterRole);
viewItem->setData(AppView, ViewTypeRole);
-@@ -320,7 +324,11 @@ void ApplicationWindow::populateViews()
+@@ -342,7 +346,11 @@ void ApplicationWindow::populateViews()
QString originLabel = m_backend->originLabel(originName);
QStandardItem *viewItem = new QStandardItem;
viewItem->setEditable(false);
diff --git a/debian/patches/remove_canonical_support_info.diff b/debian/patches/remove_canonical_support_info.diff
index cc544fd..a454181 100644
--- a/debian/patches/remove_canonical_support_info.diff
+++ b/debian/patches/remove_canonical_support_info.diff
@@ -8,38 +8,9 @@ should be fixed in libqapt.
libmuon/DetailsTabs/MainTab.cpp | 20 +++----
2 files changed, 24 insertions(+), 24 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()
--- a/installer/ApplicationDetailsView/ApplicationDetailsWidget.cpp
+++ b/installer/ApplicationDetailsView/ApplicationDetailsWidget.cpp
-@@ -236,11 +236,11 @@ ApplicationDetailsWidget::ApplicationDet
+@@ -253,11 +253,11 @@ ApplicationDetailsWidget::ApplicationDet
detailsGrid->addWidget(m_license, 2, 1, Qt::AlignLeft);
// detailsGrid, row 3
@@ -56,9 +27,9 @@ should be fixed in libqapt.
detailsGrid->setColumnStretch(1,1);
-@@ -353,15 +353,15 @@ void ApplicationDetailsWidget::setApplic
- m_license->setText(i18nc("@info license", "Unknown"));
- }
+@@ -380,15 +380,15 @@ void ApplicationDetailsWidget::setApplic
+
+ m_license->setText(app->license());
- if (app->package()->isSupported()) {
- m_support->setText(i18nc("@info Tells how long Canonical, Ltd. will support a package",
@@ -80,4 +51,33 @@ should be fixed in libqapt.
+// }
// Fetch reviews
- connect(reviewsBackend, SIGNAL(reviewsReady(Application *, QList<Review *>)),
+ connect(reviewsBackend, SIGNAL(reviewsReady(Application*,QList<Review*>)),
+--- a/muon/DetailsTabs/MainTab.cpp
++++ b/muon/DetailsTabs/MainTab.cpp
+@@ -171,16 +171,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/remove_reviews_section.diff b/debian/patches/remove_reviews_section.diff
index f8a88a2..3b8c2bf 100644
--- a/debian/patches/remove_reviews_section.diff
+++ b/debian/patches/remove_reviews_section.diff
@@ -8,34 +8,32 @@ Description: This patch disables the review system in muon-installer since it
--- a/installer/ApplicationDetailsView/ApplicationDetailsWidget.cpp
+++ b/installer/ApplicationDetailsView/ApplicationDetailsWidget.cpp
-@@ -244,7 +244,7 @@ ApplicationDetailsWidget::ApplicationDet
+@@ -261,7 +261,7 @@ ApplicationDetailsWidget::ApplicationDet
detailsGrid->setColumnStretch(1,1);
- m_reviewsWidget = new ReviewsWidget(widget);
+ //m_reviewsWidget = new ReviewsWidget(widget);
+ connect(m_reviewsWidget, SIGNAL(fetchPage(int)), this, SLOT(fetchReviews(int)));
QWidget *verticalSpacer = new QWidget(this);
- verticalSpacer->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
-@@ -256,7 +256,7 @@ ApplicationDetailsWidget::ApplicationDet
+@@ -288,7 +288,7 @@ ApplicationDetailsWidget::ApplicationDet
layout->addWidget(body);
layout->addWidget(m_addonsWidget);
layout->addWidget(detailsWidget);
- layout->addWidget(m_reviewsWidget);
+ //layout->addWidget(m_reviewsWidget);
layout->addWidget(verticalSpacer);
-
- connect(m_appBackend, SIGNAL(workerEvent(QApt::WorkerEvent, Transaction *)),
-@@ -364,9 +364,9 @@ void ApplicationDetailsWidget::setApplic
+
+ m_listener = new TransactionListener(this);
+@@ -391,8 +391,8 @@ void ApplicationDetailsWidget::setApplic
// }
// Fetch reviews
-- connect(reviewsBackend, SIGNAL(reviewsReady(Application *, QList<Review *>)),
-- this, SLOT(populateReviews(Application *, QList<Review *>)));
-- reviewsBackend->fetchReviews(app);
-+ //connect(reviewsBackend, SIGNAL(reviewsReady(Application *, QList<Review *>)),
-+ // this, SLOT(populateReviews(Application *, QList<Review *>)));
-+ //reviewsBackend->fetchReviews(app);
+- connect(reviewsBackend, SIGNAL(reviewsReady(Application*,QList<Review*>)),
+- this, SLOT(populateReviews(Application*,QList<Review*>)));
++// connect(reviewsBackend, SIGNAL(reviewsReady(Application*,QList<Review*>)),
++// this, SLOT(populateReviews(Application*,QList<Review*>)));
+ fetchReviews(1);
- // Catch already-begun downloads. If the state is something else, we won't
- // care because we won't handle it
+ fetchScreenshot(QApt::Thumbnail);
diff --git a/debian/patches/series b/debian/patches/series
index c2a5b8a..e56492f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@ remove_canonical_support_info.diff
hide_changelog_tab.diff
remove_reviews_section.diff
list_properly_unofficial_sw_sources.diff
-ftbfs_error_return_type.diff
-fix_qjson_linkage.diff
--
muon packaging
More information about the pkg-kde-commits
mailing list