Merge branch '0.5.14'release_0.5.140.5.14

28 files changed, 55 insertions, 56 deletions

diff --git a/configure.ac b/configure.ac
index 35f1adec..540f6e5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.61])
-AC_INIT([ContextKit], [0.5.14~unreleased], [marius.vollmer@nokia.com], ContextKit)
+AC_INIT([ContextKit], [0.5.14], [marius.vollmer@nokia.com], ContextKit)
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 tar-ustar 1.9])
diff --git a/debian/changelog b/debian/changelog
index 63b7bfbb..3b211e87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-contextkit (0.5.14~unreleased) unstable; urgency=low
+contextkit (0.5.14) unstable; urgency=low
 
-  * 
+  * Strictly uses python2.5
 
- -- Jean-Luc Lamadon <jean-luc.lamadon@nokia.com>  Wed, 30 Jun 2010 00:35:18 +0300
+ -- Jean-Luc Lamadon <jean-luc.lamadon@nokia.com>  Wed, 30 Jun 2010 00:34:27 +0300
 
 contextkit (0.5.13) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 21ea03b1..6765ed90 100644
--- a/debian/control
+++ b/debian/control
@@ -73,7 +73,7 @@ Description: Helper library for providers of context properties
 Package: libcontextprovider-tests
 Section: devel
 Architecture: any
-Depends: libcontextprovider0, contextkit-utils, python-contextkit, ${shlibs:Depends}, python (>= 2.5)
+Depends: libcontextprovider0, contextkit-utils, python-contextkit, ${shlibs:Depends}, python2.5
 XB-Maemo-CI-Packages: libcontextprovider0
 XB-Maemo-CI-Stage: staging, acceptance
 Description: libcontextprovider automated customer tests
@@ -150,7 +150,7 @@ Description: Helper library for subscribers of context properties
 Package: libcontextsubscriber-tests
 Section: devel
 Architecture: any
-Depends: libcontextprovider0, libcontextsubscriber0, contextkit-utils, python-contextkit, ${shlibs:Depends}, python (>= 2.5), tinycdb
+Depends: libcontextprovider0, libcontextsubscriber0, contextkit-utils, python-contextkit, ${shlibs:Depends}, python2.5, tinycdb
 XB-Maemo-CI-Packages: libcontextsubscriber0, libcontextprovider0
 XB-Maemo-CI-Stage: staging, acceptance
 Description: libcontextsubscriber automated customer tests
@@ -163,7 +163,7 @@ Description: libcontextsubscriber automated customer tests
 Package: propertymonitor-tests
 Section: devel
 Architecture: any
-Depends: contextkit-utils, python (>= 2.5), python-contextkit
+Depends: contextkit-utils, python2.5, python-contextkit
 XB-Maemo-CI-Stage: staging, validation
 Description: Property monitor
  This package contains an automated test suite for monitoring which Context FW properties are provided.
diff --git a/libcontextprovider/context-provide/propertyproxy.cpp b/libcontextprovider/context-provide/propertyproxy.cpp
index 41a46cad..8c4ecc25 100644
--- a/libcontextprovider/context-provide/propertyproxy.cpp
+++ b/libcontextprovider/context-provide/propertyproxy.cpp
@@ -43,7 +43,6 @@ void PropertyProxy::onFirstSubscriber(const QString &key)
 {
     contextDebug() << "First client subscription received, commander subscribes to provider" << subscriber->key();
     subscriber->subscribe();
-    subscriber->waitForSubscription();
 }
 
 void PropertyProxy::onLastSubscriber()
diff --git a/libcontextprovider/customer-tests/multiprovider/multiprovider.py b/libcontextprovider/customer-tests/multiprovider/multiprovider.py
index 6486e46f..570fd25e 100755
--- a/libcontextprovider/customer-tests/multiprovider/multiprovider.py
+++ b/libcontextprovider/customer-tests/multiprovider/multiprovider.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## This file is part of ContextKit.
 ##
diff --git a/libcontextprovider/customer-tests/tests.xml b/libcontextprovider/customer-tests/tests.xml
index 67197bd8..a04d4378 100644
--- a/libcontextprovider/customer-tests/tests.xml
+++ b/libcontextprovider/customer-tests/tests.xml
@@ -15,7 +15,7 @@
         <step expected_result="0">. /tmp/session_bus_address.user;export PATH=$PATH:.;cd /usr/lib/libcontextprovider-tests/;./typestests</step>
       </case>
       <case name="typeschange" description="Type change should be enough to emit a valuechanged" requirement="" timeout="50">
