From 69081d46fe77f2c8bd18dd56e6dbc7a3ceb0ee28 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 16 Jul 2014 18:28:24 -0500 Subject: in debian/rules, remove autotool-specific bits --- debian/control | 2 -- debian/rules | 14 +------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/debian/control b/debian/control index e72d68f..f64bf41 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,6 @@ Section: gnome Priority: optional Maintainer: Ubuntu Core Developers Build-Depends: debhelper (>= 9), - dh-autoreconf, - autopoint, intltool, libgtest-dev, libglib2.0-dev (>= 2.36), diff --git a/debian/rules b/debian/rules index 36a22d7..885b94c 100755 --- a/debian/rules +++ b/debian/rules @@ -6,20 +6,8 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 -ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) - TESTS=yes -else - TESTS=no -endif - %: - dh $@ --with autoreconf - -override_dh_autoreconf: - NOCONFIGURE=1 dh_autoreconf ./autogen.sh - -override_dh_auto_configure: - dh_auto_configure -- --enable-tests=$(TESTS) + dh $@ --with translations override_dh_install: find debian/indicator-power -name \*.la -delete -- cgit v1.2.3 From 1f2f1653b9f132071f435ac904b880cb4ae3ca32 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 16 Jul 2014 18:29:24 -0500 Subject: add po/CMakeLists.txt --- po/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 po/CMakeLists.txt diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt new file mode 100644 index 0000000..8325f6e --- /dev/null +++ b/po/CMakeLists.txt @@ -0,0 +1,3 @@ +include (Translations) +add_translations_directory ("${GETTEXT_PACKAGE}") +add_translations_catalog ("${GETTEXT_PACKAGE}" ../src/) -- cgit v1.2.3 From 082a47c9b88daf003971b271a3de92b63dcb62d6 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 16 Jul 2014 18:59:29 -0500 Subject: add dh-translations to Build-Depends --- CMakeLists.txt | 1 - debian/control | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f80294..07063cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,6 @@ add_custom_target (cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2 ## Actual building ## -# those GActionEntry structs tickle -Wmissing-field-initializers if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(C_WARNING_ARGS "${C_WARNING_ARGS} -Weverything -Wno-c++98-compat") set(C_WARNING_ARGS "${C_WARNING_ARGS} -Wno-documentation") # gtk-doc != doxygen diff --git a/debian/control b/debian/control index f64bf41..0944f42 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,9 @@ Source: indicator-power Section: gnome Priority: optional Maintainer: Ubuntu Core Developers -Build-Depends: debhelper (>= 9), +Build-Depends: cmake, + debhelper (>= 9), + dh-translations, intltool, libgtest-dev, libglib2.0-dev (>= 2.36), -- cgit v1.2.3 From e187f6f944e7fd43fff86d2420882fa7ba898f9e Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 16 Jul 2014 19:25:12 -0500 Subject: none of the current tests require dbustest-1, so remove it from pkg_check_modules --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07063cd..130a662 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/include) # testing & coverage if (${enable_tests}) - pkg_check_modules (DBUSTEST REQUIRED dbustest-1>=14.04.0) set (GTEST_SOURCE_DIR /usr/src/gtest/src) set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..) set (GTEST_LIBS -lpthread) -- cgit v1.2.3 From 9f1ebe8f6c412ab18bdf32bf949fc00152d9671b Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 17 Jul 2014 14:46:23 -0500 Subject: replace 'std::vector' with 'std::vector' for readability --- tests/test-device.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-device.cc b/tests/test-device.cc index 1d10b5b..81e8a22 100644 --- a/tests/test-device.cc +++ b/tests/test-device.cc @@ -713,7 +713,7 @@ TEST_F(DeviceTest, ChoosePrimary) devices.push_back(indicator_power_device_new(desc.path, desc.kind, desc.percentage, desc.state, (time_t)desc.time)); const struct { - std::vector device_indices; + std::vector device_indices; Description expected; } tests[] = { -- cgit v1.2.3 From 967a5479db7d280255f669102f045076e09420d8 Mon Sep 17 00:00:00 2001 From: CI bot Date: Fri, 18 Jul 2014 21:33:31 +0000 Subject: Releasing 12.10.6+14.10.20140718-0ubuntu1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1953488..502975c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-power (12.10.6+14.10.20140718-0ubuntu1) utopic; urgency=low + + [ Charles Kerr ] + * Switch from automake/autoconf to CMake. + + -- Ubuntu daily release Fri, 18 Jul 2014 21:33:30 +0000 + indicator-power (12.10.6+14.10.20140624-0ubuntu1) utopic; urgency=low [ Alberto Aguirre ] -- cgit v1.2.3