diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-07-21 12:03:44 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2014-07-21 12:03:44 -0500 |
| commit | bc32a96ee2d776eb2cf1af6e67f940afad589dce (patch) | |
| tree | 6ee4a86fba4f1a25eec1033cf874cb81da92a8c6 | |
| parent | 1902911c18a863ca285c53ae323e233119cf0d86 (diff) | |
| parent | 967a5479db7d280255f669102f045076e09420d8 (diff) | |
| download | ayatana-indicator-power-bc32a96ee2d776eb2cf1af6e67f940afad589dce.tar.gz ayatana-indicator-power-bc32a96ee2d776eb2cf1af6e67f940afad589dce.tar.bz2 ayatana-indicator-power-bc32a96ee2d776eb2cf1af6e67f940afad589dce.zip | |
sync with lp:indicator-power
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rwxr-xr-x | debian/rules | 14 | ||||
| -rw-r--r-- | po/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/test-device.cc | 2 |
6 files changed, 15 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e9acbf1..d5d6a82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,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 @@ -77,7 +76,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) 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 <ps-jenkins@lists.canonical.com> Fri, 18 Jul 2014 21:33:30 +0000 + indicator-power (12.10.6+14.10.20140624-0ubuntu1) utopic; urgency=low [ Alberto Aguirre ] diff --git a/debian/control b/debian/control index 68df8bc..4571741 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: indicator-power Section: gnome Priority: optional Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> -Build-Depends: debhelper (>= 9), - dh-autoreconf, - autopoint, +Build-Depends: cmake, + debhelper (>= 9), + dh-translations, intltool, libnotify-dev (>= 0.7.6), libgtest-dev, 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 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/) 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<unsigned> device_indices; + std::vector<unsigned int> device_indices; Description expected; } tests[] = { |