-        <step expected_result="0">. /tmp/session_bus_address.user;export PATH=$PATH:/usr/lib/libcontextprovider-tests:.;cd /usr/share/libcontextprovider-tests/multiprovider;python /usr/share/libcontextprovider-tests/types/types.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export PATH=$PATH:/usr/lib/libcontextprovider-tests:.;cd /usr/share/libcontextprovider-tests/multiprovider;python2.5 /usr/share/libcontextprovider-tests/types/types.py</step>
       </case>
       <case name="valuechanges" description="Clients getting value change notifications" requirement="" timeout="50">
         <step expected_result="0">. /tmp/session_bus_address.user;export PATH=$PATH:.;cd /usr/lib/libcontextprovider-tests/;./valuechangestests</step>
@@ -24,13 +24,13 @@
         <step expected_result="0">. /tmp/session_bus_address.user;export PATH=$PATH:.;cd /usr/lib/libcontextprovider-tests/;./servicetest</step>
       </case>
       <case name="multiprovider1" description="Scenarios involving many providers">
-        <step expected_result="0">. /tmp/session_bus_address.user;export PATH=$PATH:/usr/lib/libcontextprovider-tests:.;cd /usr/share/libcontextprovider-tests/multiprovider;python /usr/share/libcontextprovider-tests/multiprovider/multiprovider.py MultiProvider.testPingPong</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export PATH=$PATH:/usr/lib/libcontextprovider-tests:.;cd /usr/share/libcontextprovider-tests/multiprovider;python2.5 /usr/share/libcontextprovider-tests/multiprovider/multiprovider.py MultiProvider.testPingPong</step>
       </case>
       <case name="multiprovider2" description="Scenarios involving many providers">
-        <step expected_result="0">. /tmp/session_bus_address.user;export PATH=$PATH:/usr/lib/libcontextprovider-tests:.;cd /usr/share/libcontextprovider-tests/multiprovider;python /usr/share/libcontextprovider-tests/multiprovider/multiprovider.py MultiProvider.testOverheardValues</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export PATH=$PATH:/usr/lib/libcontextprovider-tests:.;cd /usr/share/libcontextprovider-tests/multiprovider;python2.5 /usr/share/libcontextprovider-tests/multiprovider/multiprovider.py MultiProvider.testOverheardValues</step>
       </case>
       <case name="multiprovider3" description="Scenarios involving many providers">
-        <step expected_result="0">. /tmp/session_bus_address.user;export PATH=$PATH:/usr/lib/libcontextprovider-tests:.;cd /usr/share/libcontextprovider-tests/multiprovider;python /usr/share/libcontextprovider-tests/multiprovider/multiprovider.py MultiProvider.testBothProvidersSameValue</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export PATH=$PATH:/usr/lib/libcontextprovider-tests:.;cd /usr/share/libcontextprovider-tests/multiprovider;python2.5 /usr/share/libcontextprovider-tests/multiprovider/multiprovider.py MultiProvider.testBothProvidersSameValue</step>
       </case>
       <environments>
         <scratchbox>false</scratchbox>
diff --git a/libcontextprovider/customer-tests/types/types.py b/libcontextprovider/customer-tests/types/types.py
index 548c0c96..267a7c07 100755
--- a/libcontextprovider/customer-tests/types/types.py
+++ b/libcontextprovider/customer-tests/types/types.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## This file is part of ContextKit.
 ##
diff --git a/libcontextsubscriber/customer-tests/asynchronicity/asynchronicity.py b/libcontextsubscriber/customer-tests/asynchronicity/asynchronicity.py
index 2566ba6f..d7d9090b 100755
--- a/libcontextsubscriber/customer-tests/asynchronicity/asynchronicity.py
+++ b/libcontextsubscriber/customer-tests/asynchronicity/asynchronicity.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## Copyright (C) 2008, 2009 Nokia. All rights reserved.
 ##
diff --git a/libcontextsubscriber/customer-tests/asynchronicity/rapidchanges.py b/libcontextsubscriber/customer-tests/asynchronicity/rapidchanges.py
index f695e91c..30a53b9a 100755
--- a/libcontextsubscriber/customer-tests/asynchronicity/rapidchanges.py
+++ b/libcontextsubscriber/customer-tests/asynchronicity/rapidchanges.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## Copyright (C) 2008, 2009 Nokia. All rights reserved.
 ##
