aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2016-01-06 23:28:51 -0600
committerCharles Kerr <charles.kerr@canonical.com>2016-01-06 23:28:51 -0600
commit4bc758000db7db9ff983540165a512ec112e8704 (patch)
tree37bb40bdaa58562e97c1332121073ed8d7016c8b /debian
parent6eb56e7a2ac5cd3aede5998b8a24452a7f8138d4 (diff)
parent9a861c0911ce8345f48909993249c8a74d8bfb2c (diff)
downloadayatana-indicator-sound-4bc758000db7db9ff983540165a512ec112e8704.tar.gz
ayatana-indicator-sound-4bc758000db7db9ff983540165a512ec112e8704.tar.bz2
ayatana-indicator-sound-4bc758000db7db9ff983540165a512ec112e8704.zip
sync with trunk.15.10
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog66
1 files changed, 66 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d1b8742..25f83c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,69 @@
+indicator-sound (12.10.2+16.04.20160105.2-0ubuntu1) xenial; urgency=medium
+
+ [ Xavi Garcia Mena ]
+ * Adds an action to signal the UI to sync the current volume when we
+ are waiting for the user to confirm or reject the high volume
+ notification. (LP: #1520548, #1512798)
+ * This branch just readds the OSD notifications code, that was
+ reverted in trunk as the corresponding silo was also rolled back
+ after landing.
+ * 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 (LP:
+ #1415480, #1382548, #1484589)
+
+ -- Xavi Garcia <xavi.garcia.mena@canonical.com> Tue, 05 Jan 2016 15:08:27 +0000
+
indicator-sound (12.10.2+16.04.20151223.1-0ubuntu1) xenial; urgency=medium
[ Xavi Garcia Mena ]