From b1f2e733c521b83d4417c8d354aac8fcd0c4f126 Mon Sep 17 00:00:00 2001 From: Unit193 Date: Tue, 28 Jan 2014 01:00:38 -0500 Subject: Dropped Recommends to Suggests, indicator-sound isn't used to install those packages anyway, and it's highly irritating having to 'manually' update indicator-sound with --no-install-recommends on the other flavors. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 55aae86..8235ac9 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, pulseaudio, -Recommends: unity-control-center | gnome-control-center | ubuntu-system-settings, +Suggests: unity-control-center | gnome-control-center | ubuntu-system-settings, Description: System sound indicator. System sound indicator which provides easy control of the PulseAudio sound daemon. -- cgit v1.2.3 From 3da7d8735d5ee17906814ba4da61d11ab2947bd9 Mon Sep 17 00:00:00 2001 From: Unit193 Date: Tue, 28 Jan 2014 05:49:39 -0500 Subject: Revert last commit, simply add pavucontrol as another alternate. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 8235ac9..ef7d463 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, pulseaudio, -Suggests: unity-control-center | gnome-control-center | ubuntu-system-settings, +Recommends: unity-control-center | gnome-control-center | ubuntu-system-settings | pavucontrol, Description: System sound indicator. System sound indicator which provides easy control of the PulseAudio sound daemon. -- cgit v1.2.3 From 838ea79ea2ad530c8780f67503a6bd9b31777b47 Mon Sep 17 00:00:00 2001 From: CI bot Date: Fri, 7 Feb 2014 16:26:07 +0000 Subject: Releasing 12.10.2+14.04.20140207-0ubuntu1 --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index eb3fedf..4a4263f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +indicator-sound (12.10.2+14.04.20140207-0ubuntu1) trusty; urgency=low + + [ Unit193 ] + * Drop the recommends to suggests for the control centers and system + settings so that flavors that don't seed those packages aren't stuck + with them. + + [ Ted Gould ] + * Adding acceptance tests and merge review policies. + + [ CI bot ] + * Adding acceptance tests and merge review policies + + -- Ubuntu daily release Fri, 07 Feb 2014 16:26:07 +0000 + indicator-sound (12.10.2+14.04.20140124-0ubuntu1) trusty; urgency=low [ Robert Ancell ] -- cgit v1.2.3 From b5b262fd799c98abb59bf9dfde51e6d5ac6fe7fd Mon Sep 17 00:00:00 2001 From: CI bot Date: Thu, 20 Feb 2014 18:13:43 +0000 Subject: Releasing 12.10.2+14.04.20140220-0ubuntu1 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4a4263f..675a350 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +indicator-sound (12.10.2+14.04.20140220-0ubuntu1) trusty; urgency=low + + [ Lars Uebernickel ] + * Add support for amplified volumes Add a settings key "allow- + amplified-volume" which controls whether the volume slider stops at + 100% or PA_VOLUME_UI_MAX. unity-control-center will provide a ui for + this key. + + -- Ubuntu daily release Thu, 20 Feb 2014 18:13:42 +0000 + indicator-sound (12.10.2+14.04.20140207-0ubuntu1) trusty; urgency=low [ Unit193 ] -- cgit v1.2.3 From 44a6d9c161b3c8e24187790110a5b3c040bff522 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Mon, 24 Feb 2014 12:57:51 +0100 Subject: Remove the new added allow-applified key, it's moved to shared schemas, that way the other desktop components don't need to depends on indicator-sound only to read that settings --- data/com.canonical.indicator.sound.gschema.xml | 4 ---- debian/control | 1 + src/service.vala | 4 +++- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/data/com.canonical.indicator.sound.gschema.xml b/data/com.canonical.indicator.sound.gschema.xml index be759fa..102a1db 100644 --- a/data/com.canonical.indicator.sound.gschema.xml +++ b/data/com.canonical.indicator.sound.gschema.xml @@ -48,9 +48,5 @@ Whether or not to show the sound indicator in the menu bar. - - false - Whether the volume slider allows setting the volume above 100% - diff --git a/debian/control b/debian/control index ef7d463..c7b3ed8 100644 --- a/debian/control +++ b/debian/control @@ -31,6 +31,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, pulseaudio, + gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224), Recommends: unity-control-center | gnome-control-center | ubuntu-system-settings | pavucontrol, Description: System sound indicator. System sound indicator which provides easy control of the PulseAudio sound diff --git a/src/service.vala b/src/service.vala index b1b5ba9..22e5f1c 100644 --- a/src/service.vala +++ b/src/service.vala @@ -20,6 +20,7 @@ public class IndicatorSound.Service: Object { public Service () { this.settings = new Settings ("com.canonical.indicator.sound"); + this.sharedsettings = new Settings ("com.ubuntu.sound"); this.volume_control = new VolumeControl (); @@ -55,7 +56,7 @@ public class IndicatorSound.Service: Object { } } - settings.bind ("allow-amplified-volume", this, "allow-amplified-volume", SettingsBindFlags.GET); + sharedsettings.bind ("allow-amplified-volume", this, "allow-amplified-volume", SettingsBindFlags.GET); } public int run () { @@ -103,6 +104,7 @@ public class IndicatorSound.Service: Object { SimpleActionGroup actions; HashTable menus; Settings settings; + Settings sharedsettings; VolumeControl volume_control; MediaPlayerList players; uint player_action_update_id; -- cgit v1.2.3 From 1bbfa7f3988d67f1086eb79368a47fb44ce998a9 Mon Sep 17 00:00:00 2001 From: CI bot Date: Mon, 24 Feb 2014 14:33:08 +0000 Subject: Releasing 12.10.2+14.04.20140224-0ubuntu1 --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 675a350..818a735 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-sound (12.10.2+14.04.20140224-0ubuntu1) trusty; urgency=low + + [ Sebastien Bacher ] + * Remove the new added allow-applified key, it's moved to shared + schemas, that way the other desktop components don't need to depends + on indicator-sound only to read that settings + + -- Ubuntu daily release Mon, 24 Feb 2014 14:33:07 +0000 + indicator-sound (12.10.2+14.04.20140220-0ubuntu1) trusty; urgency=low [ Lars Uebernickel ] -- cgit v1.2.3