diff --git a/libcontextsubscriber/customer-tests/commander/commander_appearing.py b/libcontextsubscriber/customer-tests/commander/commander_appearing.py
index f74ef60c..1a87c124 100755
--- a/libcontextsubscriber/customer-tests/commander/commander_appearing.py
+++ b/libcontextsubscriber/customer-tests/commander/commander_appearing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## This file is part of ContextKit.
 ##
diff --git a/libcontextsubscriber/customer-tests/commander/commander_disabled.py b/libcontextsubscriber/customer-tests/commander/commander_disabled.py
index 1acf1c65..661a6752 100755
--- a/libcontextsubscriber/customer-tests/commander/commander_disabled.py
+++ b/libcontextsubscriber/customer-tests/commander/commander_disabled.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## This file is part of ContextKit.
 ##
diff --git a/libcontextsubscriber/customer-tests/commander/commander_nonexistent.py b/libcontextsubscriber/customer-tests/commander/commander_nonexistent.py
index c073786a..d595961b 100755
--- a/libcontextsubscriber/customer-tests/commander/commander_nonexistent.py
+++ b/libcontextsubscriber/customer-tests/commander/commander_nonexistent.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## This file is part of ContextKit.
 ##
diff --git a/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py b/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py
index a1ee1fbe..0f3614e0 100755
--- a/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py
+++ b/libcontextsubscriber/customer-tests/pluginchanging/pluginchanging.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## This file is part of ContextKit.
 ##
diff --git a/libcontextsubscriber/customer-tests/registry/registry.py b/libcontextsubscriber/customer-tests/registry/registry.py
index 32a193c1..1bba40a9 100755
--- a/libcontextsubscriber/customer-tests/registry/registry.py
+++ b/libcontextsubscriber/customer-tests/registry/registry.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## This file is part of ContextKit.
 ##
diff --git a/libcontextsubscriber/customer-tests/subscription/multiprovider.py b/libcontextsubscriber/customer-tests/subscription/multiprovider.py
index 47709a2c..9760438b 100755
--- a/libcontextsubscriber/customer-tests/subscription/multiprovider.py
+++ b/libcontextsubscriber/customer-tests/subscription/multiprovider.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## Copyright (C) 2008, 2009 Nokia. All rights reserved.
 ##
diff --git a/libcontextsubscriber/customer-tests/subscription/multiprovider2.py b/libcontextsubscriber/customer-tests/subscription/multiprovider2.py
index d715324d..eba6333e 100755
--- a/libcontextsubscriber/customer-tests/subscription/multiprovider2.py
+++ b/libcontextsubscriber/customer-tests/subscription/multiprovider2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## Copyright (C) 2008, 2009 Nokia. All rights reserved.
 ##
diff --git a/libcontextsubscriber/customer-tests/subscription/subscription.py b/libcontextsubscriber/customer-tests/subscription/subscription.py
index 3a64ae91..3ab64dc5 100755
--- a/libcontextsubscriber/customer-tests/subscription/subscription.py
+++ b/libcontextsubscriber/customer-tests/subscription/subscription.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## @file contextOrientationTCs.py
 ## This file is part of ContextKit.
