[SCM] KDE Base Workspace module packaging branch, wheezy, updated. debian/4.8.4-4-6-ge574972
Pino Toscano
pino at alioth.debian.org
Mon Oct 29 10:45:13 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=b691993
The following commit has been merged in the wheezy branch:
commit b691993c28bcfc4aadd3c552ce45eb56ef4b162c
Author: Pino Toscano <pino at debian.org>
Date: Mon Oct 29 11:37:59 2012 +0100
fix powermanagementprofilesrc and kwinrc as cascading config
backport upstream commits d0343319fcfc249a38c79171be727d7133984eeb, 53f6eca921a44a1f5e567b92d45ea84599afea74, and 9994e178b790b03a464c335e624366f82f0da643
---
debian/changelog | 4 ++
debian/patches/series | 3 +
...Fix-the-kwin-KCM-to-read-cascaded-configs.patch | 35 +++++++++++++++++
...ascaded-configs-for-other-modules-as-well.patch | 41 ++++++++++++++++++++
...cadeConfig-flag-as-this-allows-the-KCM-to.patch | 26 ++++++++++++
5 files changed, 109 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 65690e6..59df5f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ kde-workspace (4:4.8.4-5) UNRELEASED; urgency=low
the "demand" status of windows in the taskbar widget; patch
upstream_Check-if-attention-demanding-status-has-changed-when.patch.
(Closes: #685334)
+ * Backport upstream commits d0343319fcfc249a38c79171be727d7133984eeb and
+ 53f6eca921a44a1f5e567b92d45ea84599afea74 to make powermanagementprofilesrc
+ read as cascading config, and 9994e178b790b03a464c335e624366f82f0da643 for
+ kwinrc.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 24 Oct 2012 17:06:28 -0300
diff --git a/debian/patches/series b/debian/patches/series
index ab69e1d..6436640 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,6 @@ hurd.diff
upstream_make-sure-scripts-are-executed-sorted.patch
upstream_centralize-interaction-notification-handling.patch
upstream_Check-if-attention-demanding-status-has-changed-when.patch
+upstream_Use-the-CascadeConfig-flag-as-this-allows-the-KCM-to.patch
+upstream_Use-cascaded-configs-for-other-modules-as-well.patch
+upstream_Fix-the-kwin-KCM-to-read-cascaded-configs.patch
diff --git a/debian/patches/upstream_Fix-the-kwin-KCM-to-read-cascaded-configs.patch b/debian/patches/upstream_Fix-the-kwin-KCM-to-read-cascaded-configs.patch
new file mode 100644
index 0000000..51f6682
--- /dev/null
+++ b/debian/patches/upstream_Fix-the-kwin-KCM-to-read-cascaded-configs.patch
@@ -0,0 +1,35 @@
+From 9994e178b790b03a464c335e624366f82f0da643 Mon Sep 17 00:00:00 2001
+From: Rohan Garg <rohangarg at kubuntu.org>
+Date: Thu, 20 Sep 2012 23:22:17 +0530
+Subject: [PATCH] Fix the kwin KCM to read cascaded configs
+
+REVIEW: 106498
+---
+ kwin/kcmkwin/kwinoptions/main.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp
+index 7cd1ef0..f319c44 100644
+--- a/kwin/kcmkwin/kwinoptions/main.cpp
++++ b/kwin/kcmkwin/kwinoptions/main.cpp
+@@ -69,7 +69,7 @@ public:
+ KWinOptions::KWinOptions(QWidget *parent, const QVariantList &)
+ : KCModule(KWinOptionsFactory::componentData(), parent)
+ {
+- mConfig = new KConfig("kwinrc", KConfig::IncludeGlobals);
++ mConfig = new KConfig("kwinrc");
+
+ QVBoxLayout *layout = new QVBoxLayout(this);
+ layout->setMargin(0);
+@@ -182,7 +182,7 @@ void KWinOptions::moduleChanged(bool state)
+ KActionsOptions::KActionsOptions(QWidget *parent, const QVariantList &)
+ : KCModule(KWinOptionsFactory::componentData(), parent)
+ {
+- mConfig = new KConfig("kwinrc", KConfig::IncludeGlobals);
++ mConfig = new KConfig("kwinrc");
+
+ QVBoxLayout *layout = new QVBoxLayout(this);
+ layout->setMargin(0);
+--
+1.7.10.4
+
diff --git a/debian/patches/upstream_Use-cascaded-configs-for-other-modules-as-well.patch b/debian/patches/upstream_Use-cascaded-configs-for-other-modules-as-well.patch
new file mode 100644
index 0000000..481cc22
--- /dev/null
+++ b/debian/patches/upstream_Use-cascaded-configs-for-other-modules-as-well.patch
@@ -0,0 +1,41 @@
+From 53f6eca921a44a1f5e567b92d45ea84599afea74 Mon Sep 17 00:00:00 2001
+From: Rohan Garg <rohangarg at kubuntu.org>
+Date: Wed, 19 Sep 2012 00:03:59 +0530
+Subject: [PATCH] Use cascaded configs for other modules as well
+
+In addition to commit d0343319fcfc249a38c79171be727d7133984eeb, one also
+needs this commit to get cascaded configs to work
+---
+ powerdevil/kcmodule/activities/activitywidget.cpp | 2 +-
+ powerdevil/kcmodule/profiles/EditPage.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/powerdevil/kcmodule/activities/activitywidget.cpp b/powerdevil/kcmodule/activities/activitywidget.cpp
+index b1b3d7e..8d9517a 100644
+--- a/powerdevil/kcmodule/activities/activitywidget.cpp
++++ b/powerdevil/kcmodule/activities/activitywidget.cpp
+@@ -32,7 +32,7 @@
+ ActivityWidget::ActivityWidget(const QString& activity, QWidget* parent)
+ : QWidget(parent)
+ , m_ui(new Ui::ActivityWidget)
+- , m_profilesConfig(KSharedConfig::openConfig("powermanagementprofilesrc", KConfig::SimpleConfig))
++ , m_profilesConfig(KSharedConfig::openConfig("powermanagementprofilesrc", KConfig::SimpleConfig | KConfig::CascadeConfig))
+ , m_activity(activity)
+ , m_activityConsumer(new KActivities::Consumer(this))
+ , m_actionEditWidget(new ActionEditWidget(QString("Activities/%1/SeparateSettings").arg(activity)))
+diff --git a/powerdevil/kcmodule/profiles/EditPage.cpp b/powerdevil/kcmodule/profiles/EditPage.cpp
+index 69a1a33..95a98d9 100644
+--- a/powerdevil/kcmodule/profiles/EditPage.cpp
++++ b/powerdevil/kcmodule/profiles/EditPage.cpp
+@@ -84,7 +84,7 @@ EditPage::EditPage(QWidget *parent, const QVariantList &args)
+
+ setupUi(this);
+
+- m_profilesConfig = KSharedConfig::openConfig("powermanagementprofilesrc", KConfig::SimpleConfig);
++ m_profilesConfig = KSharedConfig::openConfig("powermanagementprofilesrc", KConfig::SimpleConfig | KConfig::CascadeConfig);
+
+ if (m_profilesConfig->groupList().isEmpty()) {
+ // Use the generator
+--
+1.7.10.4
+
diff --git a/debian/patches/upstream_Use-the-CascadeConfig-flag-as-this-allows-the-KCM-to.patch b/debian/patches/upstream_Use-the-CascadeConfig-flag-as-this-allows-the-KCM-to.patch
new file mode 100644
index 0000000..82bdf28
--- /dev/null
+++ b/debian/patches/upstream_Use-the-CascadeConfig-flag-as-this-allows-the-KCM-to.patch
@@ -0,0 +1,26 @@
+From d0343319fcfc249a38c79171be727d7133984eeb Mon Sep 17 00:00:00 2001
+From: Rohan Garg <rohangarg at kubuntu.org>
+Date: Tue, 18 Sep 2012 21:34:40 +0530
+Subject: [PATCH] Use the CascadeConfig flag as this allows the KCM to read
+ values shipped by distributions and system administrators
+
+---
+ powerdevil/kcmodule/common/actioneditwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/powerdevil/kcmodule/common/actioneditwidget.cpp b/powerdevil/kcmodule/common/actioneditwidget.cpp
+index 90e9106..1e54bee 100644
+--- a/powerdevil/kcmodule/common/actioneditwidget.cpp
++++ b/powerdevil/kcmodule/common/actioneditwidget.cpp
+@@ -37,7 +37,7 @@ ActionEditWidget::ActionEditWidget(const QString &configName, QWidget *parent)
+ : QWidget(parent)
+ , m_configName(configName)
+ {
+- m_profilesConfig = KSharedConfig::openConfig("powermanagementprofilesrc", KConfig::SimpleConfig);
++ m_profilesConfig = KSharedConfig::openConfig("powermanagementprofilesrc", KConfig::SimpleConfig | KConfig::CascadeConfig);
+
+ ActionConfigWidget *actionConfigWidget = new ActionConfigWidget(0);
+ QMap< int, QList<QPair<QString, QWidget*> > > widgets;
+--
+1.7.10.4
+
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list