Mailinglist Archive: opensuse-commit (1400 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kdebase4-workspace for 
openSUSE:Factory checked in at 2011-11-05 08:25:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
 and      /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdebase4-workspace", Maintainer is "kde-maintainers@xxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes    
2011-10-21 16:31:28.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes   
    2011-11-05 08:35:17.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Nov  2 19:04:28 UTC 2011 - wstephenson@xxxxxxxx
+
+- Don't corrupt Plasma's global config from Power Management
+
+-------------------------------------------------------------------
+Fri Oct 21 10:13:56 UTC 2011 - coolo@xxxxxxxx
+
+- kdm: don't even look for grub-set-default, we won't need it
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/python-kdebase4.changes       
2011-10-21 16:31:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/python-kdebase4.changes  
2011-11-05 08:35:17.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Nov  2 19:04:28 UTC 2011 - wstephenson@xxxxxxxx
+
+- Don't corrupt Plasma's global config from Power Management
+
+-------------------------------------------------------------------
+Fri Oct 21 10:13:56 UTC 2011 - coolo@xxxxxxxx
+
+- kdm: don't even look for grub-set-default, we won't need it
+
+-------------------------------------------------------------------
@@ -4 +14 @@
-- Add branch diff
+- Add 4.7 branch diff

New:
----
  kdebase4-workspace-powerdevil-kconfig-cbce41f0.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.VWsOHy/_old  2011-11-05 09:41:16.000000000 +0100
+++ /var/tmp/diff_new_pack.VWsOHy/_new  2011-11-05 09:41:16.000000000 +0100
@@ -104,6 +104,7 @@
 Patch201:       plasma-notifications-kill-timer.diff
 Patch202:       plasma-disable-networkmanager.diff
 Patch211:       disable-python-support.diff
+Patch212:       kdebase4-workspace-powerdevil-kconfig-cbce41f0.diff
 Requires:       kde4-kgreeter-plugins = %version
 Requires:       kdebase4-workspace-liboxygenstyle = %version
 %kde4_runtime_requires
@@ -179,6 +180,7 @@
 %patch201 -p1
 %patch202 -p1
 %patch211
+%patch212 -p1
 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
 
 %build

++++++ kdebase4-workspace-powerdevil-kconfig-cbce41f0.diff ++++++
commit cbce41f094753fe75e9abd9d2ccd1d45d18b7a89
Author: Aaron Seigo <aseigo@xxxxxxx>
Date:   Tue Nov 1 10:22:37 2011 +0100

    cascade, but don't use globals
    
    BUG:285347

diff --git a/powerdevil/daemon/powerdevilcore.cpp 
b/powerdevil/daemon/powerdevilcore.cpp
index 202890e..e037cdd 100644
--- a/powerdevil/daemon/powerdevilcore.cpp
+++ b/powerdevil/daemon/powerdevilcore.cpp
@@ -88,7 +88,7 @@ void Core::onBackendReady()
 {
     kDebug() << "Backend is ready, KDE Power Management system initialized";
 
-    m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", 
KConfig::FullConfig);
+    m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", 
KConfig::CascadeConfig);
 
     // Is it brand new?
     if (m_profilesConfig->groupList().isEmpty()) {
++++++ kdm-cope-with-new-grub.diff ++++++
--- /var/tmp/diff_new_pack.VWsOHy/_old  2011-11-05 09:41:16.000000000 +0100
+++ /var/tmp/diff_new_pack.VWsOHy/_new  2011-11-05 09:41:16.000000000 +0100
@@ -1,16 +1,25 @@
 Index: kdm/backend/bootman.c
 ===================================================================
---- kdm/backend/bootman.c.orig 2010-07-06 08:54:30.000000000 +0200
-+++ kdm/backend/bootman.c      2010-11-21 20:47:03.434812097 +0100
-@@ -133,31 +133,10 @@ setGrub(const char *opt, SdRec *sdr)
+--- kdm/backend/bootman.c.orig 2011-05-20 22:32:06.000000000 +0200
++++ kdm/backend/bootman.c      2011-10-21 12:13:29.790475621 +0200
+@@ -81,8 +81,7 @@ getGrub(char ***opts, int *def, int *cur
+     int len;
+     char line[1000];
+ 
+-    if (!grubSetDefault && !grub &&
+-        !(grubSetDefault = locate("grub-set-default")) &&
++    if (!grub &&
+         !(grub = locate("grub")))
+         return BO_NOMAN;
+ 
+@@ -133,31 +132,10 @@ setGrub(const char *opt, SdRec *sdr)
  static void
  commitGrub(void)
  {
 -    if (sdRec.bmstamp != mTime(GRUB_MENU) &&
 -            setGrub(sdRec.osname, &sdRec) != BO_OK)
 -        return;
-+    char buffer[PATH_MAX];
- 
+-
 -    if (grubSetDefault) {
 -        /* The grub-set-default command must be used, which is
 -         * not so good because there is no way of setting an
@@ -32,6 +41,8 @@
 -            pClose(f, &pid);
 -        }
 -    }
++    char buffer[PATH_MAX];
++
 +    snprintf(buffer, PATH_MAX, "/usr/sbin/grubonce %d", sdRec.osindex);
 +    system(buffer);
  }



-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx