From 09ad5f71afadbe1215e5e4359ae72f754e133038 Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Mon, 7 Sep 2015 15:54:05 +0200 Subject: added libunity-dev to control file --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 3585713..09a2abe 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 9.0), libgirepository1.0-dev, libglib2.0-dev (>= 2.22.3), libgtest-dev, + libunity-api-dev, liburl-dispatcher1-dev, libpulse-dev (>= 1:4.0-0ubuntu21), libpulse-mainloop-glib0 (>= 0.9.18), -- cgit v1.2.3 From 348a81decd37889ad46086383f5910f12a00c3c9 Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Wed, 9 Sep 2015 09:22:16 +0200 Subject: Updated debian/control --- debian/control | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 09a2abe..f170fcf 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,13 @@ Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Conor Curran 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,6 +20,8 @@ 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), @@ -25,7 +29,13 @@ Build-Depends: debhelper (>= 9.0), 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 -- cgit v1.2.3 From 796e71b8527730ecc6c5129d15fba48fbe5dfbb8 Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Tue, 3 Nov 2015 12:46:21 +0100 Subject: Changelog modified --- debian/changelog | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b01835d..0ac0a63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,77 @@ +indicator-sound (12.10.2+15.10.20151019-0ubuntu2) UNRELEASED; urgency=medium + + * 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 + + -- Xavi Garcia Tue, 03 Nov 2015 12:29:19 +0100 + indicator-sound (12.10.2+15.10.20151019-0ubuntu1) wily; urgency=medium [ Xavi Garcia Mena ] -- cgit v1.2.3 From b7eba034a7465141a5788574e4ac536c39fd08d6 Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Tue, 3 Nov 2015 17:21:43 +0100 Subject: Disable integration tests to avoid universe dependencies --- debian/control | 11 ----------- src/CMakeLists.txt | 3 ++- tests/CMakeLists.txt | 7 ++++--- 3 files changed, 6 insertions(+), 15 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index f170fcf..3585713 100644 --- a/debian/control +++ b/debian/control @@ -5,13 +5,11 @@ Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Conor Curran 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), @@ -20,22 +18,13 @@ 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 73a270c..6c621ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -207,4 +207,5 @@ install( RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/ ) -add_subdirectory(gmenuharness) +# Disable integration tests +# add_subdirectory(gmenuharness) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index adc08de..f77bcb1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -281,6 +281,7 @@ add_test(indcator-test indicator-test ) -add_subdirectory(integration) -add_subdirectory(dbus-types) -add_subdirectory(service-mocks) \ No newline at end of file +# Disable integration tests +# add_subdirectory(integration) +# add_subdirectory(dbus-types) +# add_subdirectory(service-mocks) -- cgit v1.2.3 From a8d027ef37f2432867c99a8d1f0331014c53eeaf Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Tue, 3 Nov 2015 17:23:24 +0100 Subject: Disable integration tests to avoid universe dependencies --- debian/changelog | 67 -------------------------------------------------------- 1 file changed, 67 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0ac0a63..d7ed9bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,73 +2,6 @@ indicator-sound (12.10.2+15.10.20151019-0ubuntu2) UNRELEASED; urgency=medium * 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 -- Xavi Garcia Tue, 03 Nov 2015 12:29:19 +0100 -- cgit v1.2.3