aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorXavi Garcia Mena <xavi.garcia.mena@canonical.com>2016-01-05 15:08:12 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2016-01-05 15:08:12 +0000
commite1feb61a02a1353b42fcd85ced8e0489c711a451 (patch)
treeb91e31644dd757bad22f2241532100f9009bad92 /debian
parent6869e11338783297c2b3fd3b4184cca1cd2d2150 (diff)
parent0eea8e8a2cee47f72292384ac856d3f68208d680 (diff)
downloadayatana-indicator-sound-e1feb61a02a1353b42fcd85ced8e0489c711a451.tar.gz
ayatana-indicator-sound-e1feb61a02a1353b42fcd85ced8e0489c711a451.tar.bz2
ayatana-indicator-sound-e1feb61a02a1353b42fcd85ced8e0489c711a451.zip
This branch re-adds the integration tests using gmenuharness.
* Added OSD notifications to show output source when the volume or source change (LP: #1382548, LP: #1415480, LP: #1484589) * 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 Approved by: Charles Kerr, Xavi Garcia
Diffstat (limited to 'debian')
-rw-r--r--debian/control11
1 files changed, 11 insertions, 0 deletions
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