Hello community,
here is the log from the commit of package cinnamon for openSUSE:Factory
checked in at 2012-06-18 17:33:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon (Old)
and /work/SRC/openSUSE:Factory/.cinnamon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2012-06-10
21:50:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes 2012-06-18
17:33:25.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Jun 17 21:23:39 UTC 2012 - w...@rosenauer.org
+
+- revert upstream changes for power management DBus interface
+ to make battery monitoring work in power applet (for 12.1)
+
+-------------------------------------------------------------------
New:
----
cinnamon-power-12_1.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon.spec ++++++
--- /var/tmp/diff_new_pack.1cC3FX/_old 2012-06-18 17:33:29.000000000 +0200
+++ /var/tmp/diff_new_pack.1cC3FX/_new 2012-06-18 17:33:29.000000000 +0200
@@ -32,6 +32,9 @@
# -- PATCH-FIX-OPENSUSE cinnamon-fix-session-file.patch nmarq...@opensuse.org
# easy fix: we have 'gnome-session-check-accelerated' in _libexecdir
Patch0: cinnamon-fix-session-file.patch
+# -- PATCH-FIX-OPENSUSE cinnamon-power-12_1.patch w...@rosenauer.org
+# revert DBus interface changes for 12.1
+Patch1: cinnamon-power-12_1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@@ -122,6 +125,9 @@
%prep
%setup -q -n %{name}-1.4.0-UP1-%{_gittag}
%patch0 -p1
+%if %suse_version < 1220
+%patch1 -p1
+%endif
%build
export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins
++++++ cinnamon-power-12_1.patch ++++++
diff --git a/files/usr/share/cinnamon/applets/po...@cinnamon.org/applet.js
b/files/usr/share/cinnamon/applets/po...@cinnamon.org/applet.js
index c7b7905..31a7e27 100644
--- a/files/usr/share/cinnamon/applets/po...@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/po...@cinnamon.org/applet.js
@@ -40,7 +40,7 @@ const PowerManagerInterface = {
{ name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)'
},
],
signals: [
- { name: 'PropertiesChanged', inSignature: 's,a{sv},a[s]' },
+ { name: 'Changed', inSignature: '' },
],
properties: [
{ name: 'Icon', signature: 's', access: 'read' },
@@ -163,7 +163,7 @@ MyApplet.prototype = {
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this.menu.addSettingsAction(_("Power Settings"),
'gnome-power-panel.desktop');
- this._smProxy.connect('PropertiesChanged', Lang.bind(this,
this._devicesChanged));
+ this._proxy.connect('Changed', Lang.bind(this,
this._devicesChanged));
this._devicesChanged();
}
catch (e) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
