[SCM] muon packaging branch, master, updated. fabbbc4e3a776157a03255fd6b172fb9216a1caf
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Tue Jan 3 17:38:52 UTC 2012
The following commit has been merged in the master branch:
commit 659b77cd91d9d616593e2a0a540a4d3c9e8b5222
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Tue Jan 3 12:28:23 2012 +0100
Update patches.
---
.../list_properly_unofficial_sw_sources.diff | 4 ++--
debian/patches/remove_canonical_support_info.diff | 2 +-
debian/patches/remove_reviews_section.diff | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/patches/list_properly_unofficial_sw_sources.diff b/debian/patches/list_properly_unofficial_sw_sources.diff
index 7280ed9..cce4be1 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
-@@ -253,7 +253,11 @@ void ApplicationWindow::populateViews()
+@@ -255,7 +255,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);
-@@ -318,7 +322,11 @@ void ApplicationWindow::populateViews()
+@@ -320,7 +324,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 f9c0c4d..cc544fd 100644
--- a/debian/patches/remove_canonical_support_info.diff
+++ b/debian/patches/remove_canonical_support_info.diff
@@ -80,4 +80,4 @@ should be fixed in libqapt.
+// }
// Fetch reviews
- reviewsBackend->fetchReviews(app);
+ connect(reviewsBackend, SIGNAL(reviewsReady(Application *, QList<Review *>)),
diff --git a/debian/patches/remove_reviews_section.diff b/debian/patches/remove_reviews_section.diff
index eac44b1..f8a88a2 100644
--- a/debian/patches/remove_reviews_section.diff
+++ b/debian/patches/remove_reviews_section.diff
@@ -30,12 +30,12 @@ Description: This patch disables the review system in muon-installer since it
// }
// Fetch reviews
-- reviewsBackend->fetchReviews(app);
- connect(reviewsBackend, SIGNAL(reviewsReady(Application *, QList<Review *>)),
- this, SLOT(populateReviews(Application *, QList<Review *>)));
-+ //reviewsBackend->fetchReviews(app);
+- reviewsBackend->fetchReviews(app);
+ //connect(reviewsBackend, SIGNAL(reviewsReady(Application *, QList<Review *>)),
+ // this, SLOT(populateReviews(Application *, QList<Review *>)));
++ //reviewsBackend->fetchReviews(app);
// Catch already-begun downloads. If the state is something else, we won't
// care because we won't handle it
--
muon packaging
More information about the pkg-kde-commits
mailing list