Merge lp:~saviq/indicators-client/fix-raring-build into lp:indicators-client

[Michał Sawicz]

fix raring build: link test to libgio and build-depend on python

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:196
http://jenkins.qa.ubuntu.com/job/indicators-client-ci/273/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicators-client-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/273/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicators-client-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/273/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicators-client-ci/273/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

looks good to me

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-02-22 09:40:15 +0000
+++ debian/control	2013-03-14 19:06:21 +0000
@@ -11,7 +11,7 @@
                libglib2.0-dev,
                libnm-glib-dev,
                libqmenumodel-dev,
-               python2.7,
+               python,
 Standards-Version: 3.9.3
 Vcs-Bzr: lp:ubuntu-indicators/indicators-client
 

=== modified file 'tests/unittest/CMakeLists.txt'
--- tests/unittest/CMakeLists.txt	2013-01-10 19:35:32 +0000
+++ tests/unittest/CMakeLists.txt	2013-03-14 19:06:21 +0000
@@ -16,7 +16,10 @@
     set(CTEST_TESTING_TIMEOUT 60)
 endif()
 
+pkg_check_modules(GIO gio-2.0>=2.32)
+
 include_directories(${QMENUMODEL_INCLUDE_DIRS}
+                    ${GIO_INCLUDE_DIRS}
                     ${CMAKE_BINARY_DIR}
                     ${libchewieui_SOURCE_DIR}
 )
@@ -30,6 +33,10 @@
 declare_test(pluginmodeltest)
 declare_test(dynamicmenutest)
 
+target_link_libraries(dynamicmenutest
+    ${GIO_LIBRARIES}
+)
+
 add_subdirectory(plugins)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test-config.h.in