[SCM] cantor packaging branch, master, updated. debian/16.04.2-1-8-g223ddb9
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Sep 10 16:53:24 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/cantor.git;a=commitdiff;h=c06babe
The following commit has been merged in the master branch:
commit c06babe9d3f7ae89d1e98e289a14bce761085304
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date: Thu Aug 18 19:54:28 2016 +0200
Refresh patches
---
debian/patches/series | 1 -
.../upstream_drop_settingswidget_files.patch | 137 ---------------------
2 files changed, 138 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index f867f34..0364b8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
maxima_multiresults
acceptable_answers
maxima_waiting_the_carriage
-upstream_drop_settingswidget_files.patch
diff --git a/debian/patches/upstream_drop_settingswidget_files.patch b/debian/patches/upstream_drop_settingswidget_files.patch
deleted file mode 100644
index 0b341a6..0000000
--- a/debian/patches/upstream_drop_settingswidget_files.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Tue, 12 Jul 2016 19:54:20 +0200
-Subject: upstream_drop_settingswidget_files
-
-commit 58780b3164ddada384e022509beccb1f54cf5dc0
-Author: Maximiliano Curia <maxy at gnuservers.com.ar>
-Date: Fri Jun 3 16:43:42 2016 +0200
-
- Drop qalculate settingswidget.* files
-
- The files were licensed GPL-3+ in a GPL-2+ project, just to wrap the ui.
- The replacement function is based on the lua backend's settingsWidget
- function.
-
- This solves the bug 359918, and debian bug #792078
----
- src/backends/qalculate/CMakeLists.txt | 1 -
- src/backends/qalculate/qalculatebackend.cpp | 10 ++++++---
- src/backends/qalculate/settingswidget.cpp | 24 ----------------------
- src/backends/qalculate/settingswidget.h | 32 -----------------------------
- 4 files changed, 7 insertions(+), 60 deletions(-)
- delete mode 100644 src/backends/qalculate/settingswidget.cpp
- delete mode 100644 src/backends/qalculate/settingswidget.h
-
-diff --git a/src/backends/qalculate/CMakeLists.txt b/src/backends/qalculate/CMakeLists.txt
-index d564da4..bab0118 100644
---- a/src/backends/qalculate/CMakeLists.txt
-+++ b/src/backends/qalculate/CMakeLists.txt
-@@ -13,7 +13,6 @@ qalculateexpression.cpp
- qalculateextensions.cpp
- qalculatecompletionobject.cpp
- qalculateextensions.cpp
--settingswidget.cpp
- )
-
- kconfig_add_kcfg_files(QalculateBackend_SRCS settings.kcfgc)
-diff --git a/src/backends/qalculate/qalculatebackend.cpp b/src/backends/qalculate/qalculatebackend.cpp
-index 3c589ab..de9923e 100644
---- a/src/backends/qalculate/qalculatebackend.cpp
-+++ b/src/backends/qalculate/qalculatebackend.cpp
-@@ -17,13 +17,13 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
- *************************************************************************************/
-
-+#include "ui_settings.h"
-+
- #include "settings.h"
- #include "qalculatebackend.h"
- #include "qalculatesession.h"
- #include "qalculateextensions.h"
-
--#include "settingswidget.h"
--
- #include "cantor_macros.h"
-
- #include <KLocalizedString>
-@@ -84,7 +84,11 @@ KConfigSkeleton* QalculateBackend::config() const
-
- QWidget* QalculateBackend::settingsWidget(QWidget* parent) const
- {
-- return new QalculateSettingsWidget(parent);
-+ QWidget* widget = new QWidget(parent);
-+ Ui::QalculateSettingsBase s;
-+ s.setupUi(widget);
-+
-+ return widget;
- }
-
- K_PLUGIN_FACTORY_WITH_JSON(qalculatebackend, "qalculatebackend.json", registerPlugin<QalculateBackend>();)
-diff --git a/src/backends/qalculate/settingswidget.cpp b/src/backends/qalculate/settingswidget.cpp
-deleted file mode 100644
-index 625d352..0000000
---- a/src/backends/qalculate/settingswidget.cpp
-+++ /dev/null
-@@ -1,24 +0,0 @@
--/*
-- Copyright (C) 2011 Matteo Agostinelli <agostinelli at gmail.com>
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation, either version 3 of the License, or
-- (at your option) any later version.
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
--*/
--
--#include "settingswidget.h"
--
--QalculateSettingsWidget::QalculateSettingsWidget(QWidget* parent, Qt::WindowFlags f): QWidget(parent, f)
--{
-- setupUi(this);
--}
-diff --git a/src/backends/qalculate/settingswidget.h b/src/backends/qalculate/settingswidget.h
-deleted file mode 100644
-index aa0251d..0000000
---- a/src/backends/qalculate/settingswidget.h
-+++ /dev/null
-@@ -1,32 +0,0 @@
--/*
-- Copyright (C) 2011 Matteo Agostinelli <agostinelli at gmail.com>
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation, either version 3 of the License, or
-- (at your option) any later version.
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
--*/
--
--#ifndef SETTINGSWIDGET_H
--#define SETTINGSWIDGET_H
--
--#include "ui_settings.h"
--
--class QalculateSettingsWidget : public QWidget, public Ui::QalculateSettingsBase
--{
--Q_OBJECT
--
--public:
-- explicit QalculateSettingsWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
--};
--
--#endif
--
cantor packaging
More information about the pkg-kde-commits
mailing list