[SCM] muon packaging branch, gsoc-floris-2014, updated. 90b82a85823eb1a0e20c8a9fab2ed177f578e032
Floris-Andrei Stoica-Marcu
smfloris-guest at moszumanska.debian.org
Tue Jun 3 09:35:32 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/muon.git;a=commitdiff;h=ffaefd0
The following commit has been merged in the gsoc-floris-2014 branch:
commit ffaefd07f5401fd5308cc3c95a6f71708c1b5f7e
Author: Floris-Andrei Stoica-Marcu <floris.sm at gmail.com>
Date: Mon Jun 2 20:13:32 2014 +0300
Removed old patches
---
debian/patches/disable_tests_building.diff | 22 ------
debian/patches/hide_changelog_tab.diff | 19 -----
.../list_properly_unofficial_sw_sources.diff | 36 ----------
debian/patches/remove_canonical_support_info.diff | 83 ----------------------
debian/patches/remove_reviews_section.diff | 39 ----------
5 files changed, 199 deletions(-)
diff --git a/debian/patches/disable_tests_building.diff b/debian/patches/disable_tests_building.diff
deleted file mode 100644
index ff0703e..0000000
--- a/debian/patches/disable_tests_building.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Description: This patch disables the tests building, avoiding an ftbfs (because
- the rating support is disabled in other patch).
---- a/discover/CMakeLists.txt
-+++ b/discover/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_subdirectory(tests)
-+#add_subdirectory(tests)
- add_subdirectory(icons)
-
- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/libmuon ${CMAKE_CURRENT_BINARY_DIR}/..)
---- a/libmuon/CMakeLists.txt
-+++ b/libmuon/CMakeLists.txt
-@@ -22,7 +22,7 @@ MACRO(QT4_ADD_DBUS_INTERFACE _sources _i
-
- ENDMACRO(QT4_ADD_DBUS_INTERFACE)
-
--add_subdirectory(tests)
-+#add_subdirectory(tests)
-
- set(muon_LIB_SRCS
- Application.cpp
diff --git a/debian/patches/hide_changelog_tab.diff b/debian/patches/hide_changelog_tab.diff
deleted file mode 100644
index a3e4ee8..0000000
--- a/debian/patches/hide_changelog_tab.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: José Manuel Santamaría Lema <panfaust at gamil.com>
-Forwarded: no
-Description: Quick patch remove the tab for showing changelog because it doesn't
- work yet.
----
- libmuon/DetailsWidget.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- 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();
diff --git a/debian/patches/list_properly_unofficial_sw_sources.diff b/debian/patches/list_properly_unofficial_sw_sources.diff
deleted file mode 100644
index 236334b..0000000
--- a/debian/patches/list_properly_unofficial_sw_sources.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Forwarded: no
-Description: This patch makes muon-installer list properly unofficial packages'
- origins. Probably this should be fixed in libqapt instead.
----
- installer/ApplicationWindow.cpp | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
---- a/installer/ApplicationWindow.cpp
-+++ b/installer/ApplicationWindow.cpp
-@@ -274,7 +274,11 @@ void ApplicationWindow::populateViews()
- QString originLabel = m_backend->originLabel(originName);
- QStandardItem *viewItem = new QStandardItem;
- viewItem->setEditable(false);
-- viewItem->setText(originLabel);
-+ if (originLabel.isEmpty()) {
-+ viewItem->setText(originName);
-+ } else {
-+ viewItem->setText(originLabel);
-+ }
- viewItem->setData(originName, OriginFilterRole);
- viewItem->setData(AppView, ViewTypeRole);
-
-@@ -342,7 +346,11 @@ void ApplicationWindow::populateViews()
- QString originLabel = m_backend->originLabel(originName);
- QStandardItem *viewItem = new QStandardItem;
- viewItem->setEditable(false);
-- viewItem->setText(originLabel);
-+ if (originLabel.isEmpty()) {
-+ viewItem->setText(originName);
-+ } else {
-+ viewItem->setText(originLabel);
-+ }
- viewItem->setData(QApt::Package::Installed, StateFilterRole);
- viewItem->setData(originName, OriginFilterRole);
- viewItem->setData(AppView, ViewTypeRole);
diff --git a/debian/patches/remove_canonical_support_info.diff b/debian/patches/remove_canonical_support_info.diff
deleted file mode 100644
index a454181..0000000
--- a/debian/patches/remove_canonical_support_info.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-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.
----
- installer/ApplicationDetailsView/ApplicationDetailsWidget.cpp | 28 +++++-----
- libmuon/DetailsTabs/MainTab.cpp | 20 +++----
- 2 files changed, 24 insertions(+), 24 deletions(-)
-
---- a/installer/ApplicationDetailsView/ApplicationDetailsWidget.cpp
-+++ b/installer/ApplicationDetailsView/ApplicationDetailsWidget.cpp
-@@ -253,11 +253,11 @@ ApplicationDetailsWidget::ApplicationDet
- detailsGrid->addWidget(m_license, 2, 1, Qt::AlignLeft);
-
- // detailsGrid, row 3
-- QLabel *supportLabel = new QLabel(detailsWidget);
-- supportLabel->setText("<b>" % i18nc("@label Label preceding the app support", "Support:") % "</b>");
-- m_support = new QLabel(detailsWidget);
-- detailsGrid->addWidget(supportLabel, 3, 0, Qt::AlignRight);
-- detailsGrid->addWidget(m_support, 3, 1, Qt::AlignLeft);
-+// QLabel *supportLabel = new QLabel(detailsWidget);
-+// supportLabel->setText("<b>" % i18nc("@label Label preceding the app support", "Support:") % "</b>");
-+// m_support = new QLabel(detailsWidget);
-+// detailsGrid->addWidget(supportLabel, 3, 0, Qt::AlignRight);
-+// detailsGrid->addWidget(m_support, 3, 1, Qt::AlignLeft);
-
- detailsGrid->setColumnStretch(1,1);
-
-@@ -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",
-- "Canonical provides critical updates for %1 until %2",
-- app->name(), app->package()->supportedUntil()));
-- } else {
-- m_support->setText(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", app->name()));
-- }
-+// if (app->package()->isSupported()) {
-+// m_support->setText(i18nc("@info Tells how long Canonical, Ltd. will support a package",
-+// "Canonical provides critical updates for %1 until %2",
-+// app->name(), app->package()->supportedUntil()));
-+// } else {
-+// m_support->setText(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", app->name()));
-+// }
-
- // Fetch reviews
- 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
deleted file mode 100644
index 3b8c2bf..0000000
--- a/debian/patches/remove_reviews_section.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Forwarded: no
-Description: This patch disables the review system in muon-installer since it
- depends on the Ubuntu infraestructure at the moment.
----
- installer/ApplicationDetailsView/ApplicationDetailsWidget.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/installer/ApplicationDetailsView/ApplicationDetailsWidget.cpp
-+++ b/installer/ApplicationDetailsView/ApplicationDetailsWidget.cpp
-@@ -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);
-@@ -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);
-
- 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*>)));
-+// connect(reviewsBackend, SIGNAL(reviewsReady(Application*,QList<Review*>)),
-+// this, SLOT(populateReviews(Application*,QList<Review*>)));
- fetchReviews(1);
-
- fetchScreenshot(QApt::Thumbnail);
--
muon packaging
More information about the pkg-kde-commits
mailing list