From 74b8522acb04f547cf291d33c237478a98f6e5d8 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 16 Jul 2014 01:07:29 -0500 Subject: in debian/control and CMake files, add libnotify --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index e72d68f..68df8bc 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint, intltool, + libnotify-dev (>= 0.7.6), libgtest-dev, libglib2.0-dev (>= 2.36), libgudev-1.0-dev, -- cgit v1.2.3 From d5b42752328be0a217c1271656523399b8056f58 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 21 Jul 2014 12:21:54 -0500 Subject: add dbus-test-runner as a build dependency for tests --- debian/control | 11 +++++++---- tests/CMakeLists.txt | 7 ++++++- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 4571741..487a244 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,18 @@ Section: gnome Priority: optional Maintainer: Ubuntu Core Developers Build-Depends: cmake, - debhelper (>= 9), - dh-translations, - intltool, libnotify-dev (>= 0.7.6), - libgtest-dev, libglib2.0-dev (>= 2.36), libgudev-1.0-dev, liburl-dispatcher1-dev, python:any, +# for packaging + debhelper (>= 9), + dh-translations, + intltool, +# for tests + libgtest-dev, + dbus-test-runner, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power # If you aren't a member of ~indicator-applet-developers but need to upload diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4489bdc..64b8ed8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,6 +5,11 @@ add_library (gtest STATIC set_target_properties (gtest PROPERTIES INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIR}) set_target_properties (gtest PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} -w) +# dbustest +pkg_check_modules(DBUSTEST REQUIRED + dbustest-1>=14.04.0) +include_directories (SYSTEM ${DBUSTEST_INCLUDE_DIRS}) + # add warnings set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g ${C_WARNING_ARGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-weak-vtables -Wno-global-constructors") # Google Test @@ -40,7 +45,7 @@ function(add_test_by_name name) add_executable (${TEST_NAME} ${TEST_NAME}.cc gschemas.compiled) add_test (${TEST_NAME} ${TEST_NAME}) add_dependencies (${TEST_NAME} libindicatorpowerservice) - target_link_libraries (${TEST_NAME} indicatorpowerservice gtest ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS}) + target_link_libraries (${TEST_NAME} indicatorpowerservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS}) endfunction() add_test_by_name(test-notify) add_test(NAME dear-reader-the-next-test-takes-80-seconds COMMAND true) -- cgit v1.2.3 From 34925a76df4ff222f02a65adec9edf1f626c45ad Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 21 Jul 2014 18:04:55 -0500 Subject: in debian/control, add libdbustest1-dev to Build-Deps for tests --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 487a244..228d305 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: cmake, intltool, # for tests libgtest-dev, + libdbustest1-dev, dbus-test-runner, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power -- cgit v1.2.3 From f5db19df10ace0919ec13f83a751cc891d8a1741 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 21 Jul 2014 18:12:11 -0500 Subject: in debian/control, add python3-dbusmock to Build-Deps for tests --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 228d305..00c0864 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,9 @@ Build-Depends: cmake, intltool, # for tests libgtest-dev, - libdbustest1-dev, + python3-dbusmock, dbus-test-runner, + libdbustest1-dev, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power # If you aren't a member of ~indicator-applet-developers but need to upload -- cgit v1.2.3 From 42414e053db93373d0eb1859d4b060aca1391004 Mon Sep 17 00:00:00 2001 From: CI bot Date: Wed, 30 Jul 2014 10:52:39 +0000 Subject: Releasing 12.10.6+14.10.20140730-0ubuntu1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 502975c..0f3e124 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-power (12.10.6+14.10.20140730-0ubuntu1) utopic; urgency=low + + [ Charles Kerr ] + * Add low-battery notifications. (LP: #1317858) + + -- Ubuntu daily release Wed, 30 Jul 2014 10:52:39 +0000 + indicator-power (12.10.6+14.10.20140718-0ubuntu1) utopic; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From c7e1740203b41bb9cb12da0ea97477363224e3ee Mon Sep 17 00:00:00 2001 From: CI bot Date: Thu, 14 Aug 2014 14:51:03 +0000 Subject: Releasing 12.10.6+14.10.20140814-0ubuntu1 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0f3e124..4f9edcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-power (12.10.6+14.10.20140814-0ubuntu1) utopic; urgency=low + + [ Charles Kerr ] + * Re-use the same Translations.cmake file across indicators (LP: + #1354058) + + -- Ubuntu daily release Thu, 14 Aug 2014 14:51:02 +0000 + indicator-power (12.10.6+14.10.20140730-0ubuntu1) utopic; urgency=low [ Charles Kerr ] -- cgit v1.2.3