diff --git a/libcontextsubscriber/customer-tests/tests.xml b/libcontextsubscriber/customer-tests/tests.xml
index 1a408f49..f4402f10 100644
--- a/libcontextsubscriber/customer-tests/tests.xml
+++ b/libcontextsubscriber/customer-tests/tests.xml
@@ -11,89 +11,89 @@
       <!-- At least one case per set, name mandatory, description mandatory, other optional -->
       <case name="async" description="This test verifies that the asynchronicity of the subscriber library" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user; export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/asynchronicity;python /usr/share/libcontextsubscriber-tests/asynchronicity/asynchronicity.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user; export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/asynchronicity;python2.5 /usr/share/libcontextsubscriber-tests/asynchronicity/asynchronicity.py</step>
       </case>
       <!-- At least one case per set, name mandatory, description mandatory, other optional -->
       <case name="commander-appearing" description="This test verifies that properties are overriden by commander" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python /usr/share/libcontextsubscriber-tests/commander/commander_appearing.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python2.5 /usr/share/libcontextsubscriber-tests/commander/commander_appearing.py</step>
       </case>
       <!-- At least one case per set, name mandatory, description mandatory, other optional -->
       <case name="commander-nonexistent" description="This test verifies that nonexistent properties are handled by commander" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python /usr/share/libcontextsubscriber-tests/commander/commander_nonexistent.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python2.5 /usr/share/libcontextsubscriber-tests/commander/commander_nonexistent.py</step>
       </case>
       <!-- At least one case per set, name mandatory, description mandatory, other optional -->
       <case name="commander-disabled" description="This test verifies that disabling commander restore actual properties values" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python /usr/share/libcontextsubscriber-tests/commander/commander_disabled.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/commander;python2.5 /usr/share/libcontextsubscriber-tests/commander/commander_disabled.py</step>
       </case>
       <!-- At least one case per set, name mandatory, description mandatory, other optional -->
       <case name="registry" description="getting info from introspection API" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/registry;python /usr/share/libcontextsubscriber-tests/registry/registry.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/registry;python2.5 /usr/share/libcontextsubscriber-tests/registry/registry.py</step>
       </case>
       <case name="subscription1" description="This test verifies that subscription to properties" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testValue</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testValue</step>
       </case>
       <case name="subscription2" description="This test verifies that subscription to properties" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testInfos</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testInfos</step>
       </case>
       <case name="subscription3" description="Reading the type information from introspection" requirement="" timeout="20">
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testTypes</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testTypes</step>
       </case>
       <case name="subscription4" description="Reading the provider information from introspection" requirement="" timeout="20">
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testProviders</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testProviders</step>
       </case>
       <case name="subscription5" description="This test verifies that subscription to properties" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testAllDataTypes</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testAllDataTypes</step>
       </case>
       <!-- Environments optional - tells where the tests are run -->
       <case name="subscription6" description="This test verifies that subscription to properties" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testTruthTypePermutations</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testTruthTypePermutations</step>
       </case>
       <case name="subscription7" description="This test verifies that subscription to properties" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testStringTypePermutations</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py Subscription.testStringTypePermutations</step>
       </case>
       <case name="subscription8" description="This test verifies that subscription to properties" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleSubscribers.testInitialSubscription</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleSubscribers.testInitialSubscription</step>
       </case>
       <case name="subscription9" description="This test verifies that subscription to properties" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleSubscribers.testValueChanged</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleSubscribers.testValueChanged</step>
       </case>
       <case name="subscription10" description="This test verifies that subscription to properties" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleProviders.testTwoProviders</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py MultipleProviders.testTwoProviders</step>
       </case>
       <case name="subscription11" description="This test verifies that subscription to properties" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py SubscriptionPause.testPause</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py SubscriptionPause.testPause</step>
       </case>
       <case name="subscription12" description="This test verifies that subscription to properties" requirement="" timeout="20">
         <!-- At least one step per test, expected_result optional - tells which return code is considered passed -->
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python /usr/share/libcontextsubscriber-tests/subscription/subscription.py SubscriptionPause.testWaitForSubscribe</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.;cd /usr/share/libcontextsubscriber-tests/subscription;python2.5 /usr/share/libcontextsubscriber-tests/subscription/subscription.py SubscriptionPause.testWaitForSubscribe</step>
       </case>
       <case name="plugin" description="Plugin loading of libcontextsubscriber" requirement="" timeout="20">
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/pluginchanging;python /usr/share/libcontextsubscriber-tests/pluginchanging/pluginchanging.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/pluginchanging;python2.5 /usr/share/libcontextsubscriber-tests/pluginchanging/pluginchanging.py</step>
       </case>
       <case name="multiprovider" description="Multiple providers"
 	    requirement="" timeout="20">
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/subscription; python multiprovider.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/subscription; python2.5 multiprovider.py</step>
       </case>
       <case name="multiprovider2" description="Multiprovider timestamp"
 	    requirement="" timeout="20">
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/subscription; python multiprovider2.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/subscription; python2.5 multiprovider2.py</step>
       </case>
       <case name="rapidchanges" description="Rapid changes"
 	    requirement="" timeout="20">
-        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/asynchronicity; python rapidchanges.py</step>
+        <step expected_result="0">. /tmp/session_bus_address.user;export CONTEXT_PROVIDERS=.; cd /usr/share/libcontextsubscriber-tests/asynchronicity; python2.5 rapidchanges.py</step>
       </case>
       <case name="update-contextkit-providers" description="CDB database generation"
 	    requirement="" timeout="20">
