From a0c4ef48ed2f9d70aada553ddf45cdabc8b696da Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 11 Feb 2010 22:11:07 -0500 Subject: Initial release --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 30 ++++++++++++++++++++++++++++++ debian/copyright | 38 ++++++++++++++++++++++++++++++++++++++ debian/rules | 17 +++++++++++++++++ debian/watch | 2 ++ 6 files changed, 93 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules create mode 100644 debian/watch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..0493a78 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +indicator-sound (0.1.0-0ubuntu1) lucid; urgency=low + + * Initial release + + -- Ken VanDine Thu, 11 Feb 2010 17:34:49 -0500 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..2a5437b --- /dev/null +++ b/debian/control @@ -0,0 +1,30 @@ +Source: indicator-sound +Section: sound +Priority: extra +Maintainer: Conor Curran +Build-Depends: debhelper (>= 7), + cdbs (>= 0.4.41), + autotools-dev, + libglib2.0-dev (>= 2.22.3), + libgtk2.0-dev (>= 2.12.0), + libdbus-glib-1-dev, + libdbusmenu-glib-dev (>= 0.2.3), + libdbusmenu-gtk-dev (>= 0.2.3) , + libindicator-dev (>= 0.3.0), + libpulse-dev (>= 0.9.18), + libpulse-mainloop-glib0 (>= 0.9.18), + libido-0.1-dev (>= 0.1.1), + libgconf2-dev +Standards-Version: 3.8.4 +Homepage: https://launchpad.net/indicator-sound + +Package: indicator-sound +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: A system sound indicator. + A system sound indicator which provides easy control of the PulseAudio sound + daemon. + + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..88327b3 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,38 @@ +This package was debianized by: + + Conor Curran on Fri, 22 Jan 2010 11:36:32 +0000 + +It was downloaded from: + + https://launchpad.net/indicator-sound + +Upstream Author(s): + + Conor Curran + +Copyright: + + Copyright (C) 2010 Canonical Ltd + +License: + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + +The Debian packaging is: + + Copyright (C) 2010 Conor Curran + +On Debian systems, the complete text of the GNU General +Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..a341f53 --- /dev/null +++ b/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +# List any files which are not installed +include /usr/share/cdbs/1/rules/utils.mk +common-binary-post-install-arch:: list-missing + +DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators + +binary-install/indicator-sound:: + # remove .a/.la clutter + rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a + rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la + diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..079f994 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/indicator-sound/+download .*/indicator-sound-([0-9.]+)\.tar\.gz -- cgit v1.2.3 From 568b18e459cb45259e5c66ce24627b0ab0053685 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 11 Feb 2010 23:03:51 -0500 Subject: backed down the version for import --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0493a78..a136070 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.1.0-0ubuntu1) lucid; urgency=low +indicator-sound (0.0.1-0ubuntu1) lucid; urgency=low * Initial release -- cgit v1.2.3 From 06130a4db21fe794051578e7ec2ffaaf267a7a15 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 11 Feb 2010 23:07:52 -0500 Subject: set UNRELEASED --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a136070..0975f2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.0.1-0ubuntu1) lucid; urgency=low +indicator-sound (0.1.0-0ubuntu1) UNRELEASED; urgency=low * Initial release -- cgit v1.2.3 From b11795d4a1b9bfa79ecaaca0ce4943e2f4f3e4a7 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 11 Feb 2010 23:15:02 -0500 Subject: merged upstream tarball --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0975f2c..0493a78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.1.0-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.1.0-0ubuntu1) lucid; urgency=low * Initial release -- cgit v1.2.3 From e4738308b1c3fe4e280ddd508fa023570b7f7300 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 11 Feb 2010 23:22:30 -0500 Subject: set to UNRELEASED --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0493a78..0975f2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.1.0-0ubuntu1) lucid; urgency=low +indicator-sound (0.1.0-0ubuntu1) UNRELEASED; urgency=low * Initial release -- cgit v1.2.3 From 4f387f6677b55d5de4a94809957ea43284099cb2 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 12 Feb 2010 11:34:47 +0100 Subject: releasing version 0.1.0-0ubuntu1 --- debian/changelog | 11 +++++++++-- debian/control | 7 ++++--- debian/rules | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0975f2c..70ec901 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,12 @@ -indicator-sound (0.1.0-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.1.0-0ubuntu1) lucid; urgency=low + * debian/control: + - depends on pulseaudio + - don't set lib section, the applet is not a library + * debian/rules: + - build using --as-needed to avoid unnecessary depends + + [ Ken VanDine ] * Initial release - -- Ken VanDine Thu, 11 Feb 2010 17:34:49 -0500 + -- Sebastien Bacher Fri, 12 Feb 2010 11:13:22 +0100 diff --git a/debian/control b/debian/control index 2a5437b..7754b96 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: indicator-sound Section: sound Priority: extra -Maintainer: Conor Curran +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Conor Curran Build-Depends: debhelper (>= 7), cdbs (>= 0.4.41), autotools-dev, @@ -20,9 +21,9 @@ Homepage: https://launchpad.net/indicator-sound Package: indicator-sound Architecture: any -Section: libs Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + pulseaudio Description: A system sound indicator. A system sound indicator which provides easy control of the PulseAudio sound daemon. diff --git a/debian/rules b/debian/rules index a341f53..0bae2ff 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk common-binary-post-install-arch:: list-missing +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators binary-install/indicator-sound:: -- cgit v1.2.3 From d3ae99a5de9c7ccb7b0100dc444401e9f79cfbd1 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 12 Feb 2010 12:22:01 +0100 Subject: the license is gpl3 not gpl3+, updated debian copyright --- debian/copyright | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 88327b3..09ddeab 100644 --- a/debian/copyright +++ b/debian/copyright @@ -18,8 +18,7 @@ License: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + the Free Software Foundation, version 3 of the License. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -- cgit v1.2.3 From 85b8b7c4505102dcf189af23ccb6f459c36e0460 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Mon, 15 Feb 2010 16:45:35 +0100 Subject: releasing version 0.1.0-0ubuntu2 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 70ec901..16d3797 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (0.1.0-0ubuntu2) lucid; urgency=low + + * Backport trunk change to fix audiosink detection and volume controls + not working for some users (lp: #521286, #521930) + + -- Sebastien Bacher Mon, 15 Feb 2010 16:44:01 +0100 + indicator-sound (0.1.0-0ubuntu1) lucid; urgency=low * debian/control: -- cgit v1.2.3 From 4c165632f829c2498c1934dca3cb2d927df0c47f Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 31 Mar 2010 17:45:42 +0200 Subject: releasing version 0.2.1-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a890502..6570713 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.2.1-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.2.1-0ubuntu1) lucid; urgency=low * New upstream release. - can't change audio using mouse wheel (LP: #521046) -- cgit v1.2.3 From 75f17bec7d4a9b0ffc4cfceeb099b014f882363f Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 17 Jun 2010 17:09:09 -0400 Subject: * debian/control - bumped build-dep version of libdbusmenu-glib-dev to (>= 0.3.1) - Added build-dep for libindicate-dev (>= 0.4.1) --- debian/changelog | 3 +++ debian/control | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a5cd64d..b0bf30e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ indicator-sound (0.3.1-0ubuntu1) UNRELEASED; urgency=low * New upstream release. + * debian/control + - bumped build-dep version of libdbusmenu-glib-dev to (>= 0.3.1) + - Added build-dep for libindicate-dev (>= 0.4.1) -- Ken VanDine Thu, 17 Jun 2010 16:50:31 -0400 diff --git a/debian/control b/debian/control index 80b4d05..aa10b82 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev (>= 2.22.3), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, - libdbusmenu-glib-dev (>= 0.2.3), + libdbusmenu-glib-dev (>= 0.3.1), libdbusmenu-gtk-dev (>= 0.2.3) , libindicator-dev (>= 0.3.6), libpulse-dev (>= 0.9.18), @@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 7), libido-0.1-dev (>= 0.1.2), libgconf2-dev, libgee-dev, - libindicate-dev, + libindicate-dev (>= 0.4.1), valac Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-sound -- cgit v1.2.3 From 1e65c770811a96d79b302dfd0ddee67a4c7c07f5 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 17 Jun 2010 23:13:09 +0200 Subject: releasing version 0.3.1-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b0bf30e..7486f6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.3.1-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.3.1-0ubuntu1) maverick; urgency=low * New upstream release. * debian/control -- cgit v1.2.3 From 309d83d0d9920636910d25f71bd203acf76de9f5 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 24 Jun 2010 21:22:30 +0200 Subject: releasing version 0.3.2-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ddc5a47..821699d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.3.2-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.3.2-0ubuntu1) maverick; urgency=low * New upstream release. - MPRIS transport status updates reflecting in UI -- cgit v1.2.3 From d42a33775a862a5fd782a7b2e765d06f7e6ff897 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Fri, 25 Jun 2010 17:51:25 +0200 Subject: releasing version 0.3.3-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 099313c..3334778 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.3.3-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.3.3-0ubuntu1) maverick; urgency=low * New upstream release. - Fixes menu flicker when playing a song with artwork -- cgit v1.2.3 From 1584af2971970dfb3484329a5307e5e770b34094 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 8 Jul 2010 19:42:27 +0200 Subject: releasing version 0.3.5-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aedb8ef..2963a0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.3.5-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.3.5-0ubuntu1) maverick; urgency=low * New upstream release: -New transport widget integrated @@ -9,7 +9,7 @@ indicator-sound (0.3.5-0ubuntu1) UNRELEASED; urgency=low cache file allowing the menu to show the application even if it has not been launched. - -- Sebastien Bacher Thu, 08 Jul 2010 19:30:26 +0200 + -- Sebastien Bacher Thu, 08 Jul 2010 19:32:29 +0200 indicator-sound (0.3.4-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From f3eae1db80ac79e7683f59cc77983722fe2c5580 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 22 Jul 2010 21:12:14 +0200 Subject: releasing version 0.3.8-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 01e98d8..82090cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-sound (0.3.8-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.3.8-0ubuntu1) maverick; urgency=low * New upstream release. * debian/control: - update ido requirement - -- Sebastien Bacher Thu, 22 Jul 2010 21:04:28 +0200 + -- Sebastien Bacher Thu, 22 Jul 2010 21:12:10 +0200 indicator-sound (0.3.6-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From 022c9bd2558d5881523d68d217c398e475a9da6e Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Mon, 2 Aug 2010 12:13:40 +0200 Subject: releasing version 0.3.9-0ubuntu2 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5b0c684..4612ce9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (0.3.9-0ubuntu2) maverick; urgency=low + + * Backport upstream commit to fix the indicator crashing when rhythmbox starts + (lp: #612299) + + -- Sebastien Bacher Mon, 02 Aug 2010 12:08:57 +0200 + indicator-sound (0.3.9-0ubuntu1) maverick; urgency=low * New upstream release. -- cgit v1.2.3 From 7e9c9ed5e67bf26226996dda674ac4e4c5b4b272 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 8 Sep 2010 12:32:42 +0200 Subject: releasing version 0.4.2-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8cb8bc3..c2d1cde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-sound (0.4.2-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.4.2-0ubuntu1) maverick; urgency=low * New upstream release fixing those issues - Media Buttons should trigger action only on button release (lp: #624610) - Mouse wheel no longer works to change volume (lp: #620858) - Crashes if Rhythmbox is playing from Last.FM (lp: #627505) - -- Sebastien Bacher Wed, 08 Sep 2010 12:24:24 +0200 + -- Sebastien Bacher Wed, 08 Sep 2010 12:32:24 +0200 indicator-sound (0.4.1-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From c3405e60d137cb2383edbc308be93f0ba4cde466 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 14 Sep 2010 21:00:04 +0200 Subject: releasing version 0.4.4-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d8357d0..7e97810 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -indicator-sound (0.4.4-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.4.4-0ubuntu1) maverick; urgency=low - * New upstream release. + * New upstream release, fix crash in gtk_range_get_value() (lp: #615277) -- Sebastien Bacher Fri, 10 Sep 2010 17:49:49 +0200 -- cgit v1.2.3 From f71758b3b9f3222bd6b6902d9d14154903c47b1b Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 11:18:03 +0200 Subject: * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3d0c335..01d56d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (0.4.7-0ubuntu2) UNRELEASED; urgency=low + + * Rebuild for libindicator ABI change (LP: #637692) + * debian/control: depends on latest libindicator-dev + + -- Didier Roche Wed, 22 Sep 2010 11:17:45 +0200 + indicator-sound (0.4.7-0ubuntu1) maverick; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 3a43379..0c4ffbb 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7), libdbus-glib-1-dev, libdbusmenu-glib-dev (>= 0.3.1), libdbusmenu-gtk-dev (>= 0.2.3) , - libindicator-dev (>= 0.3.6), + libindicator-dev (>= 0.3.14), libpulse-dev (>= 0.9.18), libpulse-mainloop-glib0 (>= 0.9.18), libido-0.1-dev (>= 0.1.11), -- cgit v1.2.3 From a913119194173092846fcd0b2491da9843a2f2be Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 18:40:27 +0200 Subject: releasing version 0.4.7-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 01d56d9..b220e02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-sound (0.4.7-0ubuntu2) UNRELEASED; urgency=low +indicator-sound (0.4.7-0ubuntu2) libindicator; urgency=low * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev - -- Didier Roche Wed, 22 Sep 2010 11:17:45 +0200 + -- Didier Roche Wed, 22 Sep 2010 18:40:25 +0200 indicator-sound (0.4.7-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From d33924b99f334d43f21e196c837cee5ce14a4304 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 19:31:38 +0200 Subject: fix dch -r --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b220e02..4df6a46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.4.7-0ubuntu2) libindicator; urgency=low +indicator-sound (0.4.7-0ubuntu2) maverick; urgency=low * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev -- cgit v1.2.3 From ce000aacc3fe96dae098fbea9bbc639e08ddf632 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 9 Dec 2010 13:08:57 -0500 Subject: releasing version 0.5.2-0ubuntu2 --- debian/changelog | 7 +++++++ debian/control | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a49266f..a762724 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (0.5.2-0ubuntu2) natty; urgency=low + + * debian/control + - Bump build depends for libdbusmenu-* to >= 0.3.90 + + -- Ken VanDine Thu, 09 Dec 2010 11:44:02 -0500 + indicator-sound (0.5.2-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 6429cfc..dab145b 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev (>= 2.22.3), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, - libdbusmenu-glib-dev (>= 0.3.1), - libdbusmenu-gtk-dev (>= 0.2.3) , + libdbusmenu-glib-dev (>= 0.3.90), + libdbusmenu-gtk-dev (>= 0.3.90) , libindicator-dev (>= 0.3.14), libpulse-dev (>= 0.9.18), libpulse-mainloop-glib0 (>= 0.9.18), -- cgit v1.2.3 From ec6b5962ff35174b341621edc7728b5ce1eaf7fd Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 17 Feb 2011 15:48:18 -0500 Subject: releasing version 0.5.9-0ubuntu2 --- debian/changelog | 13 +++++++++++++ debian/control | 7 ++++--- debian/rules | 1 + 3 files changed, 18 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0a4e6b0..284a61c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +indicator-sound (0.5.9-0ubuntu2) natty; urgency=low + + * debian/control + - bump build depends for libindicator-dev to >= 0.3.19 + - bump build depends for libdbusmenu-glib-dev to >= 0.3.97 + - added build depends on dh-autoreconf + * src/Makefile.am + - Hand Dbusmenu-Glib-0.4 rename to Dbusmenu-0.4 + * debian/rules + - include autoreconf.mk to handle the Dbusmenu rename + + -- Ken VanDine Thu, 17 Feb 2011 15:21:33 -0500 + indicator-sound (0.5.9-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index a748f0b..dd27d1c 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,9 @@ Build-Depends: debhelper (>= 7), autotools-dev, libglib2.0-dev (>= 2.22.3), libgtk2.0-dev (>= 2.12.0), - libdbusmenu-glib-dev (>= 0.3.91), + libdbusmenu-glib-dev (>= 0.3.97), libdbusmenu-gtk-dev (>= 0.3.91) , - libindicator-dev (>= 0.3.14), + libindicator-dev (>= 0.3.19), libpulse-dev (>= 0.9.18), libpulse-mainloop-glib0 (>= 0.9.18), libido-0.1-dev (>= 0.1.11), @@ -18,7 +18,8 @@ Build-Depends: debhelper (>= 7), libgee-dev, libxml2-dev, libnotify-dev, - valac-0.12 + valac-0.12, + dh-autoreconf Standards-Version: 3.9.1 Homepage: https://launchpad.net/indicator-sound diff --git a/debian/rules b/debian/rules index 0bae2ff..d778ba1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/autoreconf.mk # List any files which are not installed include /usr/share/cdbs/1/rules/utils.mk -- cgit v1.2.3 From b7b6431edc4b20512f76be9c8688e67cda01831e Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 23 Mar 2011 12:55:31 -0400 Subject: releasing version 0.6.5-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 60110de..050cd4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.6.5-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.6.5-0ubuntu1) natty; urgency=low * New upstream release. - Media player should be automatically started up when play button is -- cgit v1.2.3 From d6caaaa548a3ba7d9a82b04fcf692df62769ab62 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 15 Apr 2011 17:23:40 -0400 Subject: releasing version 0.6.6.1-0ubuntu2 --- debian/changelog | 7 +++++++ debian/patches/lp_759390.patch | 14 ++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 debian/patches/lp_759390.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2208384..9ba7e38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (0.6.6.1-0ubuntu2) natty; urgency=low + + * debian/patches/lp_759390.patch + - Sound Preferences link doesn't work in gnome3 (LP: #759390) + + -- Ken VanDine Fri, 15 Apr 2011 17:12:32 -0400 + indicator-sound (0.6.6.1-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/patches/lp_759390.patch b/debian/patches/lp_759390.patch new file mode 100644 index 0000000..5a63311 --- /dev/null +++ b/debian/patches/lp_759390.patch @@ -0,0 +1,14 @@ +=== modified file 'src/sound-service-dbus.c' +--- src/sound-service-dbus.c 2011-04-01 12:59:32 +0000 ++++ src/sound-service-dbus.c 2011-04-13 05:23:24 +0000 +@@ -200,7 +200,8 @@ + { + GError * error = NULL; + if (!g_spawn_command_line_async("gnome-volume-control --page=applications", &error) && +- !g_spawn_command_line_async("xfce4-mixer", &error)) ++ !g_spawn_command_line_async("gnome-control-center sound", &error) && ++ !g_spawn_command_line_async("xfce4-mixer", &error)) + { + g_warning("Unable to show dialog: %s", error->message); + g_error_free(error); + -- cgit v1.2.3 From 914a7600bdc7c6e9a8a7afdf165397cc05113f1a Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 18 Apr 2011 15:37:38 -0400 Subject: releasing version 0.6.6.1-0ubuntu3 --- debian/changelog | 10 ++++++++++ debian/patches/lp_750823.patch | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 debian/patches/lp_750823.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9ba7e38..054bacf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +indicator-sound (0.6.6.1-0ubuntu3) natty; urgency=low + + * debian/patches/lp_750823.patch + - Place timeout in the mpris controller to accommodate flaky mpris dbus + behaviour, it can be seen sometimes that the players emit a property + changed on the metadata property but the actual value of the property + which the service then tries to use is the old value (LP: #750823) + + -- Ken VanDine Mon, 18 Apr 2011 15:08:13 -0400 + indicator-sound (0.6.6.1-0ubuntu2) natty; urgency=low * debian/patches/lp_759390.patch diff --git a/debian/patches/lp_750823.patch b/debian/patches/lp_750823.patch new file mode 100644 index 0000000..837c183 --- /dev/null +++ b/debian/patches/lp_750823.patch @@ -0,0 +1,38 @@ +=== modified file 'src/mpris2-controller.vala' +--- src/mpris2-controller.vala 2011-03-29 10:43:34 +0000 ++++ src/mpris2-controller.vala 2011-04-18 19:02:26 +0000 +@@ -83,13 +83,7 @@ + } + Variant? meta_v = changed_properties.lookup("Metadata"); + if(meta_v != null){ +- GLib.HashTable changed_updates = clean_metadata(); +- PlayerItem metadata = this.owner.custom_items[PlayerController.widget_order.METADATA]; +- metadata.reset ( MetadataMenuitem.attributes_format()); +- metadata.update ( changed_updates, +- MetadataMenuitem.attributes_format()); +- metadata.property_set_bool ( MENUITEM_PROP_VISIBLE, +- metadata.populated(MetadataMenuitem.attributes_format())); ++ Timeout.add (300, this.ensure_correct_metadata); + } + Variant? playlist_v = changed_properties.lookup("ActivePlaylist"); + if ( playlist_v != null && this.owner.use_playlists == true ){ +@@ -113,7 +107,17 @@ + title.alter_label (this.mpris2_root.Identity); + } + } +- ++ ++ private bool ensure_correct_metadata(){ ++ GLib.HashTable changed_updates = clean_metadata(); ++ PlayerItem metadata = this.owner.custom_items[PlayerController.widget_order.METADATA]; ++ metadata.reset ( MetadataMenuitem.attributes_format()); ++ metadata.update ( changed_updates, ++ MetadataMenuitem.attributes_format()); ++ metadata.property_set_bool ( MENUITEM_PROP_VISIBLE, ++ metadata.populated(MetadataMenuitem.attributes_format())); ++ return false; ++ } + private bool ensure_correct_playback_status(){ + //debug("TEST playback status = %s", this.player.PlaybackStatus); + Transport.State p = (Transport.State)this.determine_play_state(this.player.PlaybackStatus); + -- cgit v1.2.3 From c277163e3011970526835a288749cdd12dde6c52 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 29 Jul 2011 10:22:17 -0400 Subject: * debian/rules - Moved autoreconf to the top --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index da1b8ac..6541ae5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ indicator-sound (0.7.4-0ubuntu1) UNRELEASED; urgency=low - menu resizes on reopen (LP: #809275) - pulse indication of SoundMenu play button not strong enough (LP: #742251) + * debian/rules + - Moved autoreconf to the top -- Ken VanDine Thu, 28 Jul 2011 17:12:15 -0400 diff --git a/debian/rules b/debian/rules index 2c0cbeb..dfd669b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,9 +3,9 @@ DEB_BUILDDIR = build DEB_MAKE_FLAVORS = gtk2 gtk3 +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/autoreconf.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ -- cgit v1.2.3 From 6a7027eea846bcc0c0a249f7e93fdadb407bed71 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 29 Jul 2011 13:32:37 -0400 Subject: releasing version 0.7.4.1-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5aaa50d..081977c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.7.4.1-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.7.4.1-0ubuntu1) oneiric; urgency=low * New upstream release. - menu resizes on reopen (LP: #809275) -- cgit v1.2.3 From 5701be1eed72f84cec4dff6f7c3674c1870696b9 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 10 Aug 2011 13:10:42 -0400 Subject: releasing version 0.7.5-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fba8cb1..4c919b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.7.5-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.7.5-0ubuntu1) oneiric; urgency=low * New upstream release. - Don't allow starting programs via the greeter indicators (LP: #811853) -- cgit v1.2.3 From c2e72b29865db94e4ab160dcd4b7f5c802df9cdb Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 18 Aug 2011 14:28:25 -0400 Subject: releasing version 0.7.6-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fd960ca..653c268 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.7.6-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.7.6-0ubuntu1) oneiric; urgency=low * New upstream release. - mute action crashes the panel (LP: #828114) -- cgit v1.2.3 From 732f7babd65aca54e69e3c7e7bf6510a7a4d0e55 Mon Sep 17 00:00:00 2001 From: Omer Akram Date: Mon, 28 Nov 2011 23:04:02 +0500 Subject: * debian/patches/fix-864405.patch: - Clicking on left 25% of "Pause/Play" circle clicks "Previous". (LP: #864405) --- debian/changelog | 8 ++++++++ debian/patches/fix-864405.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+) create mode 100644 debian/patches/fix-864405.patch create mode 100644 debian/patches/series (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b0f85a8..e2a0831 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-sound (0.7.9.1-0ubuntu2) precise; urgency=low + + * debian/patches/fix-864405.patch: + - Clicking on left 25% of "Pause/Play" circle clicks "Previous". + (LP: #864405) + + -- Omer Akram Mon, 28 Nov 2011 23:03:20 +0500 + indicator-sound (0.7.9.1-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/patches/fix-864405.patch b/debian/patches/fix-864405.patch new file mode 100644 index 0000000..fe78d0f --- /dev/null +++ b/debian/patches/fix-864405.patch @@ -0,0 +1,22 @@ +--- a/src/transport-widget.c 2011-09-09 12:57:51 +0000 ++++ b/src/transport-widget.c 2011-11-16 18:34:46 +0000 +@@ -561,15 +561,15 @@ + { + TransportAction event = TRANSPORT_ACTION_NO_ACTION; + +- if (x > 67 && x < 112 ++ if (x > 57 && x < 102 + && y > 12 && y < 40){ + event = TRANSPORT_ACTION_PREVIOUS; + } +- else if (x > 111 && x < 153 ++ else if (x > 101 && x < 143 + && y > 5 && y < 47){ + event = TRANSPORT_ACTION_PLAY_PAUSE; + } +- else if (x > 152 && x < 197 ++ else if (x > 142 && x < 187 + && y > 12 && y < 40){ + event = TRANSPORT_ACTION_NEXT; + } + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..911625a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-864405.patch -- cgit v1.2.3 From 5c23d138bfa80811e6c1198804dca164b608e08b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 17:17:40 -0500 Subject: * rebuild for libindicator7 * debian/rules - build with no-error=deprecated-declarations --- debian/changelog | 8 ++++++++ debian/rules | 1 + 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2d8b22f..32c27b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-sound (0.8.0.0-0ubuntu2) UNRELEASED; urgency=low + + * rebuild for libindicator7 + * debian/rules + - build with no-error=deprecated-declarations + + -- Ken VanDine Tue, 24 Jan 2012 12:58:33 -0500 + indicator-sound (0.8.0.0-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index dfd669b..f6ead0e 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,7 @@ DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 DEB_CONFIGURE_EXTRA_FLAGS = --disable-static +CFLAGS += -Wno-error=deprecated-declarations LDFLAGS += -Wl,-z,defs -Wl,--as-needed debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) -- cgit v1.2.3 From 645376ce15e97a5caca6869236aa7df82af3b1ca Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 22:20:59 -0500 Subject: * -debian/patches/disable_Werror.patch - disabled in debian/rules instead * Add lazy_init.patch: Avoid spawning notification daemon right at startup, instead initialize it lazily when actually doing a notification. Improves boot speed. (LP: #912150) * Add disable_Werror.patch: Build without -Werror, to avoid build failure due to deprecated declarations. (LP: #912160) --- debian/changelog | 14 +++++++++++++- debian/patches/lazy_init.patch | 40 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 debian/patches/lazy_init.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 32c27b6..bb1808d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,23 @@ -indicator-sound (0.8.0.0-0ubuntu2) UNRELEASED; urgency=low +indicator-sound (0.8.0.0-0ubuntu3) UNRELEASED; urgency=low * rebuild for libindicator7 * debian/rules - build with no-error=deprecated-declarations + * -debian/patches/disable_Werror.patch + - disabled in debian/rules instead -- Ken VanDine Tue, 24 Jan 2012 12:58:33 -0500 +indicator-sound (0.8.0.0-0ubuntu2) precise; urgency=low + + * Add lazy_init.patch: Avoid spawning notification daemon right at startup, + instead initialize it lazily when actually doing a notification. Improves + boot speed. (LP: #912150) + * Add disable_Werror.patch: Build without -Werror, to avoid build failure + due to deprecated declarations. (LP: #912160) + + -- Martin Pitt Thu, 05 Jan 2012 09:29:36 +0100 + indicator-sound (0.8.0.0-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/patches/lazy_init.patch b/debian/patches/lazy_init.patch new file mode 100644 index 0000000..cc0fe17 --- /dev/null +++ b/debian/patches/lazy_init.patch @@ -0,0 +1,40 @@ +Description: Avoid spawning notification daemon right at startup, instead initialize it lazily when actually doing a notification. Improves boot speed. +Bug: https://launchpad.net/bugs/912150 +Author: Martin Pitt +Forwarded: https://code.launchpad.net/~pitti/indicator-sound/lazy-notification-init/+merge/87576 + +--- a/src/sound-state-manager.c 2011-04-05 03:14:19 +0000 ++++ b/src/sound-state-manager.c 2012-01-05 08:46:07 +0000 +@@ -80,8 +80,6 @@ + + priv->settings_manager = g_settings_new("com.canonical.indicators.sound"); + +- sound_state_manager_notification_init (self); +- + sound_state_manager_prepare_state_image_names (self); + sound_state_manager_prepare_blocked_animation (self); + +@@ -134,6 +132,13 @@ + static void + sound_state_manager_notification_init (SoundStateManager* self) + { ++ static gboolean initialized = FALSE; ++ ++ /* one-time lazy initialization */ ++ if (initialized) ++ return; ++ initialized = TRUE; ++ + SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self); + + if (!notify_init(PACKAGE_NAME)) +@@ -164,6 +169,8 @@ + { + SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self); + ++ sound_state_manager_notification_init (self); ++ + if (priv->notification == NULL || + g_settings_get_boolean (priv->settings_manager, "show-notify-osd-on-scroll") == FALSE){ + return; + diff --git a/debian/patches/series b/debian/patches/series index e69de29..20dfb03 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +lazy_init.patch -- cgit v1.2.3 From 4beadce168bb0894a2bfe195a989f348007c1031 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 25 Jan 2012 10:00:26 -0500 Subject: releasing version 0.8.0.0-0ubuntu3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bb1808d..0cb0725 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.8.0.0-0ubuntu3) UNRELEASED; urgency=low +indicator-sound (0.8.0.0-0ubuntu3) precise; urgency=low * rebuild for libindicator7 * debian/rules @@ -6,7 +6,7 @@ indicator-sound (0.8.0.0-0ubuntu3) UNRELEASED; urgency=low * -debian/patches/disable_Werror.patch - disabled in debian/rules instead - -- Ken VanDine Tue, 24 Jan 2012 12:58:33 -0500 + -- Ken VanDine Wed, 25 Jan 2012 10:00:00 -0500 indicator-sound (0.8.0.0-0ubuntu2) precise; urgency=low -- cgit v1.2.3 From 46ce85550e1349998561f82146a3828cc94e311e Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 9 Feb 2012 16:49:44 -0500 Subject: releasing version 0.8.0.0-0ubuntu4 --- debian/changelog | 11 ++++ debian/control | 6 +- debian/patches/dbusmenu_05_90.patch | 109 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 + debian/patches/sound_nua.patch | 13 +++++ 5 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 debian/patches/dbusmenu_05_90.patch create mode 100644 debian/patches/sound_nua.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0cb0725..8835e39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +indicator-sound (0.8.0.0-0ubuntu4) precise; urgency=low + + * debian/patches/sound_nua.patch + - open the new sound-nua panel in gnome-control-center + * debian/patches/dbusmenu_05_90.patch + - fixed FTBFS with dbusmenu 0.5.90 + * debian/control + - bump build depends for dbusmenu to >= 0.5.90 + + -- Ken VanDine Thu, 09 Feb 2012 16:49:15 -0500 + indicator-sound (0.8.0.0-0ubuntu3) precise; urgency=low * rebuild for libindicator7 diff --git a/debian/control b/debian/control index 8dea28e..296f82e 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,9 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev (>= 2.22.3), libgtk2.0-dev (>= 2.12.0), libgtk-3-dev, - libdbusmenu-glib-dev (>= 0.3.101), - libdbusmenu-gtk-dev (>= 0.3.101), - libdbusmenu-gtk3-dev (>= 0.3.101), + libdbusmenu-glib-dev (>= 0.5.90), + libdbusmenu-gtk-dev (>= 0.5.90), + libdbusmenu-gtk3-dev (>= 0.5.90), libindicator-dev (>= 0.3.90), libindicator3-dev (>= 0.3.90), libpulse-dev (>= 0.9.18), diff --git a/debian/patches/dbusmenu_05_90.patch b/debian/patches/dbusmenu_05_90.patch new file mode 100644 index 0000000..c477c68 --- /dev/null +++ b/debian/patches/dbusmenu_05_90.patch @@ -0,0 +1,109 @@ +=== modified file 'configure.ac' +--- old/configure.ac 2012-01-13 13:43:00 +0000 ++++ new/configure.ac 2012-02-01 03:15:46 +0000 +@@ -42,7 +42,7 @@ + GTK_REQUIRED_VERSION=2.22 + GTK3_REQUIRED_VERSION=3.0 + INDICATOR_REQUIRED_VERSION=0.3.19 +-DBUSMENUGTK_REQUIRED_VERSION=0.3.101 ++DBUSMENUGTK_REQUIRED_VERSION=0.5.90 + POLKIT_REQUIRED_VERSION=0.92 + PULSE_AUDIO_REQUIRED_VERSION=0.9.19 + INDICATOR_DISPLAY_OBJECTS=0.1.11 + +=== modified file 'src/indicator-sound.c' +--- old/src/indicator-sound.c 2012-01-25 02:57:50 +0000 ++++ new/src/indicator-sound.c 2012-02-01 03:20:44 +0000 +@@ -23,11 +23,7 @@ + #include + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + #include + + #include + +=== modified file 'src/metadata-widget.h' +--- old/src/metadata-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/metadata-widget.h 2012-02-01 03:20:44 +0000 +@@ -20,11 +20,7 @@ + #define __METADATA_WIDGET_H__ + + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + + G_BEGIN_DECLS + + +=== modified file 'src/mute-widget.h' +--- old/src/mute-widget.h 2011-07-17 02:40:00 +0000 ++++ new/src/mute-widget.h 2012-02-01 03:20:44 +0000 +@@ -22,11 +22,7 @@ + #include + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + #include + + G_BEGIN_DECLS + +=== modified file 'src/transport-widget.h' +--- old/src/transport-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/transport-widget.h 2012-02-01 03:20:44 +0000 +@@ -20,11 +20,7 @@ + #define __TRANSPORT_WIDGET_H__ + + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + + #include "common-defs.h" + + +=== modified file 'src/voip-input-widget.h' +--- old/src/voip-input-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/voip-input-widget.h 2012-02-01 03:20:44 +0000 +@@ -22,11 +22,7 @@ + #include + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + + G_BEGIN_DECLS + + +=== modified file 'src/volume-widget.h' +--- old/src/volume-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/volume-widget.h 2012-02-01 03:20:44 +0000 +@@ -22,11 +22,7 @@ + #include + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + #include + + G_BEGIN_DECLS + diff --git a/debian/patches/series b/debian/patches/series index 20dfb03..424fc6e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ lazy_init.patch +sound_nua.patch +dbusmenu_05_90.patch diff --git a/debian/patches/sound_nua.patch b/debian/patches/sound_nua.patch new file mode 100644 index 0000000..4b31b61 --- /dev/null +++ b/debian/patches/sound_nua.patch @@ -0,0 +1,13 @@ +=== modified file 'src/sound-service-dbus.c' +--- old/src/sound-service-dbus.c 2011-08-10 16:58:49 +0000 ++++ new/src/sound-service-dbus.c 2012-02-09 21:32:58 +0000 +@@ -228,7 +228,7 @@ + { + GError * error = NULL; + if (!g_spawn_command_line_async("gnome-volume-control --page=applications", &error) && +- !g_spawn_command_line_async("gnome-control-center sound", &error) && ++ !g_spawn_command_line_async("gnome-control-center sound-nua", &error) && + !g_spawn_command_line_async("xfce4-mixer", &error)) + { + g_warning("Unable to show dialog: %s", error->message); + -- cgit v1.2.3 From 02b2fb58cfbb4bbe08a5d3336bab903009438325 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 14 Feb 2012 19:46:22 +0100 Subject: * debian/patches/correct_ldflags_use.patch: - typo fix in ldflags use --- debian/changelog | 2 ++ debian/patches/correct_ldflags_use.patch | 13 +++++++++++++ debian/patches/series | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 debian/patches/correct_ldflags_use.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5ea8538..96418ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ indicator-sound (0.8.1.0-0ubuntu1) UNRELEASED; urgency=low - Avoid spawning notification daemon at startup (lp: #912150) - Creation of album-art-cache folder (lp: #799383) - schema id & path are inconsistent with other indicators (lp: #914377) + * debian/patches/correct_ldflags_use.patch: + - typo fix in ldflags use -- Sebastien Bacher Tue, 14 Feb 2012 19:29:14 +0100 diff --git a/debian/patches/correct_ldflags_use.patch b/debian/patches/correct_ldflags_use.patch new file mode 100644 index 0000000..574ab4b --- /dev/null +++ b/debian/patches/correct_ldflags_use.patch @@ -0,0 +1,13 @@ +=== modified file 'indicator-sound/src/Makefile.am' +--- indicator-sound/src/Makefile.am 2012-02-14 18:41:28 +0000 ++++ indicator-sound/src/Makefile.am 2012-02-14 18:41:43 +0000 +@@ -33,7 +33,7 @@ + $(COVERAGE_CFLAGS) \ + -Wall -Werror -DG_LOG_DOMAIN=\"Indicator-Sound\" + libsoundmenu_la_LIBADD = $(APPLET_LIBS) -lm +-libsoundmenu_la_LDFLAGS = ++libsoundmenu_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + -module -avoid-version + + diff --git a/debian/patches/series b/debian/patches/series index 650058b..326ae5e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ sound_nua.patch +correct_ldflags_use.patch + -- cgit v1.2.3 From e6c06c2521abae0991acb1636766a300e66d2e19 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 14 Feb 2012 19:46:45 +0100 Subject: releasing version 0.8.1.0-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 96418ea..5273693 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.8.1.0-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.8.1.0-0ubuntu1) precise; urgency=low * New upstream release. - No easy way to turn the sound menu on/off (lp: #829648) @@ -8,7 +8,7 @@ indicator-sound (0.8.1.0-0ubuntu1) UNRELEASED; urgency=low * debian/patches/correct_ldflags_use.patch: - typo fix in ldflags use - -- Sebastien Bacher Tue, 14 Feb 2012 19:29:14 +0100 + -- Sebastien Bacher Tue, 14 Feb 2012 19:46:41 +0100 indicator-sound (0.8.0.0-0ubuntu4) precise; urgency=low -- cgit v1.2.3 From 35442241ba01a563a5295918b58878a47b644f63 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 22 Feb 2012 16:41:51 -0500 Subject: releasing version 0.8.2.0-0ubuntu1 --- debian/changelog | 6 ++++-- debian/patches/correct_ldflags_use.patch | 13 ------------- debian/patches/series | 1 - 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 debian/patches/correct_ldflags_use.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1818d0b..fd074cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.8.2.0-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.8.2.0-0ubuntu1) precise; urgency=low * New upstream release. - crashed with SIGABRT in pa_cvolume_set (LP: #900117) @@ -6,8 +6,10 @@ indicator-sound (0.8.2.0-0ubuntu1) UNRELEASED; urgency=low - album artwork misaligned and not visible (LP: #933359) - unity-panel-service crashed with SIGSEGV in transport_widget_is_selected (LP: #882109) + * -debian/patches/correct_ldflags_use.patch + - fixed upstream - -- Ken VanDine Wed, 22 Feb 2012 15:55:26 -0500 + -- Ken VanDine Wed, 22 Feb 2012 16:41:12 -0500 indicator-sound (0.8.1.0-0ubuntu1) precise; urgency=low diff --git a/debian/patches/correct_ldflags_use.patch b/debian/patches/correct_ldflags_use.patch deleted file mode 100644 index 574ab4b..0000000 --- a/debian/patches/correct_ldflags_use.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'indicator-sound/src/Makefile.am' ---- indicator-sound/src/Makefile.am 2012-02-14 18:41:28 +0000 -+++ indicator-sound/src/Makefile.am 2012-02-14 18:41:43 +0000 -@@ -33,7 +33,7 @@ - $(COVERAGE_CFLAGS) \ - -Wall -Werror -DG_LOG_DOMAIN=\"Indicator-Sound\" - libsoundmenu_la_LIBADD = $(APPLET_LIBS) -lm --libsoundmenu_la_LDFLAGS = -+libsoundmenu_la_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - -module -avoid-version - - diff --git a/debian/patches/series b/debian/patches/series index 326ae5e..ff4afad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ sound_nua.patch -correct_ldflags_use.patch -- cgit v1.2.3 From 083c2f79ff71ab984888b619b28e5109b782b35b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 2 Mar 2012 13:23:48 -0500 Subject: releasing version 0.8.3.0-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bb1b47c..4e80ecf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.8.3.0-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.8.3.0-0ubuntu1) precise; urgency=low * New upstream release. - Fixed memory corruption issue (LP: #897218) -- cgit v1.2.3 From 79dc1a84cb86027b9f031db253a333de4f1ea23f Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 16 Mar 2012 13:39:31 -0400 Subject: releasing version 0.8.3.0-0ubuntu2 --- debian/changelog | 7 +++++++ debian/patches/sound_nua.patch | 21 +++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4e80ecf..5b1e804 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (0.8.3.0-0ubuntu2) precise; urgency=low + + * debian/patches/sound_nua.patch + - Sound Settings link doesn't work in GNOME Classic (LP: #941704) + + -- Ken VanDine Fri, 16 Mar 2012 13:39:03 -0400 + indicator-sound (0.8.3.0-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/patches/sound_nua.patch b/debian/patches/sound_nua.patch index 4b31b61..97ba41b 100644 --- a/debian/patches/sound_nua.patch +++ b/debian/patches/sound_nua.patch @@ -1,13 +1,26 @@ === modified file 'src/sound-service-dbus.c' ---- old/src/sound-service-dbus.c 2011-08-10 16:58:49 +0000 -+++ new/src/sound-service-dbus.c 2012-02-09 21:32:58 +0000 -@@ -228,7 +228,7 @@ +--- old/src/sound-service-dbus.c 2012-03-02 16:34:50 +0000 ++++ new/src/sound-service-dbus.c 2012-03-16 17:24:56 +0000 +@@ -228,13 +228,20 @@ + gpointer user_data) { GError * error = NULL; ++ gchar* cmd; ++ if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity")) ++ cmd = "gnome-control-center sound-nua"; ++ else ++ cmd = "gnome-control-center sound"; ++ if (!g_spawn_command_line_async("gnome-volume-control --page=applications", &error) && - !g_spawn_command_line_async("gnome-control-center sound", &error) && -+ !g_spawn_command_line_async("gnome-control-center sound-nua", &error) && ++ !g_spawn_command_line_async(cmd, &error) && !g_spawn_command_line_async("xfce4-mixer", &error)) { g_warning("Unable to show dialog: %s", error->message); + g_error_free(error); + } ++ g_free (cmd); + } + + static void -- cgit v1.2.3 From 3f88c380d5ab042c38881dda130bb73cd53e5a4a Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 16 Mar 2012 14:05:04 -0400 Subject: releasing version 0.8.4.0-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7b28d23..7db09ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.8.4.0-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.8.4.0-0ubuntu1) precise; urgency=low * New upstream release. - indicator-sound "Choose Playlist" menu item does nothing when using @@ -11,7 +11,7 @@ indicator-sound (0.8.4.0-0ubuntu1) UNRELEASED; urgency=low - unity-panel-service at 100% cpu when opened /w rb without album cover (LP: #806848) - -- Ken VanDine Fri, 16 Mar 2012 13:50:45 -0400 + -- Ken VanDine Fri, 16 Mar 2012 14:04:30 -0400 indicator-sound (0.8.3.0-0ubuntu2) precise; urgency=low -- cgit v1.2.3 From 30fc94dfddfd6afded367a5b1398158da46333d1 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 19 Mar 2012 10:58:05 -0400 Subject: * debian/patches/sound_nua.patch - don't try to free a static string (LP: #957387) --- debian/changelog | 7 +++++++ debian/patches/sound_nua.patch | 12 +++--------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7db09ad..d9b0da6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (0.8.4.0-0ubuntu2) UNRELEASED; urgency=low + + * debian/patches/sound_nua.patch + - don't try to free a static string (LP: #957387) + + -- Ken VanDine Mon, 19 Mar 2012 10:54:55 -0400 + indicator-sound (0.8.4.0-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/patches/sound_nua.patch b/debian/patches/sound_nua.patch index 97ba41b..869ae24 100644 --- a/debian/patches/sound_nua.patch +++ b/debian/patches/sound_nua.patch @@ -1,7 +1,7 @@ === modified file 'src/sound-service-dbus.c' ---- old/src/sound-service-dbus.c 2012-03-02 16:34:50 +0000 -+++ new/src/sound-service-dbus.c 2012-03-16 17:24:56 +0000 -@@ -228,13 +228,20 @@ +--- old/src/sound-service-dbus.c 2012-03-16 17:59:34 +0000 ++++ new/src/sound-service-dbus.c 2012-03-19 14:54:30 +0000 +@@ -227,8 +227,14 @@ gpointer user_data) { GError * error = NULL; @@ -17,10 +17,4 @@ !g_spawn_command_line_async("xfce4-mixer", &error)) { g_warning("Unable to show dialog: %s", error->message); - g_error_free(error); - } -+ g_free (cmd); - } - - static void -- cgit v1.2.3 From 2f7ca45863f691c05b4dcae9d732c176cf4fdab0 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 20 Mar 2012 16:40:52 -0400 Subject: releasing version 0.8.4.1-0ubuntu2 --- debian/changelog | 7 + debian/patches/lp_945827.patch | 449 +++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 457 insertions(+), 1 deletion(-) create mode 100644 debian/patches/lp_945827.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b2f4d76..5989f02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (0.8.4.1-0ubuntu2) precise; urgency=low + + * debian/patches/lp_945827.patch + - fix for a playlist crasher (LP: #945827) + + -- Ken VanDine Tue, 20 Mar 2012 16:40:24 -0400 + indicator-sound (0.8.4.1-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/patches/lp_945827.patch b/debian/patches/lp_945827.patch new file mode 100644 index 0000000..c92ab33 --- /dev/null +++ b/debian/patches/lp_945827.patch @@ -0,0 +1,449 @@ +=== modified file 'src/metadata-widget.c' +--- old/src/metadata-widget.c 2012-03-19 14:58:53 +0000 ++++ new/src/metadata-widget.c 2012-03-20 20:19:44 +0000 +@@ -228,7 +228,7 @@ + GtkWidget* player_label; + player_label = gtk_label_new (""); + gtk_misc_set_alignment(GTK_MISC(player_label), (gfloat)0, (gfloat)0); +- gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)4); ++ gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)3); + gtk_widget_set_size_request (player_label, 150, 24); + priv->player_label = player_label; + + +=== modified file 'src/mpris2-controller.c' +--- old/src/mpris2-controller.c 2012-03-16 17:50:43 +0000 ++++ new/src/mpris2-controller.c 2012-03-20 20:25:46 +0000 +@@ -151,6 +151,7 @@ + typedef struct _PlaylistsMenuitemClass PlaylistsMenuitemClass; + #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) + typedef struct _Mpris2ControllerFetchPlaylistsData Mpris2ControllerFetchPlaylistsData; ++#define _active_playlist_container_free0(var) ((var == NULL) ? NULL : (var = (active_playlist_container_free (var), NULL))) + + struct _Mpris2Controller { + GObject parent_instance; +@@ -218,7 +219,7 @@ + void (*set_Orderings) (MprisPlaylists* self, gchar** value, int value_length1); + guint32 (*get_PlaylistCount) (MprisPlaylists* self); + void (*set_PlaylistCount) (MprisPlaylists* self, guint32 value); +- void (*get_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value); ++ ActivePlaylistContainer* (*get_ActivePlaylist) (MprisPlaylists* self); + void (*set_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value); + }; + +@@ -281,8 +282,12 @@ + PlaylistDetails* _tmp9_; + gint _tmp9__length1; + PlayerController* _tmp10_; +- gboolean _tmp11_; +- gboolean* _tmp12_; ++ GAppInfo* _tmp11_; ++ GAppInfo* _tmp12_; ++ const gchar* _tmp13_; ++ PlayerController* _tmp14_; ++ gboolean _tmp15_; ++ gboolean* _tmp16_; + GError * _inner_error_; + }; + +@@ -382,8 +387,10 @@ + static void mpris2_controller_fetch_playlists_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); + static void _vala_PlaylistDetails_array_free (PlaylistDetails* array, gint array_length); + void playlists_menuitem_update (PlaylistsMenuitem* self, PlaylistDetails* playlists, int playlists_length1); ++GAppInfo* player_controller_get_app_info (PlayerController* self); + static gboolean* _bool_dup (gboolean* self); +-void mpris_playlists_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result); ++static gboolean mpris2_controller_validate_playlists_details (Mpris2Controller* self); ++ActivePlaylistContainer* mpris_playlists_get_ActivePlaylist (MprisPlaylists* self); + void playlists_menuitem_active_playlist_update (PlaylistsMenuitem* self, PlaylistDetails* detail); + void mpris2_controller_activate_playlist (Mpris2Controller* self, const char* path); + void mpris_playlists_ActivatePlaylist (MprisPlaylists* self, const char* playlist_id, GAsyncReadyCallback _callback_, gpointer _user_data_); +@@ -580,7 +587,7 @@ + } + _tmp31_ = _tmp26_; + if (_tmp31_) { +- g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, _mpris2_controller_fetch_active_playlist_gsource_func, g_object_ref (self), g_object_unref); ++ g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _mpris2_controller_fetch_active_playlist_gsource_func, g_object_ref (self), g_object_unref); + } + _tmp32_ = changed_properties; + _tmp33_ = g_hash_table_lookup (_tmp32_, "PlaylistCount"); +@@ -1206,13 +1213,18 @@ + playlists_menuitem_update (_data_->_tmp8_, _data_->_tmp9_, _data_->_tmp9__length1); + _g_object_unref0 (_data_->playlists_item); + } else { +- g_warning ("mpris2-controller.vala:243: Playlists are on but its returning no cur" \ +-"rent_playlists"); + _data_->_tmp10_ = _data_->self->priv->_owner; +- _data_->_tmp11_ = FALSE; +- _data_->_tmp12_ = __bool_dup0 (&_data_->_tmp11_); +- _g_free0 (_data_->_tmp10_->use_playlists); +- _data_->_tmp10_->use_playlists = _data_->_tmp12_; ++ _data_->_tmp11_ = player_controller_get_app_info (_data_->_tmp10_); ++ _data_->_tmp12_ = _data_->_tmp11_; ++ _data_->_tmp13_ = NULL; ++ _data_->_tmp13_ = g_app_info_get_name (_data_->_tmp12_); ++ g_warning ("mpris2-controller.vala:243: Playlists are on but %s is returning no c" \ ++"urrent_playlists ?", _data_->_tmp13_); ++ _data_->_tmp14_ = _data_->self->priv->_owner; ++ _data_->_tmp15_ = FALSE; ++ _data_->_tmp16_ = __bool_dup0 (&_data_->_tmp15_); ++ _g_free0 (_data_->_tmp14_->use_playlists); ++ _data_->_tmp14_->use_playlists = _data_->_tmp16_; + } + _data_->current_playlists = (_vala_PlaylistDetails_array_free (_data_->current_playlists, _data_->current_playlists_length1), NULL); + if (_data_->_state_ == 0) { +@@ -1225,50 +1237,121 @@ + } + + +-static gboolean mpris2_controller_fetch_active_playlist (Mpris2Controller* self) { ++static gboolean mpris2_controller_validate_playlists_details (Mpris2Controller* self) { + gboolean result = FALSE; + MprisPlaylists* _tmp0_; +- ActivePlaylistContainer _tmp1_; +- ActivePlaylistContainer _tmp2_; +- ActivePlaylistContainer _tmp3_; ++ ActivePlaylistContainer* _tmp1_; ++ ActivePlaylistContainer* _tmp2_; ++ ActivePlaylistContainer* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; +- PlayerController* _tmp6_; +- GeeArrayList* _tmp7_; +- gpointer _tmp8_ = NULL; +- PlaylistsMenuitem* playlists_item; +- PlaylistsMenuitem* _tmp9_; +- MprisPlaylists* _tmp10_; +- ActivePlaylistContainer _tmp11_; +- ActivePlaylistContainer _tmp12_; +- ActivePlaylistContainer _tmp13_; +- PlaylistDetails* _tmp14_; +- PlaylistDetails _tmp15_; ++ MprisPlaylists* _tmp6_; ++ ActivePlaylistContainer* _tmp7_; ++ ActivePlaylistContainer* _tmp8_; ++ ActivePlaylistContainer* _tmp9_; ++ PlaylistDetails* _tmp10_; ++ gboolean _tmp11_; ++ gboolean _tmp12_ = FALSE; ++ MprisPlaylists* _tmp13_; ++ ActivePlaylistContainer* _tmp14_; ++ ActivePlaylistContainer* _tmp15_; ++ ActivePlaylistContainer* _tmp16_; ++ PlaylistDetails* _tmp17_; ++ const char* _tmp18_; ++ gboolean _tmp19_; ++ gboolean _tmp26_; + g_return_val_if_fail (self != NULL, FALSE); + _tmp0_ = self->priv->_playlists; +- mpris_playlists_get_ActivePlaylist (_tmp0_, &_tmp1_); ++ _tmp1_ = mpris_playlists_get_ActivePlaylist (_tmp0_); + _tmp2_ = _tmp1_; + _tmp3_ = _tmp2_; +- _tmp4_ = _tmp3_.valid; ++ _tmp4_ = (*_tmp3_).valid; + _tmp5_ = _tmp4_ == FALSE; +- active_playlist_container_destroy (&_tmp3_); ++ _active_playlist_container_free0 (_tmp3_); + if (_tmp5_) { + result = FALSE; + return result; + } +- _tmp6_ = self->priv->_owner; +- _tmp7_ = _tmp6_->custom_items; +- _tmp8_ = gee_abstract_list_get ((GeeAbstractList*) _tmp7_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS); +- playlists_item = IS_PLAYLISTS_MENUITEM ((PlayerItem*) _tmp8_) ? ((PlaylistsMenuitem*) ((PlayerItem*) _tmp8_)) : NULL; +- _tmp9_ = playlists_item; +- _tmp10_ = self->priv->_playlists; +- mpris_playlists_get_ActivePlaylist (_tmp10_, &_tmp11_); +- _tmp12_ = _tmp11_; +- _tmp13_ = _tmp12_; +- _tmp14_ = _tmp13_.details; +- _tmp15_ = *_tmp14_; +- playlists_menuitem_active_playlist_update (_tmp9_, &_tmp15_); +- active_playlist_container_destroy (&_tmp13_); ++ _tmp6_ = self->priv->_playlists; ++ _tmp7_ = mpris_playlists_get_ActivePlaylist (_tmp6_); ++ _tmp8_ = _tmp7_; ++ _tmp9_ = _tmp8_; ++ _tmp10_ = (*_tmp9_).details; ++ _tmp11_ = _tmp10_ == NULL; ++ _active_playlist_container_free0 (_tmp9_); ++ if (_tmp11_) { ++ result = FALSE; ++ return result; ++ } ++ _tmp13_ = self->priv->_playlists; ++ _tmp14_ = mpris_playlists_get_ActivePlaylist (_tmp13_); ++ _tmp15_ = _tmp14_; ++ _tmp16_ = _tmp15_; ++ _tmp17_ = (*_tmp16_).details; ++ _tmp18_ = (*_tmp17_).path; ++ _tmp19_ = _tmp18_ == NULL; ++ _active_playlist_container_free0 (_tmp16_); ++ if (_tmp19_) { ++ _tmp12_ = TRUE; ++ } else { ++ MprisPlaylists* _tmp20_; ++ ActivePlaylistContainer* _tmp21_; ++ ActivePlaylistContainer* _tmp22_; ++ ActivePlaylistContainer* _tmp23_; ++ PlaylistDetails* _tmp24_; ++ const gchar* _tmp25_; ++ _tmp20_ = self->priv->_playlists; ++ _tmp21_ = mpris_playlists_get_ActivePlaylist (_tmp20_); ++ _tmp22_ = _tmp21_; ++ _tmp23_ = _tmp22_; ++ _tmp24_ = (*_tmp23_).details; ++ _tmp25_ = (*_tmp24_).name; ++ _tmp12_ = _tmp25_ == NULL; ++ _active_playlist_container_free0 (_tmp23_); ++ } ++ _tmp26_ = _tmp12_; ++ if (_tmp26_) { ++ result = FALSE; ++ return result; ++ } ++ result = TRUE; ++ return result; ++} ++ ++ ++static gboolean mpris2_controller_fetch_active_playlist (Mpris2Controller* self) { ++ gboolean result = FALSE; ++ gboolean _tmp0_ = FALSE; ++ PlayerController* _tmp1_; ++ GeeArrayList* _tmp2_; ++ gpointer _tmp3_ = NULL; ++ PlaylistsMenuitem* playlists_item; ++ PlaylistsMenuitem* _tmp4_; ++ MprisPlaylists* _tmp5_; ++ ActivePlaylistContainer* _tmp6_; ++ ActivePlaylistContainer* _tmp7_; ++ ActivePlaylistContainer* _tmp8_; ++ PlaylistDetails* _tmp9_; ++ PlaylistDetails _tmp10_; ++ g_return_val_if_fail (self != NULL, FALSE); ++ _tmp0_ = mpris2_controller_validate_playlists_details (self); ++ if (_tmp0_ == FALSE) { ++ result = FALSE; ++ return result; ++ } ++ _tmp1_ = self->priv->_owner; ++ _tmp2_ = _tmp1_->custom_items; ++ _tmp3_ = gee_abstract_list_get ((GeeAbstractList*) _tmp2_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS); ++ playlists_item = IS_PLAYLISTS_MENUITEM ((PlayerItem*) _tmp3_) ? ((PlaylistsMenuitem*) ((PlayerItem*) _tmp3_)) : NULL; ++ _tmp4_ = playlists_item; ++ _tmp5_ = self->priv->_playlists; ++ _tmp6_ = mpris_playlists_get_ActivePlaylist (_tmp5_); ++ _tmp7_ = _tmp6_; ++ _tmp8_ = _tmp7_; ++ _tmp9_ = (*_tmp8_).details; ++ _tmp10_ = *_tmp9_; ++ playlists_menuitem_active_playlist_update (_tmp4_, &_tmp10_); ++ _active_playlist_container_free0 (_tmp8_); + result = FALSE; + _g_object_unref0 (playlists_item); + return result; +@@ -1298,7 +1381,7 @@ + _tmp2_ = path; + _tmp3_ = e; + _tmp4_ = _tmp3_->message; +- g_warning ("mpris2-controller.vala:264: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_); ++ g_warning ("mpris2-controller.vala:280: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_); + _g_error_free0 (e); + } + __finally13: + +=== modified file 'src/mpris2-controller.vala' +--- old/src/mpris2-controller.vala 2012-03-02 16:26:40 +0000 ++++ new/src/mpris2-controller.vala 2012-03-20 20:19:44 +0000 +@@ -92,7 +92,7 @@ + } + Variant? playlist_v = changed_properties.lookup("ActivePlaylist"); + if ( playlist_v != null && this.owner.use_playlists == true ){ +- Timeout.add (300, this.fetch_active_playlist); ++ Timeout.add (500, this.fetch_active_playlist); + } + Variant? playlist_count_v = changed_properties.lookup("PlaylistCount"); + if ( playlist_count_v != null && this.owner.use_playlists == true ){ +@@ -240,14 +240,30 @@ + playlists_item.update(current_playlists); + } + else{ +- warning(" Playlists are on but its returning no current_playlists" ); ++ warning(" Playlists are on but %s is returning no current_playlists ?", ++ this.owner.app_info.get_name()); + this.owner.use_playlists = false; + } + } + ++ private bool validate_playlists_details() ++ { ++ if (this.playlists.ActivePlaylist.valid == false){ ++ return false; ++ } ++ if (this.playlists.ActivePlaylist.details == null){ ++ return false; ++ } ++ if (this.playlists.ActivePlaylist.details.path == null || ++ this.playlists.ActivePlaylist.details.name == null){ ++ return false; ++ } ++ return true; ++ } ++ + private bool fetch_active_playlist() + { +- if (this.playlists.ActivePlaylist.valid == false){ ++ if (this.validate_playlists_details() == false){ + return false; + } + PlaylistsMenuitem playlists_item = this.owner.custom_items[PlayerController.widget_order.PLAYLISTS] as PlaylistsMenuitem; + +=== modified file 'src/mpris2-interfaces.c' +--- old/src/mpris2-interfaces.c 2012-03-16 17:59:34 +0000 ++++ new/src/mpris2-interfaces.c 2012-03-20 20:25:53 +0000 +@@ -70,6 +70,7 @@ + #define TYPE_MPRIS_PLAYLISTS_PROXY (mpris_playlists_proxy_get_type ()) + typedef GDBusProxy MprisPlaylistsProxy; + typedef GDBusProxyClass MprisPlaylistsProxyClass; ++#define _active_playlist_container_free0(var) ((var == NULL) ? NULL : (var = (active_playlist_container_free (var), NULL))) + + struct _MprisRootIface { + GTypeInterface parent_iface; +@@ -128,7 +129,7 @@ + void (*set_Orderings) (MprisPlaylists* self, gchar** value, int value_length1); + guint32 (*get_PlaylistCount) (MprisPlaylists* self); + void (*set_PlaylistCount) (MprisPlaylists* self, guint32 value); +- void (*get_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value); ++ ActivePlaylistContainer* (*get_ActivePlaylist) (MprisPlaylists* self); + void (*set_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value); + }; + +@@ -263,7 +264,7 @@ + void mpris_playlists_set_Orderings (MprisPlaylists* self, gchar** value, int value_length1); + guint32 mpris_playlists_get_PlaylistCount (MprisPlaylists* self); + void mpris_playlists_set_PlaylistCount (MprisPlaylists* self, guint32 value); +-void mpris_playlists_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result); ++ActivePlaylistContainer* mpris_playlists_get_ActivePlaylist (MprisPlaylists* self); + void mpris_playlists_set_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* value); + static void g_cclosure_user_marshal_VOID__BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); + static void mpris_playlists_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters); +@@ -276,7 +277,7 @@ + static void mpris_playlists_dbus_proxy_set_Orderings (MprisPlaylists* self, gchar** value, int value_length1); + static guint32 mpris_playlists_dbus_proxy_get_PlaylistCount (MprisPlaylists* self); + static void mpris_playlists_dbus_proxy_set_PlaylistCount (MprisPlaylists* self, guint32 value); +-static void mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result); ++static ActivePlaylistContainer* mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self); + static void mpris_playlists_dbus_proxy_set_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* value); + static void mpris_playlists_proxy_mpris_playlists_interface_init (MprisPlaylistsIface* iface); + static void _dbus_mpris_playlists_ActivatePlaylist (MprisPlaylists* self, GVariant* parameters, GDBusMethodInvocation* invocation); +@@ -1879,9 +1880,9 @@ + } + + +-void mpris_playlists_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result) { +- g_return_if_fail (self != NULL); +- MPRIS_PLAYLISTS_GET_INTERFACE (self)->get_ActivePlaylist (self, result); ++ActivePlaylistContainer* mpris_playlists_get_ActivePlaylist (MprisPlaylists* self) { ++ g_return_val_if_fail (self != NULL, NULL); ++ return MPRIS_PLAYLISTS_GET_INTERFACE (self)->get_ActivePlaylist (self); + } + + +@@ -2211,8 +2212,9 @@ + } + + +-static void mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result) { ++static ActivePlaylistContainer* mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self) { + GVariant *_inner_reply; ++ ActivePlaylistContainer* _result; + ActivePlaylistContainer _tmp39_; + GVariantIter _tmp40_; + GVariant* _tmp41_; +@@ -2233,7 +2235,7 @@ + _arguments = g_variant_builder_end (&_arguments_builder); + _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL); + if (!_reply) { +- return; ++ return NULL; + } + g_variant_get (_reply, "(v)", &_inner_reply); + g_variant_unref (_reply); +@@ -2255,9 +2257,9 @@ + g_variant_unref (_tmp47_); + _tmp39_.details = g_memdup (&_tmp43_, sizeof (PlaylistDetails)); + g_variant_unref (_tmp42_); +- *result = _tmp39_; ++ _result = g_memdup (&_tmp39_, sizeof (ActivePlaylistContainer)); + g_variant_unref (_inner_reply); +- return; ++ return _result; + } + + +@@ -2462,20 +2464,20 @@ + + + static GVariant* _dbus_mpris_playlists_get_ActivePlaylist (MprisPlaylists* self) { +- ActivePlaylistContainer result = {0}; ++ ActivePlaylistContainer* result; + GVariantBuilder _tmp62_; + GVariantBuilder _tmp63_; + GVariant* _reply; +- mpris_playlists_get_ActivePlaylist (self, &result); ++ result = mpris_playlists_get_ActivePlaylist (self); + g_variant_builder_init (&_tmp62_, G_VARIANT_TYPE_TUPLE); +- g_variant_builder_add_value (&_tmp62_, g_variant_new_boolean (result.valid)); ++ g_variant_builder_add_value (&_tmp62_, g_variant_new_boolean ((*result).valid)); + g_variant_builder_init (&_tmp63_, G_VARIANT_TYPE_TUPLE); +- g_variant_builder_add_value (&_tmp63_, g_variant_new_object_path ((*result.details).path)); +- g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*result.details).name)); +- g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*result.details).icon_path)); ++ g_variant_builder_add_value (&_tmp63_, g_variant_new_object_path ((*(*result).details).path)); ++ g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*(*result).details).name)); ++ g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*(*result).details).icon_path)); + g_variant_builder_add_value (&_tmp62_, g_variant_builder_end (&_tmp63_)); + _reply = g_variant_builder_end (&_tmp62_); +- active_playlist_container_destroy (&result); ++ _active_playlist_container_free0 (result); + return _reply; + } + +@@ -2534,7 +2536,7 @@ + + + static void _dbus_mpris_playlists_set_ActivePlaylist (MprisPlaylists* self, GVariant* _value) { +- ActivePlaylistContainer value = {0}; ++ ActivePlaylistContainer* value = NULL; + ActivePlaylistContainer _tmp67_; + GVariantIter _tmp68_; + GVariant* _tmp69_; +@@ -2561,9 +2563,9 @@ + g_variant_unref (_tmp75_); + _tmp67_.details = g_memdup (&_tmp71_, sizeof (PlaylistDetails)); + g_variant_unref (_tmp70_); +- value = _tmp67_; ++ value = g_memdup (&_tmp67_, sizeof (ActivePlaylistContainer)); + mpris_playlists_set_ActivePlaylist (self, &value); +- active_playlist_container_destroy (&value); ++ _active_playlist_container_free0 (value); + } + + + +=== modified file 'src/mpris2-interfaces.vala' +--- old/src/mpris2-interfaces.vala 2012-03-16 17:59:34 +0000 ++++ new/src/mpris2-interfaces.vala 2012-03-20 20:19:44 +0000 +@@ -65,7 +65,7 @@ + //properties + public abstract string[] Orderings{owned get; set;} + public abstract uint32 PlaylistCount{owned get; set;} +- public abstract ActivePlaylistContainer ActivePlaylist {owned get; set;} ++ public abstract ActivePlaylistContainer? ActivePlaylist {owned get; set;} + + //methods + public abstract async void ActivatePlaylist(ObjectPath playlist_id) throws IOError; + diff --git a/debian/patches/series b/debian/patches/series index ff4afad..ee53798 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ sound_nua.patch - +lp_945827.patch -- cgit v1.2.3 From a198e844b900a514a4735cb17dd21ccf6a6a85ee Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 21 Mar 2012 11:00:44 -0400 Subject: releasing version 0.8.4.1-0ubuntu3 --- debian/changelog | 7 ++ debian/patches/lp_960846.patch | 166 +++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 174 insertions(+) create mode 100644 debian/patches/lp_960846.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5989f02..e3f7318 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (0.8.4.1-0ubuntu3) precise; urgency=low + + * debian/patches/lp_960846.patch + - check that the active playlists container is not null (LP: #960846) + + -- Ken VanDine Wed, 21 Mar 2012 11:00:15 -0400 + indicator-sound (0.8.4.1-0ubuntu2) precise; urgency=low * debian/patches/lp_945827.patch diff --git a/debian/patches/lp_960846.patch b/debian/patches/lp_960846.patch new file mode 100644 index 0000000..ec8db91 --- /dev/null +++ b/debian/patches/lp_960846.patch @@ -0,0 +1,166 @@ +=== modified file 'src/mpris2-controller.vala' +Index: indicator-sound-0.8.4.1/src/mpris2-controller.vala +=================================================================== +--- indicator-sound-0.8.4.1.orig/src/mpris2-controller.vala 2012-03-21 10:53:40.041652304 -0400 ++++ indicator-sound-0.8.4.1/src/mpris2-controller.vala 2012-03-21 10:53:40.053652304 -0400 +@@ -248,6 +248,9 @@ + + private bool validate_playlists_details() + { ++ if (this.playlists.ActivePlaylist == null){ ++ return false; ++ } + if (this.playlists.ActivePlaylist.valid == false){ + return false; + } +Index: indicator-sound-0.8.4.1/src/mpris2-controller.c +=================================================================== +--- indicator-sound-0.8.4.1.orig/src/mpris2-controller.c 2012-03-21 10:53:40.037652304 -0400 ++++ indicator-sound-0.8.4.1/src/mpris2-controller.c 2012-03-21 10:54:46.433654489 -0400 +@@ -1244,73 +1244,88 @@ + ActivePlaylistContainer* _tmp2_; + ActivePlaylistContainer* _tmp3_; + gboolean _tmp4_; +- gboolean _tmp5_; +- MprisPlaylists* _tmp6_; ++ MprisPlaylists* _tmp5_; ++ ActivePlaylistContainer* _tmp6_; + ActivePlaylistContainer* _tmp7_; + ActivePlaylistContainer* _tmp8_; +- ActivePlaylistContainer* _tmp9_; +- PlaylistDetails* _tmp10_; +- gboolean _tmp11_; +- gboolean _tmp12_ = FALSE; +- MprisPlaylists* _tmp13_; ++ gboolean _tmp9_; ++ gboolean _tmp10_; ++ MprisPlaylists* _tmp11_; ++ ActivePlaylistContainer* _tmp12_; ++ ActivePlaylistContainer* _tmp13_; + ActivePlaylistContainer* _tmp14_; +- ActivePlaylistContainer* _tmp15_; +- ActivePlaylistContainer* _tmp16_; +- PlaylistDetails* _tmp17_; +- const char* _tmp18_; +- gboolean _tmp19_; +- gboolean _tmp26_; ++ PlaylistDetails* _tmp15_; ++ gboolean _tmp16_; ++ gboolean _tmp17_ = FALSE; ++ MprisPlaylists* _tmp18_; ++ ActivePlaylistContainer* _tmp19_; ++ ActivePlaylistContainer* _tmp20_; ++ ActivePlaylistContainer* _tmp21_; ++ PlaylistDetails* _tmp22_; ++ const char* _tmp23_; ++ gboolean _tmp24_; ++ gboolean _tmp31_; + g_return_val_if_fail (self != NULL, FALSE); + _tmp0_ = self->priv->_playlists; + _tmp1_ = mpris_playlists_get_ActivePlaylist (_tmp0_); + _tmp2_ = _tmp1_; + _tmp3_ = _tmp2_; +- _tmp4_ = (*_tmp3_).valid; +- _tmp5_ = _tmp4_ == FALSE; ++ _tmp4_ = _tmp3_ == NULL; + _active_playlist_container_free0 (_tmp3_); +- if (_tmp5_) { ++ if (_tmp4_) { + result = FALSE; + return result; + } +- _tmp6_ = self->priv->_playlists; +- _tmp7_ = mpris_playlists_get_ActivePlaylist (_tmp6_); ++ _tmp5_ = self->priv->_playlists; ++ _tmp6_ = mpris_playlists_get_ActivePlaylist (_tmp5_); ++ _tmp7_ = _tmp6_; + _tmp8_ = _tmp7_; +- _tmp9_ = _tmp8_; +- _tmp10_ = (*_tmp9_).details; +- _tmp11_ = _tmp10_ == NULL; +- _active_playlist_container_free0 (_tmp9_); +- if (_tmp11_) { ++ _tmp9_ = (*_tmp8_).valid; ++ _tmp10_ = _tmp9_ == FALSE; ++ _active_playlist_container_free0 (_tmp8_); ++ if (_tmp10_) { ++ result = FALSE; ++ return result; ++ } ++ _tmp11_ = self->priv->_playlists; ++ _tmp12_ = mpris_playlists_get_ActivePlaylist (_tmp11_); ++ _tmp13_ = _tmp12_; ++ _tmp14_ = _tmp13_; ++ _tmp15_ = (*_tmp14_).details; ++ _tmp16_ = _tmp15_ == NULL; ++ _active_playlist_container_free0 (_tmp14_); ++ if (_tmp16_) { + result = FALSE; + return result; + } +- _tmp13_ = self->priv->_playlists; +- _tmp14_ = mpris_playlists_get_ActivePlaylist (_tmp13_); +- _tmp15_ = _tmp14_; +- _tmp16_ = _tmp15_; +- _tmp17_ = (*_tmp16_).details; +- _tmp18_ = (*_tmp17_).path; +- _tmp19_ = _tmp18_ == NULL; +- _active_playlist_container_free0 (_tmp16_); +- if (_tmp19_) { +- _tmp12_ = TRUE; ++ _tmp18_ = self->priv->_playlists; ++ _tmp19_ = mpris_playlists_get_ActivePlaylist (_tmp18_); ++ _tmp20_ = _tmp19_; ++ _tmp21_ = _tmp20_; ++ _tmp22_ = (*_tmp21_).details; ++ _tmp23_ = (*_tmp22_).path; ++ _tmp24_ = _tmp23_ == NULL; ++ _active_playlist_container_free0 (_tmp21_); ++ if (_tmp24_) { ++ _tmp17_ = TRUE; + } else { +- MprisPlaylists* _tmp20_; +- ActivePlaylistContainer* _tmp21_; +- ActivePlaylistContainer* _tmp22_; +- ActivePlaylistContainer* _tmp23_; +- PlaylistDetails* _tmp24_; +- const gchar* _tmp25_; +- _tmp20_ = self->priv->_playlists; +- _tmp21_ = mpris_playlists_get_ActivePlaylist (_tmp20_); +- _tmp22_ = _tmp21_; +- _tmp23_ = _tmp22_; +- _tmp24_ = (*_tmp23_).details; +- _tmp25_ = (*_tmp24_).name; +- _tmp12_ = _tmp25_ == NULL; +- _active_playlist_container_free0 (_tmp23_); ++ MprisPlaylists* _tmp25_; ++ ActivePlaylistContainer* _tmp26_; ++ ActivePlaylistContainer* _tmp27_; ++ ActivePlaylistContainer* _tmp28_; ++ PlaylistDetails* _tmp29_; ++ const gchar* _tmp30_; ++ _tmp25_ = self->priv->_playlists; ++ _tmp26_ = mpris_playlists_get_ActivePlaylist (_tmp25_); ++ _tmp27_ = _tmp26_; ++ _tmp28_ = _tmp27_; ++ _tmp29_ = (*_tmp28_).details; ++ _tmp30_ = (*_tmp29_).name; ++ _tmp17_ = _tmp30_ == NULL; ++ _active_playlist_container_free0 (_tmp28_); + } +- _tmp26_ = _tmp12_; +- if (_tmp26_) { ++ _tmp31_ = _tmp17_; ++ if (_tmp31_) { + result = FALSE; + return result; + } +@@ -1381,7 +1396,7 @@ + _tmp2_ = path; + _tmp3_ = e; + _tmp4_ = _tmp3_->message; +- g_warning ("mpris2-controller.vala:280: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_); ++ g_warning ("mpris2-controller.vala:283: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_); + _g_error_free0 (e); + } + __finally13: diff --git a/debian/patches/series b/debian/patches/series index ee53798..1fa9dfb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ sound_nua.patch lp_945827.patch +lp_960846.patch -- cgit v1.2.3 From d738d091793595d86f1a2353b06bf3584b0afbf9 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 30 Mar 2012 14:07:44 -0400 Subject: releasing version 0.8.4.1-0ubuntu4 --- debian/changelog | 8 ++++++++ debian/patches/series | 1 + debian/patches/sound_xubuntu.patch | 17 +++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 debian/patches/sound_xubuntu.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e3f7318..06092a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-sound (0.8.4.1-0ubuntu4) precise; urgency=low + + * debian/patches: + - sound_xubuntu.patch: added, prefer pavucontrol over xfce4-mixer on + Xubuntu. (lp: #961745) + + -- Lionel Le Folgoc Thu, 22 Mar 2012 00:17:34 +0100 + indicator-sound (0.8.4.1-0ubuntu3) precise; urgency=low * debian/patches/lp_960846.patch diff --git a/debian/patches/series b/debian/patches/series index 1fa9dfb..19a2a69 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ sound_nua.patch +sound_xubuntu.patch lp_945827.patch lp_960846.patch diff --git a/debian/patches/sound_xubuntu.patch b/debian/patches/sound_xubuntu.patch new file mode 100644 index 0000000..bbf3db2 --- /dev/null +++ b/debian/patches/sound_xubuntu.patch @@ -0,0 +1,17 @@ +Description: Use pavucontrol on Xubuntu by default + Xfce4-mixer uses gstreamer0.10-pulseaudio, which doesn't provide full access + to all audio channels, only to 'Master'. +Author: Lionel Le Folgoc +Last-Update: 2012-03-21 + +--- indicator-sound-0.8.4.1.orig/src/sound-service-dbus.c ++++ indicator-sound-0.8.4.1/src/sound-service-dbus.c +@@ -230,6 +230,8 @@ show_sound_settings_dialog (DbusmenuMenu + gchar* cmd; + if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity")) + cmd = "gnome-control-center sound-nua"; ++ else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu")) ++ cmd = "pavucontrol"; + else + cmd = "gnome-control-center sound"; + -- cgit v1.2.3 From 314748d2f582c341b93f7353653d6eed116edee3 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 30 Mar 2012 14:45:38 -0400 Subject: releasing version 0.8.5.0-0ubuntu1 --- debian/changelog | 6 +- debian/patches/lp_945827.patch | 449 ----------------------------------------- debian/patches/lp_960846.patch | 166 --------------- debian/patches/series | 4 +- 4 files changed, 5 insertions(+), 620 deletions(-) delete mode 100644 debian/patches/lp_945827.patch delete mode 100644 debian/patches/lp_960846.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9371bd2..ffedf74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.8.5.0-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.8.5.0-0ubuntu1) precise; urgency=low * New upstream release. - Inconsistency between messaging menu and sound menu pips (LP: #933593) @@ -8,8 +8,10 @@ indicator-sound (0.8.5.0-0ubuntu1) UNRELEASED; urgency=low monitoring (LP: #965848) - minor memory leaks in blacklist handling (LP: #960578) - FIX (LP: FIX) + * -debian/patches/lp_945827.patch, debian/patches/lp_960846.patch + - dropped, merged upstream - -- Ken VanDine Fri, 30 Mar 2012 14:08:21 -0400 + -- Ken VanDine Fri, 30 Mar 2012 14:45:03 -0400 indicator-sound (0.8.4.1-0ubuntu4) precise; urgency=low diff --git a/debian/patches/lp_945827.patch b/debian/patches/lp_945827.patch deleted file mode 100644 index c92ab33..0000000 --- a/debian/patches/lp_945827.patch +++ /dev/null @@ -1,449 +0,0 @@ -=== modified file 'src/metadata-widget.c' ---- old/src/metadata-widget.c 2012-03-19 14:58:53 +0000 -+++ new/src/metadata-widget.c 2012-03-20 20:19:44 +0000 -@@ -228,7 +228,7 @@ - GtkWidget* player_label; - player_label = gtk_label_new (""); - gtk_misc_set_alignment(GTK_MISC(player_label), (gfloat)0, (gfloat)0); -- gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)4); -+ gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)3); - gtk_widget_set_size_request (player_label, 150, 24); - priv->player_label = player_label; - - -=== modified file 'src/mpris2-controller.c' ---- old/src/mpris2-controller.c 2012-03-16 17:50:43 +0000 -+++ new/src/mpris2-controller.c 2012-03-20 20:25:46 +0000 -@@ -151,6 +151,7 @@ - typedef struct _PlaylistsMenuitemClass PlaylistsMenuitemClass; - #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) - typedef struct _Mpris2ControllerFetchPlaylistsData Mpris2ControllerFetchPlaylistsData; -+#define _active_playlist_container_free0(var) ((var == NULL) ? NULL : (var = (active_playlist_container_free (var), NULL))) - - struct _Mpris2Controller { - GObject parent_instance; -@@ -218,7 +219,7 @@ - void (*set_Orderings) (MprisPlaylists* self, gchar** value, int value_length1); - guint32 (*get_PlaylistCount) (MprisPlaylists* self); - void (*set_PlaylistCount) (MprisPlaylists* self, guint32 value); -- void (*get_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value); -+ ActivePlaylistContainer* (*get_ActivePlaylist) (MprisPlaylists* self); - void (*set_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value); - }; - -@@ -281,8 +282,12 @@ - PlaylistDetails* _tmp9_; - gint _tmp9__length1; - PlayerController* _tmp10_; -- gboolean _tmp11_; -- gboolean* _tmp12_; -+ GAppInfo* _tmp11_; -+ GAppInfo* _tmp12_; -+ const gchar* _tmp13_; -+ PlayerController* _tmp14_; -+ gboolean _tmp15_; -+ gboolean* _tmp16_; - GError * _inner_error_; - }; - -@@ -382,8 +387,10 @@ - static void mpris2_controller_fetch_playlists_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); - static void _vala_PlaylistDetails_array_free (PlaylistDetails* array, gint array_length); - void playlists_menuitem_update (PlaylistsMenuitem* self, PlaylistDetails* playlists, int playlists_length1); -+GAppInfo* player_controller_get_app_info (PlayerController* self); - static gboolean* _bool_dup (gboolean* self); --void mpris_playlists_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result); -+static gboolean mpris2_controller_validate_playlists_details (Mpris2Controller* self); -+ActivePlaylistContainer* mpris_playlists_get_ActivePlaylist (MprisPlaylists* self); - void playlists_menuitem_active_playlist_update (PlaylistsMenuitem* self, PlaylistDetails* detail); - void mpris2_controller_activate_playlist (Mpris2Controller* self, const char* path); - void mpris_playlists_ActivatePlaylist (MprisPlaylists* self, const char* playlist_id, GAsyncReadyCallback _callback_, gpointer _user_data_); -@@ -580,7 +587,7 @@ - } - _tmp31_ = _tmp26_; - if (_tmp31_) { -- g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, _mpris2_controller_fetch_active_playlist_gsource_func, g_object_ref (self), g_object_unref); -+ g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _mpris2_controller_fetch_active_playlist_gsource_func, g_object_ref (self), g_object_unref); - } - _tmp32_ = changed_properties; - _tmp33_ = g_hash_table_lookup (_tmp32_, "PlaylistCount"); -@@ -1206,13 +1213,18 @@ - playlists_menuitem_update (_data_->_tmp8_, _data_->_tmp9_, _data_->_tmp9__length1); - _g_object_unref0 (_data_->playlists_item); - } else { -- g_warning ("mpris2-controller.vala:243: Playlists are on but its returning no cur" \ --"rent_playlists"); - _data_->_tmp10_ = _data_->self->priv->_owner; -- _data_->_tmp11_ = FALSE; -- _data_->_tmp12_ = __bool_dup0 (&_data_->_tmp11_); -- _g_free0 (_data_->_tmp10_->use_playlists); -- _data_->_tmp10_->use_playlists = _data_->_tmp12_; -+ _data_->_tmp11_ = player_controller_get_app_info (_data_->_tmp10_); -+ _data_->_tmp12_ = _data_->_tmp11_; -+ _data_->_tmp13_ = NULL; -+ _data_->_tmp13_ = g_app_info_get_name (_data_->_tmp12_); -+ g_warning ("mpris2-controller.vala:243: Playlists are on but %s is returning no c" \ -+"urrent_playlists ?", _data_->_tmp13_); -+ _data_->_tmp14_ = _data_->self->priv->_owner; -+ _data_->_tmp15_ = FALSE; -+ _data_->_tmp16_ = __bool_dup0 (&_data_->_tmp15_); -+ _g_free0 (_data_->_tmp14_->use_playlists); -+ _data_->_tmp14_->use_playlists = _data_->_tmp16_; - } - _data_->current_playlists = (_vala_PlaylistDetails_array_free (_data_->current_playlists, _data_->current_playlists_length1), NULL); - if (_data_->_state_ == 0) { -@@ -1225,50 +1237,121 @@ - } - - --static gboolean mpris2_controller_fetch_active_playlist (Mpris2Controller* self) { -+static gboolean mpris2_controller_validate_playlists_details (Mpris2Controller* self) { - gboolean result = FALSE; - MprisPlaylists* _tmp0_; -- ActivePlaylistContainer _tmp1_; -- ActivePlaylistContainer _tmp2_; -- ActivePlaylistContainer _tmp3_; -+ ActivePlaylistContainer* _tmp1_; -+ ActivePlaylistContainer* _tmp2_; -+ ActivePlaylistContainer* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; -- PlayerController* _tmp6_; -- GeeArrayList* _tmp7_; -- gpointer _tmp8_ = NULL; -- PlaylistsMenuitem* playlists_item; -- PlaylistsMenuitem* _tmp9_; -- MprisPlaylists* _tmp10_; -- ActivePlaylistContainer _tmp11_; -- ActivePlaylistContainer _tmp12_; -- ActivePlaylistContainer _tmp13_; -- PlaylistDetails* _tmp14_; -- PlaylistDetails _tmp15_; -+ MprisPlaylists* _tmp6_; -+ ActivePlaylistContainer* _tmp7_; -+ ActivePlaylistContainer* _tmp8_; -+ ActivePlaylistContainer* _tmp9_; -+ PlaylistDetails* _tmp10_; -+ gboolean _tmp11_; -+ gboolean _tmp12_ = FALSE; -+ MprisPlaylists* _tmp13_; -+ ActivePlaylistContainer* _tmp14_; -+ ActivePlaylistContainer* _tmp15_; -+ ActivePlaylistContainer* _tmp16_; -+ PlaylistDetails* _tmp17_; -+ const char* _tmp18_; -+ gboolean _tmp19_; -+ gboolean _tmp26_; - g_return_val_if_fail (self != NULL, FALSE); - _tmp0_ = self->priv->_playlists; -- mpris_playlists_get_ActivePlaylist (_tmp0_, &_tmp1_); -+ _tmp1_ = mpris_playlists_get_ActivePlaylist (_tmp0_); - _tmp2_ = _tmp1_; - _tmp3_ = _tmp2_; -- _tmp4_ = _tmp3_.valid; -+ _tmp4_ = (*_tmp3_).valid; - _tmp5_ = _tmp4_ == FALSE; -- active_playlist_container_destroy (&_tmp3_); -+ _active_playlist_container_free0 (_tmp3_); - if (_tmp5_) { - result = FALSE; - return result; - } -- _tmp6_ = self->priv->_owner; -- _tmp7_ = _tmp6_->custom_items; -- _tmp8_ = gee_abstract_list_get ((GeeAbstractList*) _tmp7_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS); -- playlists_item = IS_PLAYLISTS_MENUITEM ((PlayerItem*) _tmp8_) ? ((PlaylistsMenuitem*) ((PlayerItem*) _tmp8_)) : NULL; -- _tmp9_ = playlists_item; -- _tmp10_ = self->priv->_playlists; -- mpris_playlists_get_ActivePlaylist (_tmp10_, &_tmp11_); -- _tmp12_ = _tmp11_; -- _tmp13_ = _tmp12_; -- _tmp14_ = _tmp13_.details; -- _tmp15_ = *_tmp14_; -- playlists_menuitem_active_playlist_update (_tmp9_, &_tmp15_); -- active_playlist_container_destroy (&_tmp13_); -+ _tmp6_ = self->priv->_playlists; -+ _tmp7_ = mpris_playlists_get_ActivePlaylist (_tmp6_); -+ _tmp8_ = _tmp7_; -+ _tmp9_ = _tmp8_; -+ _tmp10_ = (*_tmp9_).details; -+ _tmp11_ = _tmp10_ == NULL; -+ _active_playlist_container_free0 (_tmp9_); -+ if (_tmp11_) { -+ result = FALSE; -+ return result; -+ } -+ _tmp13_ = self->priv->_playlists; -+ _tmp14_ = mpris_playlists_get_ActivePlaylist (_tmp13_); -+ _tmp15_ = _tmp14_; -+ _tmp16_ = _tmp15_; -+ _tmp17_ = (*_tmp16_).details; -+ _tmp18_ = (*_tmp17_).path; -+ _tmp19_ = _tmp18_ == NULL; -+ _active_playlist_container_free0 (_tmp16_); -+ if (_tmp19_) { -+ _tmp12_ = TRUE; -+ } else { -+ MprisPlaylists* _tmp20_; -+ ActivePlaylistContainer* _tmp21_; -+ ActivePlaylistContainer* _tmp22_; -+ ActivePlaylistContainer* _tmp23_; -+ PlaylistDetails* _tmp24_; -+ const gchar* _tmp25_; -+ _tmp20_ = self->priv->_playlists; -+ _tmp21_ = mpris_playlists_get_ActivePlaylist (_tmp20_); -+ _tmp22_ = _tmp21_; -+ _tmp23_ = _tmp22_; -+ _tmp24_ = (*_tmp23_).details; -+ _tmp25_ = (*_tmp24_).name; -+ _tmp12_ = _tmp25_ == NULL; -+ _active_playlist_container_free0 (_tmp23_); -+ } -+ _tmp26_ = _tmp12_; -+ if (_tmp26_) { -+ result = FALSE; -+ return result; -+ } -+ result = TRUE; -+ return result; -+} -+ -+ -+static gboolean mpris2_controller_fetch_active_playlist (Mpris2Controller* self) { -+ gboolean result = FALSE; -+ gboolean _tmp0_ = FALSE; -+ PlayerController* _tmp1_; -+ GeeArrayList* _tmp2_; -+ gpointer _tmp3_ = NULL; -+ PlaylistsMenuitem* playlists_item; -+ PlaylistsMenuitem* _tmp4_; -+ MprisPlaylists* _tmp5_; -+ ActivePlaylistContainer* _tmp6_; -+ ActivePlaylistContainer* _tmp7_; -+ ActivePlaylistContainer* _tmp8_; -+ PlaylistDetails* _tmp9_; -+ PlaylistDetails _tmp10_; -+ g_return_val_if_fail (self != NULL, FALSE); -+ _tmp0_ = mpris2_controller_validate_playlists_details (self); -+ if (_tmp0_ == FALSE) { -+ result = FALSE; -+ return result; -+ } -+ _tmp1_ = self->priv->_owner; -+ _tmp2_ = _tmp1_->custom_items; -+ _tmp3_ = gee_abstract_list_get ((GeeAbstractList*) _tmp2_, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLISTS); -+ playlists_item = IS_PLAYLISTS_MENUITEM ((PlayerItem*) _tmp3_) ? ((PlaylistsMenuitem*) ((PlayerItem*) _tmp3_)) : NULL; -+ _tmp4_ = playlists_item; -+ _tmp5_ = self->priv->_playlists; -+ _tmp6_ = mpris_playlists_get_ActivePlaylist (_tmp5_); -+ _tmp7_ = _tmp6_; -+ _tmp8_ = _tmp7_; -+ _tmp9_ = (*_tmp8_).details; -+ _tmp10_ = *_tmp9_; -+ playlists_menuitem_active_playlist_update (_tmp4_, &_tmp10_); -+ _active_playlist_container_free0 (_tmp8_); - result = FALSE; - _g_object_unref0 (playlists_item); - return result; -@@ -1298,7 +1381,7 @@ - _tmp2_ = path; - _tmp3_ = e; - _tmp4_ = _tmp3_->message; -- g_warning ("mpris2-controller.vala:264: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_); -+ g_warning ("mpris2-controller.vala:280: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_); - _g_error_free0 (e); - } - __finally13: - -=== modified file 'src/mpris2-controller.vala' ---- old/src/mpris2-controller.vala 2012-03-02 16:26:40 +0000 -+++ new/src/mpris2-controller.vala 2012-03-20 20:19:44 +0000 -@@ -92,7 +92,7 @@ - } - Variant? playlist_v = changed_properties.lookup("ActivePlaylist"); - if ( playlist_v != null && this.owner.use_playlists == true ){ -- Timeout.add (300, this.fetch_active_playlist); -+ Timeout.add (500, this.fetch_active_playlist); - } - Variant? playlist_count_v = changed_properties.lookup("PlaylistCount"); - if ( playlist_count_v != null && this.owner.use_playlists == true ){ -@@ -240,14 +240,30 @@ - playlists_item.update(current_playlists); - } - else{ -- warning(" Playlists are on but its returning no current_playlists" ); -+ warning(" Playlists are on but %s is returning no current_playlists ?", -+ this.owner.app_info.get_name()); - this.owner.use_playlists = false; - } - } - -+ private bool validate_playlists_details() -+ { -+ if (this.playlists.ActivePlaylist.valid == false){ -+ return false; -+ } -+ if (this.playlists.ActivePlaylist.details == null){ -+ return false; -+ } -+ if (this.playlists.ActivePlaylist.details.path == null || -+ this.playlists.ActivePlaylist.details.name == null){ -+ return false; -+ } -+ return true; -+ } -+ - private bool fetch_active_playlist() - { -- if (this.playlists.ActivePlaylist.valid == false){ -+ if (this.validate_playlists_details() == false){ - return false; - } - PlaylistsMenuitem playlists_item = this.owner.custom_items[PlayerController.widget_order.PLAYLISTS] as PlaylistsMenuitem; - -=== modified file 'src/mpris2-interfaces.c' ---- old/src/mpris2-interfaces.c 2012-03-16 17:59:34 +0000 -+++ new/src/mpris2-interfaces.c 2012-03-20 20:25:53 +0000 -@@ -70,6 +70,7 @@ - #define TYPE_MPRIS_PLAYLISTS_PROXY (mpris_playlists_proxy_get_type ()) - typedef GDBusProxy MprisPlaylistsProxy; - typedef GDBusProxyClass MprisPlaylistsProxyClass; -+#define _active_playlist_container_free0(var) ((var == NULL) ? NULL : (var = (active_playlist_container_free (var), NULL))) - - struct _MprisRootIface { - GTypeInterface parent_iface; -@@ -128,7 +129,7 @@ - void (*set_Orderings) (MprisPlaylists* self, gchar** value, int value_length1); - guint32 (*get_PlaylistCount) (MprisPlaylists* self); - void (*set_PlaylistCount) (MprisPlaylists* self, guint32 value); -- void (*get_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value); -+ ActivePlaylistContainer* (*get_ActivePlaylist) (MprisPlaylists* self); - void (*set_ActivePlaylist) (MprisPlaylists* self, ActivePlaylistContainer* value); - }; - -@@ -263,7 +264,7 @@ - void mpris_playlists_set_Orderings (MprisPlaylists* self, gchar** value, int value_length1); - guint32 mpris_playlists_get_PlaylistCount (MprisPlaylists* self); - void mpris_playlists_set_PlaylistCount (MprisPlaylists* self, guint32 value); --void mpris_playlists_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result); -+ActivePlaylistContainer* mpris_playlists_get_ActivePlaylist (MprisPlaylists* self); - void mpris_playlists_set_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* value); - static void g_cclosure_user_marshal_VOID__BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); - static void mpris_playlists_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters); -@@ -276,7 +277,7 @@ - static void mpris_playlists_dbus_proxy_set_Orderings (MprisPlaylists* self, gchar** value, int value_length1); - static guint32 mpris_playlists_dbus_proxy_get_PlaylistCount (MprisPlaylists* self); - static void mpris_playlists_dbus_proxy_set_PlaylistCount (MprisPlaylists* self, guint32 value); --static void mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result); -+static ActivePlaylistContainer* mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self); - static void mpris_playlists_dbus_proxy_set_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* value); - static void mpris_playlists_proxy_mpris_playlists_interface_init (MprisPlaylistsIface* iface); - static void _dbus_mpris_playlists_ActivatePlaylist (MprisPlaylists* self, GVariant* parameters, GDBusMethodInvocation* invocation); -@@ -1879,9 +1880,9 @@ - } - - --void mpris_playlists_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result) { -- g_return_if_fail (self != NULL); -- MPRIS_PLAYLISTS_GET_INTERFACE (self)->get_ActivePlaylist (self, result); -+ActivePlaylistContainer* mpris_playlists_get_ActivePlaylist (MprisPlaylists* self) { -+ g_return_val_if_fail (self != NULL, NULL); -+ return MPRIS_PLAYLISTS_GET_INTERFACE (self)->get_ActivePlaylist (self); - } - - -@@ -2211,8 +2212,9 @@ - } - - --static void mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self, ActivePlaylistContainer* result) { -+static ActivePlaylistContainer* mpris_playlists_dbus_proxy_get_ActivePlaylist (MprisPlaylists* self) { - GVariant *_inner_reply; -+ ActivePlaylistContainer* _result; - ActivePlaylistContainer _tmp39_; - GVariantIter _tmp40_; - GVariant* _tmp41_; -@@ -2233,7 +2235,7 @@ - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL); - if (!_reply) { -- return; -+ return NULL; - } - g_variant_get (_reply, "(v)", &_inner_reply); - g_variant_unref (_reply); -@@ -2255,9 +2257,9 @@ - g_variant_unref (_tmp47_); - _tmp39_.details = g_memdup (&_tmp43_, sizeof (PlaylistDetails)); - g_variant_unref (_tmp42_); -- *result = _tmp39_; -+ _result = g_memdup (&_tmp39_, sizeof (ActivePlaylistContainer)); - g_variant_unref (_inner_reply); -- return; -+ return _result; - } - - -@@ -2462,20 +2464,20 @@ - - - static GVariant* _dbus_mpris_playlists_get_ActivePlaylist (MprisPlaylists* self) { -- ActivePlaylistContainer result = {0}; -+ ActivePlaylistContainer* result; - GVariantBuilder _tmp62_; - GVariantBuilder _tmp63_; - GVariant* _reply; -- mpris_playlists_get_ActivePlaylist (self, &result); -+ result = mpris_playlists_get_ActivePlaylist (self); - g_variant_builder_init (&_tmp62_, G_VARIANT_TYPE_TUPLE); -- g_variant_builder_add_value (&_tmp62_, g_variant_new_boolean (result.valid)); -+ g_variant_builder_add_value (&_tmp62_, g_variant_new_boolean ((*result).valid)); - g_variant_builder_init (&_tmp63_, G_VARIANT_TYPE_TUPLE); -- g_variant_builder_add_value (&_tmp63_, g_variant_new_object_path ((*result.details).path)); -- g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*result.details).name)); -- g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*result.details).icon_path)); -+ g_variant_builder_add_value (&_tmp63_, g_variant_new_object_path ((*(*result).details).path)); -+ g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*(*result).details).name)); -+ g_variant_builder_add_value (&_tmp63_, g_variant_new_string ((*(*result).details).icon_path)); - g_variant_builder_add_value (&_tmp62_, g_variant_builder_end (&_tmp63_)); - _reply = g_variant_builder_end (&_tmp62_); -- active_playlist_container_destroy (&result); -+ _active_playlist_container_free0 (result); - return _reply; - } - -@@ -2534,7 +2536,7 @@ - - - static void _dbus_mpris_playlists_set_ActivePlaylist (MprisPlaylists* self, GVariant* _value) { -- ActivePlaylistContainer value = {0}; -+ ActivePlaylistContainer* value = NULL; - ActivePlaylistContainer _tmp67_; - GVariantIter _tmp68_; - GVariant* _tmp69_; -@@ -2561,9 +2563,9 @@ - g_variant_unref (_tmp75_); - _tmp67_.details = g_memdup (&_tmp71_, sizeof (PlaylistDetails)); - g_variant_unref (_tmp70_); -- value = _tmp67_; -+ value = g_memdup (&_tmp67_, sizeof (ActivePlaylistContainer)); - mpris_playlists_set_ActivePlaylist (self, &value); -- active_playlist_container_destroy (&value); -+ _active_playlist_container_free0 (value); - } - - - -=== modified file 'src/mpris2-interfaces.vala' ---- old/src/mpris2-interfaces.vala 2012-03-16 17:59:34 +0000 -+++ new/src/mpris2-interfaces.vala 2012-03-20 20:19:44 +0000 -@@ -65,7 +65,7 @@ - //properties - public abstract string[] Orderings{owned get; set;} - public abstract uint32 PlaylistCount{owned get; set;} -- public abstract ActivePlaylistContainer ActivePlaylist {owned get; set;} -+ public abstract ActivePlaylistContainer? ActivePlaylist {owned get; set;} - - //methods - public abstract async void ActivatePlaylist(ObjectPath playlist_id) throws IOError; - diff --git a/debian/patches/lp_960846.patch b/debian/patches/lp_960846.patch deleted file mode 100644 index ec8db91..0000000 --- a/debian/patches/lp_960846.patch +++ /dev/null @@ -1,166 +0,0 @@ -=== modified file 'src/mpris2-controller.vala' -Index: indicator-sound-0.8.4.1/src/mpris2-controller.vala -=================================================================== ---- indicator-sound-0.8.4.1.orig/src/mpris2-controller.vala 2012-03-21 10:53:40.041652304 -0400 -+++ indicator-sound-0.8.4.1/src/mpris2-controller.vala 2012-03-21 10:53:40.053652304 -0400 -@@ -248,6 +248,9 @@ - - private bool validate_playlists_details() - { -+ if (this.playlists.ActivePlaylist == null){ -+ return false; -+ } - if (this.playlists.ActivePlaylist.valid == false){ - return false; - } -Index: indicator-sound-0.8.4.1/src/mpris2-controller.c -=================================================================== ---- indicator-sound-0.8.4.1.orig/src/mpris2-controller.c 2012-03-21 10:53:40.037652304 -0400 -+++ indicator-sound-0.8.4.1/src/mpris2-controller.c 2012-03-21 10:54:46.433654489 -0400 -@@ -1244,73 +1244,88 @@ - ActivePlaylistContainer* _tmp2_; - ActivePlaylistContainer* _tmp3_; - gboolean _tmp4_; -- gboolean _tmp5_; -- MprisPlaylists* _tmp6_; -+ MprisPlaylists* _tmp5_; -+ ActivePlaylistContainer* _tmp6_; - ActivePlaylistContainer* _tmp7_; - ActivePlaylistContainer* _tmp8_; -- ActivePlaylistContainer* _tmp9_; -- PlaylistDetails* _tmp10_; -- gboolean _tmp11_; -- gboolean _tmp12_ = FALSE; -- MprisPlaylists* _tmp13_; -+ gboolean _tmp9_; -+ gboolean _tmp10_; -+ MprisPlaylists* _tmp11_; -+ ActivePlaylistContainer* _tmp12_; -+ ActivePlaylistContainer* _tmp13_; - ActivePlaylistContainer* _tmp14_; -- ActivePlaylistContainer* _tmp15_; -- ActivePlaylistContainer* _tmp16_; -- PlaylistDetails* _tmp17_; -- const char* _tmp18_; -- gboolean _tmp19_; -- gboolean _tmp26_; -+ PlaylistDetails* _tmp15_; -+ gboolean _tmp16_; -+ gboolean _tmp17_ = FALSE; -+ MprisPlaylists* _tmp18_; -+ ActivePlaylistContainer* _tmp19_; -+ ActivePlaylistContainer* _tmp20_; -+ ActivePlaylistContainer* _tmp21_; -+ PlaylistDetails* _tmp22_; -+ const char* _tmp23_; -+ gboolean _tmp24_; -+ gboolean _tmp31_; - g_return_val_if_fail (self != NULL, FALSE); - _tmp0_ = self->priv->_playlists; - _tmp1_ = mpris_playlists_get_ActivePlaylist (_tmp0_); - _tmp2_ = _tmp1_; - _tmp3_ = _tmp2_; -- _tmp4_ = (*_tmp3_).valid; -- _tmp5_ = _tmp4_ == FALSE; -+ _tmp4_ = _tmp3_ == NULL; - _active_playlist_container_free0 (_tmp3_); -- if (_tmp5_) { -+ if (_tmp4_) { - result = FALSE; - return result; - } -- _tmp6_ = self->priv->_playlists; -- _tmp7_ = mpris_playlists_get_ActivePlaylist (_tmp6_); -+ _tmp5_ = self->priv->_playlists; -+ _tmp6_ = mpris_playlists_get_ActivePlaylist (_tmp5_); -+ _tmp7_ = _tmp6_; - _tmp8_ = _tmp7_; -- _tmp9_ = _tmp8_; -- _tmp10_ = (*_tmp9_).details; -- _tmp11_ = _tmp10_ == NULL; -- _active_playlist_container_free0 (_tmp9_); -- if (_tmp11_) { -+ _tmp9_ = (*_tmp8_).valid; -+ _tmp10_ = _tmp9_ == FALSE; -+ _active_playlist_container_free0 (_tmp8_); -+ if (_tmp10_) { -+ result = FALSE; -+ return result; -+ } -+ _tmp11_ = self->priv->_playlists; -+ _tmp12_ = mpris_playlists_get_ActivePlaylist (_tmp11_); -+ _tmp13_ = _tmp12_; -+ _tmp14_ = _tmp13_; -+ _tmp15_ = (*_tmp14_).details; -+ _tmp16_ = _tmp15_ == NULL; -+ _active_playlist_container_free0 (_tmp14_); -+ if (_tmp16_) { - result = FALSE; - return result; - } -- _tmp13_ = self->priv->_playlists; -- _tmp14_ = mpris_playlists_get_ActivePlaylist (_tmp13_); -- _tmp15_ = _tmp14_; -- _tmp16_ = _tmp15_; -- _tmp17_ = (*_tmp16_).details; -- _tmp18_ = (*_tmp17_).path; -- _tmp19_ = _tmp18_ == NULL; -- _active_playlist_container_free0 (_tmp16_); -- if (_tmp19_) { -- _tmp12_ = TRUE; -+ _tmp18_ = self->priv->_playlists; -+ _tmp19_ = mpris_playlists_get_ActivePlaylist (_tmp18_); -+ _tmp20_ = _tmp19_; -+ _tmp21_ = _tmp20_; -+ _tmp22_ = (*_tmp21_).details; -+ _tmp23_ = (*_tmp22_).path; -+ _tmp24_ = _tmp23_ == NULL; -+ _active_playlist_container_free0 (_tmp21_); -+ if (_tmp24_) { -+ _tmp17_ = TRUE; - } else { -- MprisPlaylists* _tmp20_; -- ActivePlaylistContainer* _tmp21_; -- ActivePlaylistContainer* _tmp22_; -- ActivePlaylistContainer* _tmp23_; -- PlaylistDetails* _tmp24_; -- const gchar* _tmp25_; -- _tmp20_ = self->priv->_playlists; -- _tmp21_ = mpris_playlists_get_ActivePlaylist (_tmp20_); -- _tmp22_ = _tmp21_; -- _tmp23_ = _tmp22_; -- _tmp24_ = (*_tmp23_).details; -- _tmp25_ = (*_tmp24_).name; -- _tmp12_ = _tmp25_ == NULL; -- _active_playlist_container_free0 (_tmp23_); -+ MprisPlaylists* _tmp25_; -+ ActivePlaylistContainer* _tmp26_; -+ ActivePlaylistContainer* _tmp27_; -+ ActivePlaylistContainer* _tmp28_; -+ PlaylistDetails* _tmp29_; -+ const gchar* _tmp30_; -+ _tmp25_ = self->priv->_playlists; -+ _tmp26_ = mpris_playlists_get_ActivePlaylist (_tmp25_); -+ _tmp27_ = _tmp26_; -+ _tmp28_ = _tmp27_; -+ _tmp29_ = (*_tmp28_).details; -+ _tmp30_ = (*_tmp29_).name; -+ _tmp17_ = _tmp30_ == NULL; -+ _active_playlist_container_free0 (_tmp28_); - } -- _tmp26_ = _tmp12_; -- if (_tmp26_) { -+ _tmp31_ = _tmp17_; -+ if (_tmp31_) { - result = FALSE; - return result; - } -@@ -1381,7 +1396,7 @@ - _tmp2_ = path; - _tmp3_ = e; - _tmp4_ = _tmp3_->message; -- g_warning ("mpris2-controller.vala:280: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_); -+ g_warning ("mpris2-controller.vala:283: Could not activate playlist %s because %s", (const gchar*) _tmp2_, _tmp4_); - _g_error_free0 (e); - } - __finally13: diff --git a/debian/patches/series b/debian/patches/series index 19a2a69..2e365f2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ -sound_nua.patch +sound_nua.patch sound_xubuntu.patch -lp_945827.patch -lp_960846.patch -- cgit v1.2.3 From b1e8f00bdfe265bedcfed20be7396e60ed7f74ce Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 3 May 2012 16:05:57 -0700 Subject: releasing version 0.8.5.0-0ubuntu2 --- debian/changelog | 8 ++++++++ debian/patches/series | 1 + debian/patches/sound_ubuntustudio.patch | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 debian/patches/sound_ubuntustudio.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ffedf74..2b737f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-sound (0.8.5.0-0ubuntu2) precise; urgency=low + + * debian/patches: + - sound_ubuntustudio.patch: added to prefer pavucontrol as the + mixer app in Ubuntu Studio. (LP: #972749) + + -- Janne Jokitalo (astraljava) Sun, 01 Apr 2012 21:45:34 +0300 + indicator-sound (0.8.5.0-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/patches/series b/debian/patches/series index 2e365f2..6439010 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ sound_nua.patch sound_xubuntu.patch +sound_ubuntustudio.patch diff --git a/debian/patches/sound_ubuntustudio.patch b/debian/patches/sound_ubuntustudio.patch new file mode 100644 index 0000000..23d27de --- /dev/null +++ b/debian/patches/sound_ubuntustudio.patch @@ -0,0 +1,18 @@ +Description: Use pavucontrol on Ubuntu Studio by default + Xfce4-mixer uses gstreamer0.10-pulseaudio, which doesn't provide full access + to all audio channels, only to 'Master'. +Author: Lionel Le Folgoc +Author: Janne Jokitalo (astraljava) +Last-Update: 2012-04-03 + +--- indicator-sound-0.8.5.0.orig/src/sound-service-dbus.c ++++ indicator-sound-0.8.5.0/src/sound-service-dbus.c +@@ -232,6 +232,8 @@ show_sound_settings_dialog (DbusmenuMenu + cmd = "gnome-control-center sound-nua"; + else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu")) + cmd = "pavucontrol"; ++ else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "ubuntustudio")) ++ cmd = "pavucontrol"; + else + cmd = "gnome-control-center sound"; + -- cgit v1.2.3 From 0f3bf77a2c2926c8638238159f973621fef05c2c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 3 May 2012 16:07:36 -0700 Subject: * debian/patches/lp_992262.patch - fix sound indicator not working after amarok close (LP: #992262) * debian/patches/lp_902715.patch - Partial fix which sets the accessibility property on the volume slider menu item. Previously this was achieved by sending a signal on the indicator object but now it seems the way to update orca is to set/update the appropriate property on the menuitem. Orca doesn't broadcast volume updates on slider movement but at least it updates when the user moves to the item on the menu, previously it was entirely silent. (LP: #902715) --- debian/changelog | 15 ++ debian/patches/lp_902715.patch | 50 ++++++ debian/patches/lp_992262.patch | 365 +++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 + 4 files changed, 432 insertions(+) create mode 100644 debian/patches/lp_902715.patch create mode 100644 debian/patches/lp_992262.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2b737f4..e03fc0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +indicator-sound (0.8.5.0-0ubuntu3) UNRELEASED; urgency=low + + * debian/patches/lp_992262.patch + - fix sound indicator not working after amarok close (LP: #992262) + * debian/patches/lp_902715.patch + - Partial fix which sets the accessibility property on the volume + slider menu item. Previously this was achieved by sending a signal + on the indicator object but now it seems the way to update orca is + to set/update the appropriate property on the menuitem. Orca doesn't + broadcast volume updates on slider movement but at least it updates + when the user moves to the item on the menu, previously it was entirely + silent. (LP: #902715) + + -- Ken VanDine Thu, 03 May 2012 16:07:19 -0700 + indicator-sound (0.8.5.0-0ubuntu2) precise; urgency=low * debian/patches: diff --git a/debian/patches/lp_902715.patch b/debian/patches/lp_902715.patch new file mode 100644 index 0000000..0de01db --- /dev/null +++ b/debian/patches/lp_902715.patch @@ -0,0 +1,50 @@ +=== modified file 'src/volume-widget.c' +--- old/src/volume-widget.c 2012-03-19 14:58:53 +0000 ++++ new/src/volume-widget.c 2012-05-03 22:11:10 +0000 +@@ -135,16 +135,28 @@ + + if(g_ascii_strcasecmp(DBUSMENU_VOLUME_MENUITEM_LEVEL, property) == 0){ + g_return_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE_DOUBLE) ); ++ gdouble update = g_variant_get_double (value); ++ + if(priv->grabbed == FALSE){ + GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider); + GtkRange *range = (GtkRange*)slider; +- gdouble update = g_variant_get_double (value); + gtk_range_set_value(range, update); + /* + g_debug ("volume-widget::volume_widget_property_update - volume - value %f", update); +-*/ +- update_accessible_desc(priv->indicator); ++ AtkObject* atk_object; ++ atk_object = gtk_widget_get_accessible (priv->ido_volume_slider); ++ if (atk_object != NULL){ ++ atk_object_set_name (atk_object, desc); ++ ++ }*/ + } ++ gchar* desc = g_strdup_printf(_("Volume (%'.0f%%)"), ++ update); ++ dbusmenu_menuitem_property_set (priv->twin_item, ++ DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC, ++ desc); ++ g_free (desc); ++ update_accessible_desc(priv->indicator); + } + else if(g_ascii_strcasecmp(DBUSMENU_VOLUME_MENUITEM_MUTE, property) == 0){ + g_return_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN)); +@@ -196,6 +208,13 @@ + initial_level = 0; + } + gtk_range_set_value(range, initial_level); ++ gchar* desc = g_strdup_printf(_("Volume (%'.0f%%)"), ++ initial_level); ++ dbusmenu_menuitem_property_set (priv->twin_item, ++ DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC, ++ desc); ++ g_free (desc); ++ + } + + static gboolean + diff --git a/debian/patches/lp_992262.patch b/debian/patches/lp_992262.patch new file mode 100644 index 0000000..783128b --- /dev/null +++ b/debian/patches/lp_992262.patch @@ -0,0 +1,365 @@ +=== modified file 'src/music-player-bridge.vala' +--- old/src/music-player-bridge.vala 2012-03-30 18:08:19 +0000 ++++ new/src/music-player-bridge.vala 2012-05-03 22:11:10 +0000 +@@ -163,7 +163,6 @@ + } + + var mpris_key = determine_key ( desktop ); +- // Are we sure clients will appear like this with the new registration method in place. + if ( this.registered_clients.has_key (mpris_key) == false ){ + debug("New client has registered that we have not seen before: %s", dbus_name ); + PlayerController ctrl = new PlayerController ( this.root_menu, +@@ -189,14 +188,14 @@ + + public void client_has_vanished ( string mpris_root_interface ) + { +- debug("MusicPlayerBridge -> client with dbus interface %s has vanished", ++ debug("\n MusicPlayerBridge -> client with dbus interface %s has vanished", + mpris_root_interface ); + if (root_menu != null){ +- debug("attempt to remove %s", mpris_root_interface); ++ debug("\n attempt to remove %s", mpris_root_interface); + var mpris_key = determine_key ( mpris_root_interface ); + if ( mpris_key != null && this.registered_clients.has_key(mpris_key)){ + registered_clients[mpris_key].hibernate(); +- debug("Successively offlined client %s", mpris_key); ++ debug("\n Successively offlined client %s", mpris_key); + } + } + } +@@ -279,15 +278,21 @@ + */ + private static string? determine_key(owned string desktop_or_interface) + { ++ // handle the special case of amarok, (kde4-amarok desktop file name) ++ if (desktop_or_interface.contains("amarok")){ ++ return "amarok"; ++ } ++ + var result = desktop_or_interface; ++ + var tokens = desktop_or_interface.split( "." ); + if (tokens != null && tokens.length > 1){ + result = tokens[tokens.length - 1]; +- } ++ } + var temp = result.split("-"); + if (temp != null && temp.length > 1){ + result = temp[0]; +- } ++ } + return result; + } + + +=== modified file 'src/music-player-bridge.c' +--- old/src/music-player-bridge.c 2012-03-30 18:12:41 +0000 ++++ new/src/music-player-bridge.c 2012-05-03 22:27:11 +0000 +@@ -798,7 +798,7 @@ + GAppInfo* _tmp43_; + const gchar* _tmp44_; + _tmp26_ = dbus_name; +- g_debug ("music-player-bridge.vala:168: New client has registered that we have n" \ ++ g_debug ("music-player-bridge.vala:167: New client has registered that we have n" \ + "ot seen before: %s", _tmp26_); + _tmp27_ = self->priv->root_menu; + _tmp28_ = app_info; +@@ -817,7 +817,7 @@ + _tmp39_ = ctrl; + gee_abstract_map_set ((GeeAbstractMap*) _tmp37_, _tmp38_, _tmp39_); + _tmp40_ = desktop; +- g_debug ("music-player-bridge.vala:177: Have not seen this %s before, new contro" \ ++ g_debug ("music-player-bridge.vala:176: Have not seen this %s before, new contro" \ + "ller created.", _tmp40_); + _tmp41_ = self->priv->settings_manager; + _tmp42_ = desktop; +@@ -825,7 +825,7 @@ + _tmp43_ = app_info; + _tmp44_ = mpris_key; + music_player_bridge_establish_file_monitoring (self, _tmp43_, _tmp44_); +- g_debug ("music-player-bridge.vala:180: application added to the interested list"); ++ g_debug ("music-player-bridge.vala:179: application added to the interested list"); + _g_object_unref0 (ctrl); + } else { + GeeHashMap* _tmp45_; +@@ -873,7 +873,7 @@ + _tmp61_ = use_playlists; + _tmp62_ = bool_to_string (_tmp61_); + _tmp63_ = _tmp62_; +- g_debug ("music-player-bridge.vala:186: Application has already registered - awa" \ ++ g_debug ("music-player-bridge.vala:185: Application has already registered - awa" \ + "ken the hibernation: %s with playlists %s \n", _tmp60_, _tmp63_); + _g_free0 (_tmp63_); + } +@@ -888,8 +888,8 @@ + g_return_if_fail (self != NULL); + g_return_if_fail (mpris_root_interface != NULL); + _tmp0_ = mpris_root_interface; +- g_debug ("music-player-bridge.vala:192: MusicPlayerBridge -> client with dbus in" \ +-"terface %s has vanished", _tmp0_); ++ g_debug ("music-player-bridge.vala:191: \n" \ ++" MusicPlayerBridge -> client with dbus interface %s has vanished", _tmp0_); + _tmp1_ = self->priv->root_menu; + if (_tmp1_ != NULL) { + const gchar* _tmp2_; +@@ -901,7 +901,7 @@ + const gchar* _tmp7_; + gboolean _tmp11_; + _tmp2_ = mpris_root_interface; +- g_debug ("music-player-bridge.vala:195: attempt to remove %s", _tmp2_); ++ g_debug ("music-player-bridge.vala:194: \n attempt to remove %s", _tmp2_); + _tmp3_ = mpris_root_interface; + _tmp4_ = g_strdup (_tmp3_); + _tmp5_ = music_player_bridge_determine_key (_tmp4_); +@@ -932,7 +932,7 @@ + player_controller_hibernate (_tmp15_); + _g_object_unref0 (_tmp15_); + _tmp16_ = mpris_key; +- g_debug ("music-player-bridge.vala:199: Successively offlined client %s", _tmp16_); ++ g_debug ("music-player-bridge.vala:198: \n Successively offlined client %s", _tmp16_); + } + _g_free0 (mpris_key); + } +@@ -998,7 +998,7 @@ + if (_tmp5_ == FALSE) { + const gchar* _tmp6_; + _tmp6_ = desktop_id; +- g_warning ("music-player-bridge.vala:218: we don't have a client with desktop id %" \ ++ g_warning ("music-player-bridge.vala:217: we don't have a client with desktop id %" \ + "s registered", _tmp6_); + _g_free0 (mpris_key); + return; +@@ -1040,7 +1040,7 @@ + if (_tmp5_ == FALSE) { + const gchar* _tmp6_; + _tmp6_ = desktop_id; +- g_warning ("music-player-bridge.vala:229: we don't have a client with desktop id %" \ ++ g_warning ("music-player-bridge.vala:228: we don't have a client with desktop id %" \ + "s registered", _tmp6_); + _g_free0 (mpris_key); + return; +@@ -1083,7 +1083,7 @@ + if (_tmp5_) { + const gchar* _tmp6_; + _tmp6_ = desktop; +- g_warning ("music-player-bridge.vala:239: Could not create a desktopappinfo instan" \ ++ g_warning ("music-player-bridge.vala:238: Could not create a desktopappinfo instan" \ + "ce from app: %s", _tmp6_); + result = NULL; + _g_object_unref0 (info); +@@ -1147,7 +1147,7 @@ + GError* _error_ = NULL; + _error_ = _inner_error_; + _inner_error_ = NULL; +- g_warning ("music-player-bridge.vala:255: Error loading keyfile - FileError"); ++ g_warning ("music-player-bridge.vala:254: Error loading keyfile - FileError"); + result = NULL; + _g_error_free0 (_error_); + _g_key_file_free0 (desktop_keyfile); +@@ -1160,7 +1160,7 @@ + GError* _error_ = NULL; + _error_ = _inner_error_; + _inner_error_ = NULL; +- g_warning ("music-player-bridge.vala:259: Error loading keyfile - KeyFileError"); ++ g_warning ("music-player-bridge.vala:258: Error loading keyfile - KeyFileError"); + result = NULL; + _g_error_free0 (_error_); + _g_key_file_free0 (desktop_keyfile); +@@ -1203,7 +1203,7 @@ + GError* _error_ = NULL; + _error_ = _inner_error_; + _inner_error_ = NULL; +- g_warning ("music-player-bridge.vala:268: Error trying to fetch the icon name from" \ ++ g_warning ("music-player-bridge.vala:267: Error trying to fetch the icon name from" \ + " the keyfile"); + result = NULL; + _g_error_free0 (_error_); +@@ -1220,96 +1220,120 @@ + } + + ++static gboolean string_contains (const gchar* self, const gchar* needle) { ++ gboolean result = FALSE; ++ const gchar* _tmp0_; ++ gchar* _tmp1_ = NULL; ++ g_return_val_if_fail (self != NULL, FALSE); ++ g_return_val_if_fail (needle != NULL, FALSE); ++ _tmp0_ = needle; ++ _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); ++ result = _tmp1_ != NULL; ++ return result; ++} ++ ++ + static gchar* music_player_bridge_determine_key (gchar* desktop_or_interface) { + gchar* result = NULL; + const gchar* _tmp0_; +- gchar* _tmp1_; ++ gboolean _tmp1_ = FALSE; ++ const gchar* _tmp3_; ++ gchar* _tmp4_; + gchar* _result_; +- const gchar* _tmp2_; +- gchar** _tmp3_; +- gchar** _tmp4_ = NULL; ++ const gchar* _tmp5_; ++ gchar** _tmp6_; ++ gchar** _tmp7_ = NULL; + gchar** tokens; + gint tokens_length1; + gint _tokens_size_; +- gboolean _tmp5_ = FALSE; +- gchar** _tmp6_; +- gint _tmp6__length1; +- gboolean _tmp8_; +- const gchar* _tmp13_; +- gchar** _tmp14_; +- gchar** _tmp15_ = NULL; ++ gboolean _tmp8_ = FALSE; ++ gchar** _tmp9_; ++ gint _tmp9__length1; ++ gboolean _tmp11_; ++ const gchar* _tmp16_; ++ gchar** _tmp17_; ++ gchar** _tmp18_ = NULL; + gchar** temp; + gint temp_length1; + gint _temp_size_; +- gboolean _tmp16_ = FALSE; +- gchar** _tmp17_; +- gint _tmp17__length1; +- gboolean _tmp19_; ++ gboolean _tmp19_ = FALSE; ++ gchar** _tmp20_; ++ gint _tmp20__length1; ++ gboolean _tmp22_; + g_return_val_if_fail (desktop_or_interface != NULL, NULL); + _tmp0_ = desktop_or_interface; +- _tmp1_ = g_strdup (_tmp0_); +- _result_ = _tmp1_; +- _tmp2_ = desktop_or_interface; +- _tmp4_ = _tmp3_ = g_strsplit (_tmp2_, ".", 0); +- tokens = _tmp4_; +- tokens_length1 = _vala_array_length (_tmp3_); ++ _tmp1_ = string_contains (_tmp0_, "amarok"); ++ if (_tmp1_) { ++ gchar* _tmp2_; ++ _tmp2_ = g_strdup ("amarok"); ++ result = _tmp2_; ++ _g_free0 (desktop_or_interface); ++ return result; ++ } ++ _tmp3_ = desktop_or_interface; ++ _tmp4_ = g_strdup (_tmp3_); ++ _result_ = _tmp4_; ++ _tmp5_ = desktop_or_interface; ++ _tmp7_ = _tmp6_ = g_strsplit (_tmp5_, ".", 0); ++ tokens = _tmp7_; ++ tokens_length1 = _vala_array_length (_tmp6_); + _tokens_size_ = tokens_length1; +- _tmp6_ = tokens; +- _tmp6__length1 = tokens_length1; +- if (_tmp6_ != NULL) { +- gchar** _tmp7_; +- gint _tmp7__length1; +- _tmp7_ = tokens; +- _tmp7__length1 = tokens_length1; +- _tmp5_ = _tmp7__length1 > 1; +- } else { +- _tmp5_ = FALSE; +- } +- _tmp8_ = _tmp5_; +- if (_tmp8_) { +- gchar** _tmp9_; +- gint _tmp9__length1; ++ _tmp9_ = tokens; ++ _tmp9__length1 = tokens_length1; ++ if (_tmp9_ != NULL) { + gchar** _tmp10_; + gint _tmp10__length1; +- const gchar* _tmp11_; +- gchar* _tmp12_; +- _tmp9_ = tokens; +- _tmp9__length1 = tokens_length1; + _tmp10_ = tokens; + _tmp10__length1 = tokens_length1; +- _tmp11_ = _tmp9_[_tmp10__length1 - 1]; +- _tmp12_ = g_strdup (_tmp11_); ++ _tmp8_ = _tmp10__length1 > 1; ++ } else { ++ _tmp8_ = FALSE; ++ } ++ _tmp11_ = _tmp8_; ++ if (_tmp11_) { ++ gchar** _tmp12_; ++ gint _tmp12__length1; ++ gchar** _tmp13_; ++ gint _tmp13__length1; ++ const gchar* _tmp14_; ++ gchar* _tmp15_; ++ _tmp12_ = tokens; ++ _tmp12__length1 = tokens_length1; ++ _tmp13_ = tokens; ++ _tmp13__length1 = tokens_length1; ++ _tmp14_ = _tmp12_[_tmp13__length1 - 1]; ++ _tmp15_ = g_strdup (_tmp14_); + _g_free0 (_result_); +- _result_ = _tmp12_; ++ _result_ = _tmp15_; + } +- _tmp13_ = _result_; +- _tmp15_ = _tmp14_ = g_strsplit (_tmp13_, "-", 0); +- temp = _tmp15_; +- temp_length1 = _vala_array_length (_tmp14_); ++ _tmp16_ = _result_; ++ _tmp18_ = _tmp17_ = g_strsplit (_tmp16_, "-", 0); ++ temp = _tmp18_; ++ temp_length1 = _vala_array_length (_tmp17_); + _temp_size_ = temp_length1; +- _tmp17_ = temp; +- _tmp17__length1 = temp_length1; +- if (_tmp17_ != NULL) { +- gchar** _tmp18_; +- gint _tmp18__length1; +- _tmp18_ = temp; +- _tmp18__length1 = temp_length1; +- _tmp16_ = _tmp18__length1 > 1; ++ _tmp20_ = temp; ++ _tmp20__length1 = temp_length1; ++ if (_tmp20_ != NULL) { ++ gchar** _tmp21_; ++ gint _tmp21__length1; ++ _tmp21_ = temp; ++ _tmp21__length1 = temp_length1; ++ _tmp19_ = _tmp21__length1 > 1; + } else { +- _tmp16_ = FALSE; ++ _tmp19_ = FALSE; + } +- _tmp19_ = _tmp16_; +- if (_tmp19_) { +- gchar** _tmp20_; +- gint _tmp20__length1; +- const gchar* _tmp21_; +- gchar* _tmp22_; +- _tmp20_ = temp; +- _tmp20__length1 = temp_length1; +- _tmp21_ = _tmp20_[0]; +- _tmp22_ = g_strdup (_tmp21_); ++ _tmp22_ = _tmp19_; ++ if (_tmp22_) { ++ gchar** _tmp23_; ++ gint _tmp23__length1; ++ const gchar* _tmp24_; ++ gchar* _tmp25_; ++ _tmp23_ = temp; ++ _tmp23__length1 = temp_length1; ++ _tmp24_ = _tmp23_[0]; ++ _tmp25_ = g_strdup (_tmp24_); + _g_free0 (_result_); +- _result_ = _tmp22_; ++ _result_ = _tmp25_; + } + result = _result_; + temp = (_vala_array_free (temp, temp_length1, (GDestroyNotify) g_free), NULL); + diff --git a/debian/patches/series b/debian/patches/series index 6439010..46f640c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,5 @@ sound_nua.patch sound_xubuntu.patch sound_ubuntustudio.patch +lp_902715.patch +lp_992262.patch -- cgit v1.2.3 From b68112634c6721221dc7b82e04f798378e26bb9e Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 3 May 2012 16:16:07 -0700 Subject: releasing version 0.8.5.0-0ubuntu3 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e03fc0f..8b66035 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.8.5.0-0ubuntu3) UNRELEASED; urgency=low +indicator-sound (0.8.5.0-0ubuntu3) quantal; urgency=low * debian/patches/lp_992262.patch - fix sound indicator not working after amarok close (LP: #992262) -- cgit v1.2.3 From 74144839c5d9ed7c6c7582a6e7727be8ba704fc6 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 12 Jul 2012 20:07:54 +0200 Subject: releasing version 12.10.0-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 412dcbc..f5d4ffa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (12.10.0-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (12.10.0-0ubuntu1) quantal; urgency=low * New upstream release. - Allow setting preferred media players through a settings key. @@ -9,7 +9,7 @@ indicator-sound (12.10.0-0ubuntu1) UNRELEASED; urgency=low * debian/patches/lp_902715.patch: - dropped, the fix is in the new version - -- Sebastien Bacher Thu, 12 Jul 2012 19:52:13 +0200 + -- Sebastien Bacher Thu, 12 Jul 2012 20:07:48 +0200 indicator-sound (0.8.5.0-0ubuntu3) quantal; urgency=low -- cgit v1.2.3 From 0e1e045b9344bf6cdbaec5d9fb3019010fedddef Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 22 Aug 2012 11:59:54 +0200 Subject: * Drop GTK2 build since ido stopped providing support for that version * debian/control: build with the current vala version --- debian/changelog | 7 +++++++ debian/control | 18 ++---------------- debian/indicator-sound-gtk2.install | 1 - debian/indicator-sound.install | 1 - debian/rules | 14 +------------- 5 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 debian/indicator-sound-gtk2.install delete mode 100644 debian/indicator-sound.install (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f5d4ffa..07919ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (12.10.0-0ubuntu2) UNRELEASED; urgency=low + + * Drop GTK2 build since ido stopped providing support for that version + * debian/control: build with the current vala version + + -- Sebastien Bacher Wed, 22 Aug 2012 11:49:41 +0200 + indicator-sound (12.10.0-0ubuntu1) quantal; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 296f82e..e6e6b3f 100644 --- a/debian/control +++ b/debian/control @@ -8,23 +8,19 @@ Build-Depends: debhelper (>= 7), quilt, autotools-dev, libglib2.0-dev (>= 2.22.3), - libgtk2.0-dev (>= 2.12.0), libgtk-3-dev, libdbusmenu-glib-dev (>= 0.5.90), - libdbusmenu-gtk-dev (>= 0.5.90), libdbusmenu-gtk3-dev (>= 0.5.90), - libindicator-dev (>= 0.3.90), libindicator3-dev (>= 0.3.90), libpulse-dev (>= 0.9.18), libpulse-mainloop-glib0 (>= 0.9.18), - libido-0.1-dev (>= 0.1.11), libido3-0.1-dev (>= 0.2.90), libgee-dev, libxml2-dev, libnotify-dev, - valac-0.14, + valac-0.18, dh-autoreconf -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-sound Package: indicator-sound @@ -36,13 +32,3 @@ Description: System sound indicator. System sound indicator which provides easy control of the PulseAudio sound daemon. -Package: indicator-sound-gtk2 -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - indicator-sound (= ${binary:Version}), - pulseaudio -Replaces: indicator-sound (<< 0.7.1) -Description: System sound indicator. - System sound indicator which provides easy control of the PulseAudio sound - daemon. diff --git a/debian/indicator-sound-gtk2.install b/debian/indicator-sound-gtk2.install deleted file mode 100644 index 8d1fc9f..0000000 --- a/debian/indicator-sound-gtk2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/gtk2/usr/lib/indicators /usr/lib/ diff --git a/debian/indicator-sound.install b/debian/indicator-sound.install deleted file mode 100644 index 19a45de..0000000 --- a/debian/indicator-sound.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/gtk3/usr / diff --git a/debian/rules b/debian/rules index f6ead0e..4ffb502 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,13 @@ #!/usr/bin/make -f -DEB_BUILDDIR = build -DEB_MAKE_FLAVORS = gtk2 gtk3 - include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ -DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ - -DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 -DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 DEB_CONFIGURE_EXTRA_FLAGS = --disable-static CFLAGS += -Wno-error=deprecated-declarations LDFLAGS += -Wl,-z,defs -Wl,--as-needed -debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) -debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) - common-install-arch:: - find debian/tmp -name \*.la -delete - find debian/tmp -name \*.a -delete + find debian/indicator-sound -name \*.la -delete -- cgit v1.2.3 From 0908d39e464db32c0d6175bfd24ae67873c4ff2f Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 22 Aug 2012 12:05:26 +0200 Subject: releasing version 12.10.0-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 07919ff..94f608d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-sound (12.10.0-0ubuntu2) UNRELEASED; urgency=low +indicator-sound (12.10.0-0ubuntu2) quantal; urgency=low * Drop GTK2 build since ido stopped providing support for that version * debian/control: build with the current vala version - -- Sebastien Bacher Wed, 22 Aug 2012 11:49:41 +0200 + -- Sebastien Bacher Wed, 22 Aug 2012 12:05:18 +0200 indicator-sound (12.10.0-0ubuntu1) quantal; urgency=low -- cgit v1.2.3 From b6da5f103c9ebac36f61ada84c8bdf1ab98d30ee Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 3 Oct 2012 21:54:45 +0200 Subject: releasing version 12.10.1-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 19a2fef..5e301ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-sound (12.10.1-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (12.10.1-0ubuntu1) quantal; urgency=low * New upstream release. - -- Sebastien Bacher Wed, 03 Oct 2012 21:51:21 +0200 + -- Sebastien Bacher Wed, 03 Oct 2012 21:52:53 +0200 indicator-sound (12.10.0-0ubuntu2) quantal; urgency=low -- cgit v1.2.3 From 89211f0b3c8d438bd4d4cba9f9f451637e6285fd Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 26 Oct 2012 16:32:54 +0200 Subject: * debian/control: update to debhelper 9.0 * debian/rules: change to debhelper 9.0 --- debian/changelog | 7 +++++++ debian/control | 3 +-- debian/rules | 15 ++++++--------- 3 files changed, 14 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5e301ab..a74b7a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (12.10.1-0ubuntu2~ppa1) UNRELEASED; urgency=low + + * debian/control: update to debhelper 9.0 + * debian/rules: change to debhelper 9.0 + + -- Allan LeSage Fri, 26 Oct 2012 16:31:06 +0200 + indicator-sound (12.10.1-0ubuntu1) quantal; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index e6e6b3f..dcf4014 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Section: sound Priority: extra Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Conor Curran -Build-Depends: debhelper (>= 7), - cdbs (>= 0.4.41), +Build-Depends: debhelper (>= 9.0), quilt, autotools-dev, libglib2.0-dev (>= 2.22.3), diff --git a/debian/rules b/debian/rules index 4ffb502..400a07b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,10 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/gnome.mk -DEB_CONFIGURE_EXTRA_FLAGS = --disable-static +%: + dh $@ --with translations,autoreconf -CFLAGS += -Wno-error=deprecated-declarations -LDFLAGS += -Wl,-z,defs -Wl,--as-needed - -common-install-arch:: - find debian/indicator-sound -name \*.la -delete +override_dh_install: + find debian/indicator-sound/usr/lib -name *.la -delete + find debian/indicator-sound/usr/lib -name *.a -delete + dh_install --fail-missing -- cgit v1.2.3 From ce978d541eefd912a7d8fe4888bd52c37d83b9a3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 26 Oct 2012 16:35:51 +0200 Subject: releasing version 12.10.1-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a74b7a1..8db7700 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-sound (12.10.1-0ubuntu2~ppa1) UNRELEASED; urgency=low +indicator-sound (12.10.1-0ubuntu2~ppa1) quantal; urgency=low * debian/control: update to debhelper 9.0 * debian/rules: change to debhelper 9.0 - -- Allan LeSage Fri, 26 Oct 2012 16:31:06 +0200 + -- Allan LeSage Fri, 26 Oct 2012 16:35:12 +0200 indicator-sound (12.10.1-0ubuntu1) quantal; urgency=low -- cgit v1.2.3