Hello community, here is the log from the commit of package xfce4-branding-openSUSE for openSUSE:Factory checked in at 2014-06-18 10:59:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2014-05-02 10:53:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new/xfce4-branding-openSUSE.changes 2014-06-18 10:59:11.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jun 3 14:44:12 UTC 2014 - gber@opensuse.org + +- fix critical power action and hdd spindown settings + +------------------------------------------------------------------- +Mon Jun 2 20:23:10 UTC 2014 - gber@opensuse.org + +- adapt xfce4-power-manager branding to version 1.3.0 +- fix typo +- rename source tarball removing the meaningless version + +------------------------------------------------------------------- Old: ---- xfce4-branding-openSUSE-4.10.0.tar.bz2 New: ---- xfce4-branding-openSUSE.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.we5IJV/_old 2014-06-18 10:59:12.000000000 +0200 +++ /var/tmp/diff_new_pack.we5IJV/_new 2014-06-18 10:59:12.000000000 +0200 @@ -39,7 +39,7 @@ License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE Url: http://www.opensuse.org/ -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}.tar.bz2 Source1: openSUSE-xfce-icon-theme.tar.bz2 BuildRequires: %{libexo_libname} BuildRequires: %{libxfce4ui_libname} @@ -208,7 +208,7 @@ License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE Conflicts: otherproviders(xfce4-power-manager-branding) -Provides: xfwm4-branding = %{xfce4_power_manager_version} +Provides: xfce4-power-manager-branding = %{xfce4_power_manager_version} Supplements: packageand(xfce4-power-manager:branding-openSUSE) %description -n xfce4-power-manager-branding-openSUSE @@ -237,7 +237,7 @@ This package provides the openSUSE look and feel for the Midori web browser. %prep -%setup -q -a1 +%setup -q -n %{name} -a1 %build cp %{_sysconfdir}/xdg/midori/search base/etc/xdg/midori/search @@ -280,9 +280,6 @@ %icon_theme_cache_create_ghost openSUSE-Xfce -%clean -rm -rf %{buildroot} - %post -n openSUSE-xfce-icon-theme %icon_theme_cache_post openSUSE-Xfce ++++++ xfce4-branding-openSUSE-4.10.0.tar.bz2 -> xfce4-branding-openSUSE.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new/xfce4-branding-openSUSE/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2013-01-31 21:28:59.000000000 +0100 +++ new/xfce4-branding-openSUSE/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml 2014-06-02 18:18:01.000000000 +0200 @@ -17,6 +17,7 @@ <value type="int" value="4"/> <value type="int" value="5"/> <value type="int" value="6"/> + <value type="int" value="13"/> <value type="int" value="7"/> <value type="int" value="8"/> <value type="int" value="9"/> @@ -40,6 +41,7 @@ <property name="style" type="uint" value="0"/> </property> <property name="plugin-6" type="string" value="mixer"/> + <property name="plugin-13" type="string" value="xfce4-battery-plugin"/> <property name="plugin-7" type="string" value="systray"> <property name="show-frame" type="bool" value="false"/> </property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml new/xfce4-branding-openSUSE/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml 2013-10-29 11:16:26.000000000 +0100 +++ new/xfce4-branding-openSUSE/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml 2014-06-03 16:45:16.000000000 +0200 @@ -2,10 +2,30 @@ <channel name="xfce4-power-manager" version="1.0"> <property name="xfce4-power-manager" type="empty"> - <property name="lock-screen-suspend-hibernate" type="bool" value="true"/> + <property name="brightness-level-on-ac" type="uint" value="80"/> + <property name="brightness-level-on-battery" type="uint" value="30"/> + <property name="brightness-on-ac" type="uint" value="0"/> + <property name="brightness-on-battery" type="uint" value="60"/> <property name="critical-power-action" type="uint" value="2"/> + <property name="critical-power-level" type="uint" value="5"/> + <property name="dpms-enabled" type="bool" value="true"/> + <property name="dpms-on-ac-off" type="uint" value="30"/> + <property name="dpms-on-ac-sleep" type="uint" value="10"/> + <property name="dpms-on-battery-off" type="uint" value="15"/> + <property name="dpms-on-battery-sleep" type="uint" value="5"/> + <property name="general-notification" type="bool" value="true"/> + <property name="hibernate-button-action" type="uint" value="2"/> + <property name="inactivity-on-ac" type="uint" value="0"/> + <property name="inactivity-on-battery" type="uint" value="60"/> + <property name="inactivity-sleep-mode" type="string" value="Suspend"/> + <property name="lid-action-on-ac" type="uint" value="1"/> + <property name="lid-action-on-battery" type="uint" value="1"/> + <property name="lock-screen-suspend-hibernate" type="bool" value="true"/> + <property name="network-manager-sleep" type="bool" value="true"/> <property name="power-button-action" type="uint" value="3"/> <property name="sleep-button-action" type="uint" value="1"/> - <property name="hibernate-button-action" type="uint" value="2"/> + <property name="spin-down-hdd" type="uint" value="1"/> + <property name="spin-down-on-ac-timeout" type="uint" value="0"/> + <property name="spin-down-on-battery-timeout" type="uint" value="120"/> </property> </channel> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org