[meego-commits] 6501: Changes to Trunk/contextkit-maemo
Anas Nashif
nashif at linux.intel.com
Thu Aug 12 22:36:25 UTC 2010
Hi,
I have made the following changes to contextkit-maemo in project Trunk. Please review and accept ASAP.
Thank You,
Anas Nashif
[This message was auto-generated]
---
Request #6501:
submit: Trunk:Testing/contextkit-maemo(r8) -> Trunk/contextkit-maemo
Message:
Move to Trunk
State: new 2010-08-12T10:27:42 nashif
Comment: None
changes files:
--------------
--- contextkit-maemo.changes
+++ contextkit-maemo.changes
@@ -0,0 +1,4 @@
+* Mon Jul 26 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> - 0.7.14
+- Update to release tag 0.7.14
+- Add x11 to spec file
+
old:
----
contextkit-maemo-0.7.12.tar.bz2
new:
----
contextkit-maemo-0.7.14.tar.bz2
spec files:
-----------
--- contextkit-maemo.spec
+++ contextkit-maemo.spec
@@ -1,13 +1,13 @@
#
# Do not Edit! Generated by:
-# spectacle version 0.17
+# spectacle version 0.18
#
# >> macros
# << macros
Name: contextkit-maemo
Summary: ContextKit Maemo specific providers
-Version: 0.7.12
+Version: 0.7.14
Release: 1
Group: Applications/System
License: GPLv2
@@ -24,6 +24,7 @@
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(contextprovider-1.0)
BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(x11)
BuildRequires: python
BuildRequires: tinycdb-devel
BuildRequires: libxslt
other changes:
--------------
++++++ contextkit-maemo-0.7.12.tar.bz2 -> contextkit-maemo-0.7.14.tar.bz2
--- configure.ac
+++ configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.61])
-AC_INIT([ContextKit-Maemo], [0.7.12~unreleased], [marius.vollmer at nokia.com], ContextKit-Maemo)
+AC_INIT([ContextKit-Maemo], [0.7.14], [marius.vollmer at nokia.com], ContextKit-Maemo)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 tar-ustar 1.9])
--- debian/changelog
+++ debian/changelog
@@ -1,3 +1,18 @@
+contextkit-maemo (0.7.14) unstable; urgency=low
+
+ * Fixes: NB#177486 stop animating status area battery indication
+ once battery is full
+
+ -- Jean-Luc Lamadon <jean-luc.lamadon at nokia.com> Mon, 12 Jul 2010 08:06:14 +0300
+
+contextkit-maemo (0.7.13) unstable; urgency=low
+
+ * Fixes: NB#177228 context-bluetooth-tests and context-profile-tests
+ fail during ART executions
+ * Uses strictly python2.5
+
+ -- Jean-Luc Lamadon <jean-luc.lamadon at nokia.com> Wed, 30 Jun 2010 00:51:38 +0300
+
contextkit-maemo (0.7.12) unstable; urgency=low
* Added a MCE plugin (providing Screen.Blanked and Device.PowerSaveMode).
--- debian/control
+++ debian/control
@@ -42,7 +42,7 @@
Section: devel
Architecture: any
Depends: python-contextkit, contextkit-utils, contextd
-Recommends: python2.5, python (>= 2.5)
+Recommends: python2.5
XB-Python-Version: ${python:Versions}
Description: contextd automated customer tests
.
@@ -73,7 +73,7 @@
Section: devel
Architecture: any
Depends: ${shlibs:Depends}, contextkit-utils, python-contextkit, context-bluetooth, ci-testing
-Recommends: python2.5, python (>= 2.5)
+Recommends: python2.5
XB-Maemo-CI-Packages: context-bluetooth
XB-Maemo-CI-Stage: acceptance, validation
XB-Python-Version: ${python:Versions}
@@ -106,7 +106,7 @@
Section: devel
Architecture: any
Depends: ${shlibs:Depends}, contextkit-utils, python-contextkit, context-session, ci-testing
-Recommends: python2.5, python (>= 2.5)
+Recommends: python2.5
XB-Maemo-CI-Packages: context-session
XB-Maemo-CI-Stage: acceptance, validation
XB-Python-Version: ${python:Versions}
@@ -137,7 +137,7 @@
Section: devel
Architecture: any
Depends: ${shlibs:Depends}, contextkit-utils, python-contextkit, context-profile, ci-testing, python2.5-dbus
-Recommends: python2.5, python (>= 2.5)
+Recommends: python2.5
XB-Maemo-CI-Packages: context-profile
XB-Maemo-CI-Stage: acceptance, validation
XB-Python-Version: ${python:Versions}
--- libcontextsubscriber-plugins/battery/batteryplugin.cpp
+++ libcontextsubscriber-plugins/battery/batteryplugin.cpp
@@ -40,6 +40,7 @@
#define ON_BATTERY "Battery.OnBattery"
#define LOW_BATTERY "Battery.LowBattery"
#define CHARGE_PERCENT "Battery.ChargePercentage"
+#define CHARGE_BARS "Battery.ChargeBars"
#define TIME_UNTIL_LOW "Battery.TimeUntilLow"
#define TIME_UNTIL_FULL "Battery.TimeUntilFull"
#define IS_CHARGING "Battery.IsCharging"
@@ -131,14 +132,21 @@
return false;
}
- propertyCache[IS_CHARGING] = (st[CHARGING_STATE] == CHARGING_STATE_STARTED);
+ propertyCache[IS_CHARGING] = (st[CHARGING_STATE] == CHARGING_STATE_STARTED &&
+ st[BATTERY_STATE] != BATTERY_STATE_FULL);
+
propertyCache[ON_BATTERY] = (st[CHARGER_STATE] != CHARGER_STATE_CONNECTED);
propertyCache[LOW_BATTERY] = (st[BATTERY_STATE] == BATTERY_STATE_LOW);
- if (st[BATTERY_CAPA_MAX] != 0)
- propertyCache[CHARGE_PERCENT] = st[BATTERY_CAPA_NOW] * 100 / st[BATTERY_CAPA_MAX];
+ propertyCache[CHARGE_PERCENT] = st[BATTERY_LEVEL_PCT];
+
+ if (st[BATTERY_LEVEL_MAX] != 0) {
+ QList<QVariant> list;
+ list << QVariant(st[BATTERY_LEVEL_NOW]) << QVariant(st[BATTERY_LEVEL_MAX]);
+ propertyCache[CHARGE_BARS] = list;
+ }
else
- propertyCache[CHARGE_PERCENT] = QVariant();
+ propertyCache[CHARGE_BARS] = QVariant();
propertyCache[TIME_UNTIL_FULL] = (quint64)st[CHARGING_TIME] * NANOSECS_PER_MIN;
propertyCache[TIME_UNTIL_LOW] = (quint64)st[BATTERY_TIME_LEFT] * NANOSECS_PER_MIN;
--- libcontextsubscriber-plugins/customer-tests/bluez/test-bluez-plugin.py
+++ libcontextsubscriber-plugins/customer-tests/bluez/test-bluez-plugin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## This file is part of ContextKit.
##
--- libcontextsubscriber-plugins/customer-tests/bluez/tests.xml
+++ libcontextsubscriber-plugins/customer-tests/bluez/tests.xml
@@ -6,7 +6,7 @@
<step expected_result="0">/usr/share/context-bluetooth-tests/waitforsilence</step>
</pre_steps>
<case name="enabled-and-visible" description="This test verifies that the libcontextsubscriber Bluez plugin provides Bluetooth.Visible and Enabled" requirement="" timeout="60" insignificant="true">
- <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/context-bluetooth-tests;python /usr/share/context-bluetooth-tests/test-bluez-plugin.py</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/context-bluetooth-tests;python2.5 /usr/share/context-bluetooth-tests/test-bluez-plugin.py</step>
</case>
<environments>
<scratchbox>false</scratchbox>
--- libcontextsubscriber-plugins/customer-tests/profile/test-profile-plugin.py
+++ libcontextsubscriber-plugins/customer-tests/profile/test-profile-plugin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## This file is part of ContextKit.
##
--- libcontextsubscriber-plugins/customer-tests/profile/tests.xml
+++ libcontextsubscriber-plugins/customer-tests/profile/tests.xml
@@ -6,7 +6,7 @@
<step expected_result="0">/usr/share/context-profile-tests/waitforsilence</step>
</pre_steps>
<case name="name" description="This test verifies that the libcontextsubscriber profile plugin provides Profile.Name" requirement="" timeout="60">
- <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/context-profile-tests;python /usr/share/context-profile-tests/test-profile-plugin.py</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/context-profile-tests;python2.5 /usr/share/context-profile-tests/test-profile-plugin.py</step>
</case>
<environments>
<scratchbox>false</scratchbox>
--- libcontextsubscriber-plugins/customer-tests/session/test-blanking.py
+++ libcontextsubscriber-plugins/customer-tests/session/test-blanking.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## This file is part of ContextKit.
##
--- libcontextsubscriber-plugins/customer-tests/session/test-fullscreen.py
+++ libcontextsubscriber-plugins/customer-tests/session/test-fullscreen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
##
## This file is part of ContextKit.
##
--- libcontextsubscriber-plugins/customer-tests/session/tests.xml
+++ libcontextsubscriber-plugins/customer-tests/session/tests.xml
@@ -6,10 +6,10 @@
<step expected_result="0">/usr/share/context-session-tests/waitforsilence</step>
</pre_steps>
<case name="Session.State-fullscreen" description="Test for Session.State when the fullscreen mode changes" insignificant="true">
- <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/context-session-tests;export PATH=$PATH:/usr/lib/context-session-tests/; export CONTEXT_CORE_DECLARATIONS=/dev/null; export CONTEXT_PROVIDERS=/usr/share/context-session-tests; python /usr/share/context-session-tests/test-fullscreen.py</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/context-session-tests;export PATH=$PATH:/usr/lib/context-session-tests/; export CONTEXT_CORE_DECLARATIONS=/dev/null; export CONTEXT_PROVIDERS=/usr/share/context-session-tests; python2.5 /usr/share/context-session-tests/test-fullscreen.py</step>
</case>
<case name="Session.State-blanking" description="Test for Session.State when the screen blanking mode changes" insignificant="true">
- <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/context-session-tests;export PATH=$PATH:/usr/lib/context-session-tests/; export CONTEXT_CORE_DECLARATIONS=/dev/null; export CONTEXT_PROVIDERS=/usr/share/context-session-tests; python /usr/share/context-session-tests/test-blanking.py</step>
+ <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/context-session-tests;export PATH=$PATH:/usr/lib/context-session-tests/; export CONTEXT_CORE_DECLARATIONS=/dev/null; export CONTEXT_PROVIDERS=/usr/share/context-session-tests; python2.5 /usr/share/context-session-tests/test-blanking.py</step>
</case>
<environments>
<scratchbox>false</scratchbox>
++++++ contextkit-maemo.yaml
--- contextkit-maemo.yaml
+++ contextkit-maemo.yaml
@@ -1,6 +1,6 @@
Name: contextkit-maemo
Summary: ContextKit Maemo specific providers
-Version: 0.7.12
+Version: 0.7.14
Release: 1
Group: Applications/System
License: GPLv2
@@ -41,4 +41,5 @@
- glib-2.0
- contextprovider-1.0
- libudev
+ - x11
Configure: autogen
More information about the MeeGo-commits
mailing list