[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#694830: marked as done (unblock (pre-approval): kde-workspace/4:4.8.4-5)

Your message dated Wed, 5 Dec 2012 11:22:34 +0100
with message-id <20121205102234.GM5634@radis.cristau.org>
and subject line Re: Bug#694830: unblock: kde-workspace/4:4.8.4-5
has caused the Debian Bug report #694830,
regarding unblock (pre-approval): kde-workspace/4:4.8.4-5
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
694830: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694830
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi,

we would like to upload kde-workspace 4:4.8.4-5, which so far would
provide a number of updates/fixes:
- a minor changelog fix to the previous version
- fix the X session registration, which was off due to a mismatch
  between an old debian option and the actual configuration key
  (#692730)
- the backport of an upstream fix for the taskbar widget, which would
  not unnecessarly notify windows as "demanding attention" (#685334)
- the backport of an upstream patch to improve a patch backported
  already in 4:4.8.4-3
- the backport of 3 upstream patches to fix the reading of two
  configuration files (kwinrc and powermanagementprofilesrc) as
  cascading configuration (i.e. so values in configs in global paths
  like /u/s/kde4/config and the Debian-specific /e/kde4, for the local
  admin, can be used)
- the backport of an upstream fix for the saving of panel launchers of
  preferred apps (#686131)
- drop hal from kdm.init (#694021)
- kde-workspace-bin:
  - ship a /etc/kde4 directory, so postinst can work (#694253)
  - explicitly depend on qdbus, used by startkde
- encoding fixes for the debconf translations of es (#692209) and pl
  (#691953)

Generally, all the proposed changes should be safe; in case, the upload
could be aged to more days to give it more days.

Attached the current debdiff.

Thanks,
-- 
Pino

diff -Nru kde-workspace-4.8.4/debian/changelog kde-workspace-4.8.4/debian/changelog
--- kde-workspace-4.8.4/debian/changelog	2012-10-21 11:07:18.000000000 -0300
+++ kde-workspace-4.8.4/debian/changelog	2012-11-30 20:04:40.000000000 -0300
@@ -1,6 +1,44 @@
+kde-workspace (4:4.8.4-5) UNRELEASED; urgency=low
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Remove "New upstream release" from the previous changelog entry
+    (Closes: #691302). Thanks Filipus Klutiero.
+  * sessreg was merged in kdm (Closes: #692730):
+    - Drop the use-sessreg option in kdm.options and its man page, as it is
+      no longer needed.
+    - Do not set UseSessReg to false in debian/patches/kdmrc_defaults.diff.
+      The bug it solved has dissapeared during the merge.
+    Thanks Wolfgang Schweer and Petter Reinholdtsen for digging into this.
+
+  [ Pino Toscano ]
+  * Backport upstream commit 89161c40e064958aa192b2202670316671d7e377 to fix
+    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.
+  * Backport upstream commit 5b35757fc3613a18e2d784af53d1d23ebe295028 to
+    improve the sorting of init .js files (followup of the changes backported
+    in 4:4.8.4-3 with upstream_make-sure-scripts-are-executed-sorted.patch);
+    patch upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch.
+  * Backport upstream commit 70cd86a5eef103137e64f2e3868a5bd2d58d71d7 to fix
+    the deletion of launchers of preferred applications; patch
+    upstream_Fix-deletion-of-preferred-application-launchers.patch.
+    (Closes: #686131)
+  * Drop hal from kdm.init. (Closes: #694021)
+  * Make kde-workspace-bin ship a /etc/kde4 directory. (Closes: #694253)
+  * Make kde-workspace-bin explicitly depend on qdbus, used by startkde.
+
+  [ Debconf translation updates ]
+  * Fix encoding of Polish (thanks to David Prévot). (Closes: #691953)
+  * Fix encoding of Spanish (thanks to Camaleón). (Closes: #692209)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 24 Oct 2012 17:06:28 -0300
+
 kde-workspace (4:4.8.4-4) unstable; urgency=low
 
-  * New upstream release.
   * The package (re)building switches to XZ compression. (Closes: #688761)
 
   [ Pino Toscano ]
diff -Nru kde-workspace-4.8.4/debian/control kde-workspace-4.8.4/debian/control
--- kde-workspace-4.8.4/debian/control	2012-10-21 11:06:24.000000000 -0300
+++ kde-workspace-4.8.4/debian/control	2012-11-30 20:04:40.000000000 -0300
@@ -109,7 +109,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, iso-codes,
  plasma-desktop (= ${binary:Version}) | plasma-netbook (= ${binary:Version}),
  kde-workspace-data (= ${source:Version}), x11-utils, x11-xserver-utils,
- kde-workspace-kgreet-plugins (= ${binary:Version})
+ kde-workspace-kgreet-plugins (= ${binary:Version}), qdbus
 Recommends: plasma-scriptengines, polkit-kde-1 (>= 0.99) | policykit-1-gnome,
  upower [linux-any]
 Suggests: x11-xkb-utils
diff -Nru kde-workspace-4.8.4/debian/kde-workspace-bin.dirs kde-workspace-4.8.4/debian/kde-workspace-bin.dirs
--- kde-workspace-4.8.4/debian/kde-workspace-bin.dirs	1969-12-31 21:00:00.000000000 -0300
+++ kde-workspace-4.8.4/debian/kde-workspace-bin.dirs	2012-11-30 20:04:40.000000000 -0300
@@ -0,0 +1 @@
+etc/kde4
diff -Nru kde-workspace-4.8.4/debian/kdm.init kde-workspace-4.8.4/debian/kdm.init
--- kde-workspace-4.8.4/debian/kdm.init	2012-06-28 22:50:35.000000000 -0300
+++ kde-workspace-4.8.4/debian/kdm.init	2012-11-30 20:04:40.000000000 -0300
@@ -3,7 +3,7 @@
 # Provides:          kdm
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
-# Should-Start:      console-screen kbd acpid dbus hal krb5-kdc
+# Should-Start:      console-screen kbd acpid dbus krb5-kdc
 # Should-Stop:       console-screen kbd
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
diff -Nru kde-workspace-4.8.4/debian/local/kdm.options kde-workspace-4.8.4/debian/local/kdm.options
--- kde-workspace-4.8.4/debian/local/kdm.options	2012-06-28 22:50:35.000000000 -0300
+++ kde-workspace-4.8.4/debian/local/kdm.options	2012-11-30 20:04:40.000000000 -0300
@@ -5,4 +5,3 @@
 
 no-ignore-nologin
 no-restart-on-upgrade
-use-sessreg
diff -Nru kde-workspace-4.8.4/debian/local/kdm.options.5 kde-workspace-4.8.4/debian/local/kdm.options.5
--- kde-workspace-4.8.4/debian/local/kdm.options.5	2012-06-28 22:50:35.000000000 -0300
+++ kde-workspace-4.8.4/debian/local/kdm.options.5	2012-11-30 20:04:40.000000000 -0300
@@ -63,12 +63,6 @@
 not be stopped or started during an install or upgrade; the administrator
 will have to do so by hand (with \(oq/etc/init.d/kdm restart\(cq, or by
 rebooting the system) before the newly installed kdm binary is used.
-.TP
-.B use\-sessreg
-If this option is enabled (the Debian default), the sessreg program will be
-invoked to register X sessions managed by kdm in the utmp and wtmp files.
-Otherwise, it is not, and the utmp and wtmp files will have no record of
-kdm sessions.
 .PP
 Users of older versions of the Debian system should note that the
 \(oqrun\-xconsole\(cq option has been removed.  Shell scripts named
@@ -82,6 +76,5 @@
 .SH AUTHOR
 This manpage was written by Branden Robinson for the Debian Project.
 .SH SEE ALSO
-.BR sessreg (1x),
 .BR xmessage (1x),
 .BR kdm (1x)
diff -Nru kde-workspace-4.8.4/debian/patches/kdmrc_defaults.diff kde-workspace-4.8.4/debian/patches/kdmrc_defaults.diff
--- kde-workspace-4.8.4/debian/patches/kdmrc_defaults.diff	2012-06-28 22:50:35.000000000 -0300
+++ kde-workspace-4.8.4/debian/patches/kdmrc_defaults.diff	2012-11-30 20:04:40.000000000 -0300
@@ -45,15 +45,6 @@
  Update: upd_sessionsdirs
  Comment:
   The directories containing session type definitions in .desktop format,
-@@ -2006,7 +2006,7 @@ Description:
- 
- Key: UseSessReg
- Type: bool
--Default: true
-+Default: false
- User: core
- Instance: #*/!
- Comment:
 @@ -2097,9 +2097,9 @@ Description:
  
  Key: GreetString
diff -Nru kde-workspace-4.8.4/debian/patches/series kde-workspace-4.8.4/debian/patches/series
--- kde-workspace-4.8.4/debian/patches/series	2012-10-21 11:03:52.000000000 -0300
+++ kde-workspace-4.8.4/debian/patches/series	2012-11-30 20:04:40.000000000 -0300
@@ -23,3 +23,9 @@
 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
+upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch
+upstream_Fix-deletion-of-preferred-application-launchers.patch
diff -Nru kde-workspace-4.8.4/debian/patches/upstream_Check-if-attention-demanding-status-has-changed-when.patch kde-workspace-4.8.4/debian/patches/upstream_Check-if-attention-demanding-status-has-changed-when.patch
--- kde-workspace-4.8.4/debian/patches/upstream_Check-if-attention-demanding-status-has-changed-when.patch	1969-12-31 21:00:00.000000000 -0300
+++ kde-workspace-4.8.4/debian/patches/upstream_Check-if-attention-demanding-status-has-changed-when.patch	2012-11-30 20:04:40.000000000 -0300
@@ -0,0 +1,36 @@
+From 89161c40e064958aa192b2202670316671d7e377 Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
+Date: Tue, 7 Aug 2012 13:23:28 +0200
+Subject: [PATCH] Check if attention demanding status has changed when we
+ activate a window.
+
+BUG: 303208
+---
+ libs/taskmanager/task.cpp |   11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/libs/taskmanager/task.cpp b/libs/taskmanager/task.cpp
+index be5f772..1cb72bd 100644
+--- a/libs/taskmanager/task.cpp
++++ b/libs/taskmanager/task.cpp
+@@ -168,7 +168,16 @@ void Task::refreshIcon()
+ void Task::setActive(bool a)
+ {
+     d->active = a;
+-    emit changed(StateChanged);
++
++    TaskChanges changes = StateChanged;
++
++    if (demandsAttention() != d->demandedAttention) {
++        d->demandedAttention = !d->demandedAttention;
++        changes |= AttentionChanged;
++    }
++
++    emit changed(changes);
++
+     if (a) {
+         emit activated();
+     } else {
+-- 
+1.7.10.4
+
diff -Nru kde-workspace-4.8.4/debian/patches/upstream_Fix-deletion-of-preferred-application-launchers.patch kde-workspace-4.8.4/debian/patches/upstream_Fix-deletion-of-preferred-application-launchers.patch
--- kde-workspace-4.8.4/debian/patches/upstream_Fix-deletion-of-preferred-application-launchers.patch	1969-12-31 21:00:00.000000000 -0300
+++ kde-workspace-4.8.4/debian/patches/upstream_Fix-deletion-of-preferred-application-launchers.patch	2012-11-30 20:04:40.000000000 -0300
@@ -0,0 +1,50 @@
+From 70cd86a5eef103137e64f2e3868a5bd2d58d71d7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gregor=20T=C3=A4tzner?= <gregor@freenet.de>
+Date: Thu, 26 Jul 2012 14:32:38 +0200
+Subject: [PATCH] Fix deletion of preferred application launchers
+
+In default panel config the host of that magic preferred app url is used
+as the key. So lets use that key to delete the launchers, too.
+
+BUG: 278724
+FIXED-IN: 4.9.1
+REVIEW: 105374
+---
+ libs/taskmanager/groupmanager.cpp |   14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/libs/taskmanager/groupmanager.cpp b/libs/taskmanager/groupmanager.cpp
+index 5ca0159..45c15a9 100644
+--- a/libs/taskmanager/groupmanager.cpp
++++ b/libs/taskmanager/groupmanager.cpp
+@@ -1070,8 +1070,16 @@ void GroupManagerPrivate::unsaveLauncher(LauncherItem *launcher)
+         return;
+     }
+ 
+-    if (cg.hasKey(launcher->name())) {
+-        cg.deleteEntry(launcher->name());
++    QString launcherKey;
++
++    if (launcher->launcherUrl().protocol() == "preferred")
++        // in default config the host of the preferred application url is used as key
++        launcherKey = launcher->launcherUrl().host();
++    else
++        launcherKey = launcher->name();
++
++    if (cg.hasKey(launcherKey)) {
++        cg.deleteEntry(launcherKey);
+         emit q->configChanged();
+     }
+ }
+@@ -1127,7 +1135,7 @@ int GroupManagerPrivate::launcherIndex(const KUrl &url)
+     foreach (const LauncherItem * item, launchers) {
+         if (item->launcherUrl() == url) {
+             return index;
+-        } 
++        }
+ 
+         ++index;
+     }
+-- 
+1.7.10.4
+
diff -Nru kde-workspace-4.8.4/debian/patches/upstream_Fix-the-kwin-KCM-to-read-cascaded-configs.patch kde-workspace-4.8.4/debian/patches/upstream_Fix-the-kwin-KCM-to-read-cascaded-configs.patch
--- kde-workspace-4.8.4/debian/patches/upstream_Fix-the-kwin-KCM-to-read-cascaded-configs.patch	1969-12-31 21:00:00.000000000 -0300
+++ kde-workspace-4.8.4/debian/patches/upstream_Fix-the-kwin-KCM-to-read-cascaded-configs.patch	2012-11-30 20:04:40.000000000 -0300
@@ -0,0 +1,35 @@
+From 9994e178b790b03a464c335e624366f82f0da643 Mon Sep 17 00:00:00 2001
+From: Rohan Garg <rohangarg@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 -Nru kde-workspace-4.8.4/debian/patches/upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch kde-workspace-4.8.4/debian/patches/upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch
--- kde-workspace-4.8.4/debian/patches/upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch	1969-12-31 21:00:00.000000000 -0300
+++ kde-workspace-4.8.4/debian/patches/upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch	2012-11-30 20:04:40.000000000 -0300
@@ -0,0 +1,51 @@
+From 5b35757fc3613a18e2d784af53d1d23ebe295028 Mon Sep 17 00:00:00 2001
+From: Rohan Garg <rohangarg@kubuntu.org>
+Date: Fri, 31 Aug 2012 15:21:11 +0530
+Subject: [PATCH] Make sure the plasma desktop scripts are sorted in the
+ correct order
+
+Instead of sorting the scripts according to their absolute paths,
+which would cause scripts installed by packages to always end at
+the top, scripts should be sorted by their relative path i.e.
+plasma scripts from each directory that occurs in the path
+should be sorted and then merged together to form a super list
+
+REVIEWED BY: Marco Martin
+---
+ libs/plasmagenericshell/scripting/scriptengine.cpp |   20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/libs/plasmagenericshell/scripting/scriptengine.cpp b/libs/plasmagenericshell/scripting/scriptengine.cpp
+index 777a56d..7810ab4 100644
+--- a/libs/plasmagenericshell/scripting/scriptengine.cpp
++++ b/libs/plasmagenericshell/scripting/scriptengine.cpp
+@@ -676,8 +676,24 @@ QStringList ScriptEngine::pendingUpdateScripts()
+ QStringList ScriptEngine::defaultLayoutScripts()
+ {
+     const QString appName = KGlobal::activeComponent().aboutData()->appName();
+-    QStringList scripts = KGlobal::dirs()->findAllResources("data", appName + "/init/*.js");
+-    scripts.sort();
++    QStringList appNameDirs = KGlobal::dirs()->findDirs("data", appName);
++    QStringList scripts;
++    QDir appDir;
++    QFileInfoList scriptList;
++
++    foreach (const QString &appNameDir, appNameDirs) {
++        appDir.setPath(appNameDir + QLatin1String("init/"));
++        if (appDir.exists()) {
++            scriptList = appDir.entryInfoList(QStringList("*.js"),
++                                            QDir::NoFilter,
++                                            QDir::Name);
++            foreach (const QFileInfo &script, scriptList) {
++                if (script.exists()) {
++                    scripts.append(script.absoluteFilePath());
++                }
++            }
++        }
++    }
+ 
+     QStringList scriptPaths;
+ 
+-- 
+1.7.10.4
+
diff -Nru kde-workspace-4.8.4/debian/patches/upstream_Use-cascaded-configs-for-other-modules-as-well.patch kde-workspace-4.8.4/debian/patches/upstream_Use-cascaded-configs-for-other-modules-as-well.patch
--- kde-workspace-4.8.4/debian/patches/upstream_Use-cascaded-configs-for-other-modules-as-well.patch	1969-12-31 21:00:00.000000000 -0300
+++ kde-workspace-4.8.4/debian/patches/upstream_Use-cascaded-configs-for-other-modules-as-well.patch	2012-11-30 20:04:40.000000000 -0300
@@ -0,0 +1,41 @@
+From 53f6eca921a44a1f5e567b92d45ea84599afea74 Mon Sep 17 00:00:00 2001
+From: Rohan Garg <rohangarg@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 -Nru kde-workspace-4.8.4/debian/patches/upstream_Use-the-CascadeConfig-flag-as-this-allows-the-KCM-to.patch kde-workspace-4.8.4/debian/patches/upstream_Use-the-CascadeConfig-flag-as-this-allows-the-KCM-to.patch
--- kde-workspace-4.8.4/debian/patches/upstream_Use-the-CascadeConfig-flag-as-this-allows-the-KCM-to.patch	1969-12-31 21:00:00.000000000 -0300
+++ kde-workspace-4.8.4/debian/patches/upstream_Use-the-CascadeConfig-flag-as-this-allows-the-KCM-to.patch	2012-11-30 20:04:40.000000000 -0300
@@ -0,0 +1,26 @@
+From d0343319fcfc249a38c79171be727d7133984eeb Mon Sep 17 00:00:00 2001
+From: Rohan Garg <rohangarg@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
+
diff -Nru kde-workspace-4.8.4/debian/po/es.po kde-workspace-4.8.4/debian/po/es.po
--- kde-workspace-4.8.4/debian/po/es.po	2012-06-28 22:50:35.000000000 -0300
+++ kde-workspace-4.8.4/debian/po/es.po	2012-11-30 20:04:40.000000000 -0300
@@ -52,7 +52,7 @@
 "for the X Window System."
 msgstr ""
 "Un gestor de sesiones es un programa que le permite ingresar"
-"gr�ficamente en el sistema desde el entorno X Window."
+"gráficamente en el sistema desde el entorno X Window."
 
 #. Type: select
 #. Description
@@ -61,7 +61,7 @@
 "Only one display manager can manage a given X server, but multiple display "
 "manager packages are installed. Please select which display manager should "
 "run by default."
-msgstr "Cada servidor X s�lo puede ser gestionado por un �nico gestor de sesiones, pero hay instalados varios paquetes de gestores de sesiones. Por favor, seleccione qu� gestor desea utilizar por omisi�n."
+msgstr "Cada servidor X sólo puede ser gestionado por un único gestor de sesiones, pero hay instalados varios paquetes de gestores de sesiones. Por favor, seleccione qué gestor desea utilizar por omisión."
 
 #. Type: select
 #. Description
@@ -72,14 +72,14 @@
 "accordingly, edit each of their init scripts in /etc/init.d, and disable the "
 "check for a default display manager."
 msgstr ""
-"Se pueden ejecutar varios gestores de sesiones simult�neamente si se "
-"configuran para que gestionen servidores diferentes. Para ello, configure cada uno de los gestores de sesiones apropiadamente, edite sus guiones de inicio en /etc/init.d, y deshabilite la comprobaci�n de un gestor de sesiones predeterminado."
+"Se pueden ejecutar varios gestores de sesiones simultáneamente si se "
+"configuran para que gestionen servidores diferentes. Para ello, configure cada uno de los gestores de sesiones apropiadamente, edite sus guiones de inicio en /etc/init.d, y deshabilite la comprobación de un gestor de sesiones predeterminado."
 
 #. Type: boolean
 #. Description
 #: ../kdm.templates:3001
 msgid "Stop the kdm daemon?"
-msgstr "�Desea detener el daemon kdm?"
+msgstr "¿Desea detener el daemon kdm?"
 
 #. Type: boolean
 #. Description
@@ -87,7 +87,7 @@
 msgid ""
 "The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
-msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (kdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa."
+msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (kdm) al actualizar o borrar el paquete, pero parece que está gestionando al menos una sesión X activa."
 
 #. Type: boolean
 #. Description
@@ -96,5 +96,5 @@
 "If kdm is stopped now, any X sessions it manages will be terminated. "
 "Otherwise, the new version will take effect the next time the daemon is "
 "restarted."
-msgstr "Si detiene kdm ahora, se finalizar�n todas las sesiones X que est� gestionando. La otra posibilidad es mantener kdm en ejecuci�n, con lo que la nueva versi�n no se activar� hasta la pr�xima vez que se reinicie el daemon."
+msgstr "Si detiene kdm ahora, se finalizarán todas las sesiones X que está gestionando. La otra posibilidad es mantener kdm en ejecución, con lo que la nueva versión no se activará hasta la próxima vez que se reinicie el daemon."
 
diff -Nru kde-workspace-4.8.4/debian/po/pl.po kde-workspace-4.8.4/debian/po/pl.po
--- kde-workspace-4.8.4/debian/po/pl.po	2012-06-28 22:50:35.000000000 -0300
+++ kde-workspace-4.8.4/debian/po/pl.po	2012-11-30 20:04:40.000000000 -0300
@@ -20,14 +20,14 @@
 "Last-Translator: Marcin Owsiany <porridge@debian.org>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: select
 #. Description
 #: ../kdm.templates:1001
 msgid "Default display manager:"
-msgstr "Domy¶lny display manager:"
+msgstr "Domyślny display manager:"
 
 #. Type: select
 #. Description
@@ -36,7 +36,7 @@
 "A display manager is a program that provides graphical login capabilities "
 "for the X Window System."
 msgstr ""
-"Display manager to program, który umo¿liwia graficzne logowanie siê do "
+"Display manager to program, który umożliwia graficzne logowanie się do "
 "systemu X Window."
 
 #. Type: select
@@ -47,9 +47,9 @@
 "manager packages are installed. Please select which display manager should "
 "run by default."
 msgstr ""
-"Tylko jeden display manager mo¿e kontrolowaæ dany X serwer, ale "
+"Tylko jeden display manager może kontrolować dany X serwer, ale "
 "zainstalowanych jest obecnie kilka takich programów. Wybierz, który z nich "
-"ma byæ uruchamiany domy¶lnie."
+"ma być uruchamiany domyślnie."
 
 #. Type: select
 #. Description
@@ -60,16 +60,16 @@
 "accordingly, edit each of their init scripts in /etc/init.d, and disable the "
 "check for a default display manager."
 msgstr ""
-"Mo¿na uruchomiæ jednocze¶nie kilka programów \"display manager\", ale "
-"musz± one kontrolowaæ ró¿ne serwery; mo¿na to osi±gn±æ konfiguruj±c "
-"odpowiednio ka¿dy z nich i wy³±czaj±c w ich skryptach startowych w /etc/"
-"init.d fragment sprawdzaj±cy domy¶lny display manager."
+"Można uruchomić jednocześnie kilka programów \"display manager\", ale muszą "
+"one kontrolować różne serwery; można to osiągnąć konfigurując odpowiednio "
+"każdy z nich i wyłączając w ich skryptach startowych w /etc/init.d fragment "
+"sprawdzający domyślny display manager."
 
 #. Type: boolean
 #. Description
 #: ../kdm.templates:3001
 msgid "Stop the kdm daemon?"
-msgstr "Zatrzymaæ daemona kdm?"
+msgstr "Zatrzymać daemona kdm?"
 
 #. Type: boolean
 #. Description
@@ -79,8 +79,8 @@
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 "Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i "
-"usuwania pakietu kdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on "
-"conajmniej jedn± sesj± X Window."
+"usuwania pakietu kdm, ale wygląda na to, że w tej chwili zarządza on "
+"conajmniej jedną sesją X Window."
 
 #. Type: boolean
 #. Description
@@ -90,6 +90,6 @@
 "Otherwise, the new version will take effect the next time the daemon is "
 "restarted."
 msgstr ""
-"Je¶li kdm zostanie teraz zatrzymany, wszystkie zarz±dzane przez niego "
-"sesje zostan± przerwane. W przeciwnym wypadku nowa wersja zacznie dzia³aæ "
-"przy jego najbli¿szym restarcie."
+"Jeśli kdm zostanie teraz zatrzymany, wszystkie zarządzane przez niego sesje "
+"zostaną przerwane. W przeciwnym wypadku nowa wersja zacznie działać przy "
+"jego najbliższym restarcie."

--- End Message ---
--- Begin Message --- 
On Tue, Dec  4, 2012 at 11:01:04 +0100, Pino Toscano wrote:

> With the above change, uploaded and built basically everywhere.
> 
Unblocked.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: