diff options
| -rw-r--r-- | debian/changelog | 76 | ||||
| -rw-r--r-- | debian/control | 11 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 7 |
4 files changed, 88 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index d7ed9bd..b277aa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,79 @@ -indicator-sound (12.10.2+15.10.20151019-0ubuntu2) UNRELEASED; urgency=medium +indicator-sound (12.10.2+15.10.20151019-0ubuntu3) UNRELEASED; urgency=medium + [ Xavi Garcia ] * Added OSD notifications to show output source when the volume or source change (LP: #1382548, LP: #1415480, LP: #1484589) - - -- Xavi Garcia <xavi.garcia.mena@canonical.com> Tue, 03 Nov 2015 12:29:19 +0100 + + * debian/control: + Added the following build dependencies: + - cmake-extras (>= 0.4), + - google-mock (>= 1.6.0+svn437), + - libqtdbusmock1-dev (>= 0.3), + - libqtdbustest1-dev, + - libunity-api-dev, + - pulseaudio, + - qt5-default, + - qtbase5-dev, + - qtbase5-dev-tools, + - qtdeclarative5-dev, + - qtdeclarative5-dev-tools + * Added gmenuharness library for integration tests support. + New Files: + - src/gmenuharness/CMakeLists.txt + - src/gmenuharness/MatchResult.cpp + - src/gmenuharness/MatchUtils.cpp + - src/gmenuharness/MenuItemMatcher.cpp + - src/gmenuharness/MenuMatcher.cpp + - include/unity/gmenuharness/MatchResult.h + - include/unity/gmenuharness/MatchUtils.h + - include/unity/gmenuharness/MenuItemMatcher.h + - include/unity/gmenuharness/MenuMatcher.h + * Added integration tests using gmenuharness + New Files: + - tests/dbus-types/CMakeLists.txt + - tests/dbus-types/com.ubuntu.AccountsService.Sound.xml + - tests/dbus-types/dbus-types.h + - tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml + - tests/dbus-types/org.freedesktop.Accounts.xml + - tests/dbus-types/org.freedesktop.DBus.Properties.xml + - tests/dbus-types/org.freedesktop.Notifications.xml + - tests/dbus-types/org.gtk.Actions.xml + - tests/dbus-types/pulseaudio-volume.cpp + - tests/dbus-types/pulseaudio-volume.h + - tests/integration/CMakeLists.txt + - tests/integration/indicator-sound-test-base.cpp + - tests/integration/indicator-sound-test-base.h + - tests/integration/main.cpp + - tests/integration/test-indicator.cpp + - tests/integration/touch-stream-restore.table + - tests/integration/utils/dbus-pulse-volume.cpp + - tests/integration/utils/dbus-pulse-volume.h + - tests/integration/utils/get-volume.cpp + - tests/integration/utils/set-volume.cpp + - tests/service-mocks/CMakeLists.txt + - tests/service-mocks/DBusPropertiesNotifier.cpp + - tests/service-mocks/DBusPropertiesNotifier.h + - tests/service-mocks/accounts-mock/AccountsDefs.h + - tests/service-mocks/accounts-mock/AccountsMock.cpp + - tests/service-mocks/accounts-mock/AccountsMock.h + - tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp + - tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h + - tests/service-mocks/accounts-mock/CMakeLists.txt + - tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml + - tests/service-mocks/accounts-mock/main.cpp + - tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml + - tests/service-mocks/media-player-mpris-mock/CMakeLists.txt + - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h + - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp + - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h + - tests/service-mocks/media-player-mpris-mock/applications/testplayer1.desktop + - tests/service-mocks/media-player-mpris-mock/main.cpp + - tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.Player.xml + - tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.xml + - tests/service-mocks/media-player-mpris-mock/player-update.cpp + + + -- Xavi Garcia <xavi.garcia.mena@canonical.com> Wed, 11 Nov 2015 12:40:10 +0100 indicator-sound (12.10.2+15.10.20151019-0ubuntu1) wily; urgency=medium diff --git a/debian/control b/debian/control index 3585713..f170fcf 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,13 @@ Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> XSBC-Original-Maintainer: Conor Curran <conor.curran@canonical.com> Build-Depends: debhelper (>= 9.0), cmake, + cmake-extras (>= 0.4), dbus, dbus-test-runner (>> 14.04.0+14.04.20150120.1), dh-translations, gir1.2-accountsservice-1.0, gnome-common, + google-mock (>= 1.6.0+svn437), gsettings-ubuntu-schemas, autotools-dev, valac (>= 0.20), @@ -18,13 +20,22 @@ Build-Depends: debhelper (>= 9.0), libgirepository1.0-dev, libglib2.0-dev (>= 2.22.3), libgtest-dev, + libqtdbusmock1-dev (>= 0.3), + libqtdbustest1-dev, + libunity-api-dev, liburl-dispatcher1-dev, libpulse-dev (>= 1:4.0-0ubuntu21), libpulse-mainloop-glib0 (>= 0.9.18), libnotify-dev, libgee-dev, libxml2-dev, + pulseaudio, python3-dbusmock, + qt5-default, + qtbase5-dev, + qtbase5-dev-tools, + qtdeclarative5-dev, + qtdeclarative5-dev-tools, Standards-Version: 3.9.4 Homepage: https://launchpad.net/indicator-sound # If you aren't a member of ~indicator-applet-developers but need to upload diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6c621ae..73a270c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -207,5 +207,4 @@ install( RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/ ) -# Disable integration tests -# add_subdirectory(gmenuharness) +add_subdirectory(gmenuharness) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f77bcb1..adc08de 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -281,7 +281,6 @@ add_test(indcator-test indicator-test ) -# Disable integration tests -# add_subdirectory(integration) -# add_subdirectory(dbus-types) -# add_subdirectory(service-mocks) +add_subdirectory(integration) +add_subdirectory(dbus-types) +add_subdirectory(service-mocks)
\ No newline at end of file |