diff --git a/libcontextsubscriber/propertymonitor/has_provider.py b/libcontextsubscriber/propertymonitor/has_provider.py
index 5c6c9cad..f718828f 100755
--- a/libcontextsubscriber/propertymonitor/has_provider.py
+++ b/libcontextsubscriber/propertymonitor/has_provider.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## Copyright (C) 2008, 2009 Nokia. All rights reserved.
 ##
diff --git a/libcontextsubscriber/propertymonitor/has_value.py b/libcontextsubscriber/propertymonitor/has_value.py
index df5363e4..2192fe76 100755
--- a/libcontextsubscriber/propertymonitor/has_value.py
+++ b/libcontextsubscriber/propertymonitor/has_value.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## Copyright (C) 2008, 2009 Nokia. All rights reserved.
 ##
diff --git a/libcontextsubscriber/propertymonitor/tests.xsl b/libcontextsubscriber/propertymonitor/tests.xsl
index e8a02d12..421896fc 100644
--- a/libcontextsubscriber/propertymonitor/tests.xsl
+++ b/libcontextsubscriber/propertymonitor/tests.xsl
@@ -12,12 +12,12 @@
 	<case requirement="" timeout="20">
 	  <xsl:attribute name="name"><xsl:value-of select="@name"/>-provider</xsl:attribute>
 	  <xsl:attribute name="description">Provider for <xsl:value-of select="@name"/></xsl:attribute>
-          <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/propertymonitor-tests;python /usr/share/propertymonitor-tests/has_provider.py <xsl:value-of select="@name"/></step>
+          <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/propertymonitor-tests;python2.5 /usr/share/propertymonitor-tests/has_provider.py <xsl:value-of select="@name"/></step>
 	</case>
 	<case requirement="" timeout="20">
 	  <xsl:attribute name="name"> <xsl:value-of select="@name"/>-value</xsl:attribute>
 	  <xsl:attribute name="description">Value for <xsl:value-of select="@name"/></xsl:attribute>
-          <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/propertymonitor-tests;python /usr/share/propertymonitor-tests/has_value.py <xsl:value-of select="@name"/></step>
+          <step expected_result="0">. /tmp/session_bus_address.user;cd /usr/share/propertymonitor-tests;python2.5 /usr/share/propertymonitor-tests/has_value.py <xsl:value-of select="@name"/></step>
 	</case>
       </xsl:for-each>
       <environments>
diff --git a/python/ContextKit/cltool.py b/python/ContextKit/cltool.py
index 625dd47b..d1ea0ba6 100644
--- a/python/ContextKit/cltool.py
+++ b/python/ContextKit/cltool.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.5
 ##
 ## Copyright (C) 2009 Nokia. All rights reserved.
 ##
diff --git a/python/ContextKit/flexiprovider.py b/python/ContextKit/flexiprovider.py
index f5aee6db..b11cf84c 100644
--- a/python/ContextKit/flexiprovider.py
+++ b/python/ContextKit/flexiprovider.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.5
 import os
 import sys
 import tempfile
diff --git a/python/complex.py b/python/complex.py
index c44b1b25..3a892502 100755
--- a/python/complex.py
+++ b/python/complex.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.5
 """A more complex provider with a horroristic theme."""
 
 from ContextKit.flexiprovider import *
diff --git a/python/context-rlwrap b/python/context-rlwrap
index b490f4c9..b0fe1f17 100755
--- a/python/context-rlwrap
+++ b/python/context-rlwrap
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.5
 """context-rlwrap -- a simple readline wrapper
 
 Usage: context-rlwrap [some other program and args]
diff --git a/python/simple.py b/python/simple.py
index a74cecdf..9b0f32ce 100755
--- a/python/simple.py
+++ b/python/simple.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.5
 """
 A very simple example of the Flexiprovider.  Exports three properties
 initially.
diff --git a/sandbox/context-proxy b/sandbox/context-proxy
index 2b6a366b..fe430a0a 100755
--- a/sandbox/context-proxy
+++ b/sandbox/context-proxy
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.5
 
 from sys import stderr, stdin
 from subprocess import Popen, PIPE
diff --git a/sandbox/multithreading-tests/stress-test/provider.py b/sandbox/multithreading-tests/stress-test/provider.py
index 748929a4..5603a2a7 100755
--- a/sandbox/multithreading-tests/stress-test/provider.py
+++ b/sandbox/multithreading-tests/stress-test/provider.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.5
 """A test provider for the stress testing."""