--- indicator-sound-0.1.3.1.orig/debian/copyright +++ indicator-sound-0.1.3.1/debian/copyright @@ -0,0 +1,37 @@ +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, 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 + 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'. --- indicator-sound-0.1.3.1.orig/debian/watch +++ indicator-sound-0.1.3.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/indicator-sound/+download .*/indicator-sound-([0-9.]+)\.tar\.gz --- indicator-sound-0.1.3.1.orig/debian/control +++ indicator-sound-0.1.3.1/debian/control @@ -0,0 +1,31 @@ +Source: indicator-sound +Section: sound +Priority: extra +Maintainer: Ubuntu Desktop Team +XSBC-Original-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.5), + libpulse-dev (>= 0.9.18), + libpulse-mainloop-glib0 (>= 0.9.18), + libido-0.1-dev (>= 0.1.2), + libgconf2-dev +Standards-Version: 3.8.4 +Homepage: https://launchpad.net/indicator-sound + +Package: indicator-sound +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + pulseaudio +Description: A system sound indicator. + A system sound indicator which provides easy control of the PulseAudio sound + daemon. + + --- indicator-sound-0.1.3.1.orig/debian/rules +++ indicator-sound-0.1.3.1/debian/rules @@ -0,0 +1,19 @@ +#!/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 + +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +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 + --- indicator-sound-0.1.3.1.orig/debian/changelog +++ indicator-sound-0.1.3.1/debian/changelog @@ -0,0 +1,80 @@ +indicator-sound (0.1.3.1-0ubuntu2) lucid; urgency=low + + * Backport upstream changes to fix those issues: + - "Wrong i18n for menu entries", thank Luca Ferretti (lp: #538704) + - "display a mute icon until volume is changed since update" (lp: #537977) + + -- Sebastien Bacher Mon, 15 Mar 2010 15:51:35 +0100 + +indicator-sound (0.1.3.1-0ubuntu1) lucid; urgency=low + + * New upstream version: + - clear looks seg fault fix (lp: #537891) + - slider resizing properly (lp: #533208) + + -- Sebastien Bacher Fri, 12 Mar 2010 20:29:25 +0100 + +indicator-sound (0.1.3-0ubuntu1) lucid; urgency=low + + * New upstream version: + - icon sizing fixed. + - correct icon names loaded with fallback mechanism + - no sink handling improved - now handles going from no sink to one sink + back to no sink properly + - Mute blocking state implemented with animation on title image. + - smoother sliding due new signals emitted from the 0.1.4 of ido + * debian/control: + - updated libindicator requirement + + -- Sebastien Bacher Thu, 11 Mar 2010 18:53:58 +0100 + +indicator-sound (0.1.2-0ubuntu1) lucid; urgency=low + + * New upstream version: + - Stability of the service should now be much improved. The backend sound + service should now be able to handle Pulseaudio not being up or flapping. + (lp: #529324) + - Arrow keys should be working properly allowing users to move between + indicators. (lp: #525733) + + -- Sebastien Bacher Thu, 04 Mar 2010 13:32:10 +0100 + +indicator-sound (0.1.1-0ubuntu2) lucid; urgency=low + + * Backporting trunk commit to fix keyboard controls (lp: #521088) + + -- Sebastien Bacher Thu, 18 Feb 2010 19:13:03 +0100 + +indicator-sound (0.1.1-0ubuntu1) lucid; urgency=low + + * New upstream version + - resolve the UI keyboard controls which were lacking (lp: #521088) + - the volume control should now be far smoother + - included is the ability to dynamically swap output devices + using gnome volume control + - use of new icons from the new humanity theme. + - update volume slider in the right direction on mouse scroll (lp: #521090) + * debian/control: + - updated ido requirement + + -- Sebastien Bacher Thu, 18 Feb 2010 17:46:11 +0100 + +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: + - 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 + + -- Sebastien Bacher Fri, 12 Feb 2010 11:13:22 +0100 --- indicator-sound-0.1.3.1.orig/debian/compat +++ indicator-sound-0.1.3.1/debian/compat @@ -0,0 +1 @@ +7 --- indicator-sound-0.1.3.1.orig/src/indicator-sound.c +++ indicator-sound-0.1.3.1/src/indicator-sound.c @@ -400,9 +400,7 @@ current_state = state; gchar* image_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(current_state)); - GtkImage * tempimage = indicator_image_helper(image_name); - gtk_image_set_from_pixbuf(speaker_image, gtk_image_get_pixbuf(tempimage)); - g_object_ref_sink(tempimage); + indicator_image_helper_update(speaker_image, image_name); } @@ -493,9 +491,7 @@ g_debug("signal caught - sink input while muted with value %i", block_value); if (block_value == 1 && animation_id == 0 && blocked_animation_list != NULL) { gchar* image_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_MUTED_WHILE_INPUT)); - GtkImage * tempimage = indicator_image_helper(image_name); - gtk_image_set_from_pixbuf(speaker_image, gtk_image_get_pixbuf(tempimage)); - g_object_ref_sink(tempimage); + indicator_image_helper_update(speaker_image, image_name); blocked_iter = blocked_animation_list; animation_id = g_timeout_add_seconds(1, fade_back_to_mute_image, NULL); --- indicator-sound-0.1.3.1.orig/src/dbus-menu-manager.c +++ indicator-sound-0.1.3.1/src/dbus-menu-manager.c @@ -117,7 +117,7 @@ b_all_muted = incoming_mute_value; dbusmenu_menuitem_property_set(mute_all_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, - _(b_all_muted == FALSE ? "Mute All" : "Unmute")); + b_all_muted == FALSE ? _("Mute All") : _("Unmute")); } @@ -191,7 +191,7 @@ { // Mute button mute_all_menuitem = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set(mute_all_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _(b_all_muted == FALSE ? "Mute All" : "Unmute")); + dbusmenu_menuitem_property_set(mute_all_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, b_all_muted == FALSE ? _("Mute All") : _("Unmute")); g_signal_connect(G_OBJECT(mute_all_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(set_global_mute_from_ui), NULL); dbusmenu_menuitem_property_set_bool(mute_all_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, b_sink_available); @@ -230,7 +230,7 @@ toggle_global_mute(b_all_muted); dbusmenu_menuitem_property_set(mute_all_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, - _(b_all_muted == FALSE ? "Mute All" : "Unmute")); + b_all_muted == FALSE ? _("Mute All") : _("Unmute")); } --- indicator-sound-0.1.3.1.orig/po/POTFILES.in +++ indicator-sound-0.1.3.1/po/POTFILES.in @@ -1,4 +1,3 @@ [encoding: UTF-8] data/indicator-sound.schemas.in -src/indicator-sound.c -src/sound-service.c +src/dbus-menu-manager.c