Binary files /tmp/gPSkYFCdJ7/gnome-control-center-3.4.2/debian/UbuntuLogo.png and /tmp/d1GBChc776/gnome-control-center-3.4.2/debian/UbuntuLogo.png differ diff -Nru gnome-control-center-3.4.2/debian/changelog gnome-control-center-3.4.2/debian/changelog --- gnome-control-center-3.4.2/debian/changelog 2012-09-03 14:25:39.000000000 +0000 +++ gnome-control-center-3.4.2/debian/changelog 2012-11-19 10:58:54.000000000 +0000 @@ -1,3 +1,24 @@ +gnome-control-center (1:3.4.2-0ubuntu0.7) precise-proposed; urgency=low + + * debian/patches/git_unmute_sound_event.patch: + - use the patch for sound-nua and Unity sessions as well (lp: #986692) + + -- Sebastien Bacher Mon, 19 Nov 2012 11:46:46 +0100 + +gnome-control-center (1:3.4.2-0ubuntu0.6) precise-proposed; urgency=low + + * debian/patches/git_unmute_sound_event.patch: + - "sound: Make sure the event sound stream stays unmuted" (lp: #986692) + * debian/UbuntuLogo.png: + - updated logo for 12.04.1 (lp: #1041369) + + [ Ritesh Khadgaray ] + * debian/patches/git_update_keyring_password.patch: + gnome-keyring passwd should be changed on system password change + (LP: #416825) + + -- Sebastien Bacher Tue, 16 Oct 2012 19:47:17 +0200 + gnome-control-center (1:3.4.2-0ubuntu0.5) precise-proposed; urgency=low * debian/patches/git_no_preferred_mode_in_clone.patch: diff -Nru gnome-control-center-3.4.2/debian/patches/git_unmute_sound_event.patch gnome-control-center-3.4.2/debian/patches/git_unmute_sound_event.patch --- gnome-control-center-3.4.2/debian/patches/git_unmute_sound_event.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.4.2/debian/patches/git_unmute_sound_event.patch 2012-11-19 10:58:54.000000000 +0000 @@ -0,0 +1,41 @@ +From 25708e9c8e395c465be8e9643127b3b43ef4ffb7 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 25 Jun 2012 15:35:41 +0000 +Subject: sound: Make sure the event sound stream stays unmuted + +Apply mute changes to the stream straight away so that we don't get a +race with gvc_mixer_event_role_push_volume(). +See https://bugs.freedesktop.org/show_bug.cgi?id=51413 for details. + +https://bugzilla.gnome.org/show_bug.cgi?id=677478 +--- +Index: gnome-control-center-3.4.2/panels/sound/gvc-mixer-event-role.c +=================================================================== +--- gnome-control-center-3.4.2.orig/panels/sound/gvc-mixer-event-role.c 2011-08-26 20:43:10.000000000 +0200 ++++ gnome-control-center-3.4.2/panels/sound/gvc-mixer-event-role.c 2012-11-19 11:43:54.866205657 +0100 +@@ -103,6 +103,10 @@ + gvc_mixer_event_role_change_is_muted (GvcMixerStream *stream, + gboolean is_muted) + { ++ /* Apply change straight away so that we don't get a race with ++ * gvc_mixer_event_role_push_volume(). ++ * See https://bugs.freedesktop.org/show_bug.cgi?id=51413 */ ++ gvc_mixer_stream_set_is_muted (stream, is_muted); + return update_settings (GVC_MIXER_EVENT_ROLE (stream), + is_muted, NULL); + } +Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-event-role.c +=================================================================== +--- gnome-control-center-3.4.2.orig/panels/sound-nua/gvc-mixer-event-role.c 2012-11-19 11:43:54.110205619 +0100 ++++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-event-role.c 2012-11-19 11:43:54.866205657 +0100 +@@ -103,6 +103,10 @@ + gvc_mixer_event_role_change_is_muted (GvcMixerStream *stream, + gboolean is_muted) + { ++ /* Apply change straight away so that we don't get a race with ++ * gvc_mixer_event_role_push_volume(). ++ * See https://bugs.freedesktop.org/show_bug.cgi?id=51413 */ ++ gvc_mixer_stream_set_is_muted (stream, is_muted); + return update_settings (GVC_MIXER_EVENT_ROLE (stream), + is_muted, NULL); + } diff -Nru gnome-control-center-3.4.2/debian/patches/git_update_keyring_password.patch gnome-control-center-3.4.2/debian/patches/git_update_keyring_password.patch --- gnome-control-center-3.4.2/debian/patches/git_update_keyring_password.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.4.2/debian/patches/git_update_keyring_password.patch 2012-11-19 10:58:54.000000000 +0000 @@ -0,0 +1,53 @@ +From af8a6440756ce3845b94c685918f8959968e6dd0 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 22 Aug 2012 15:31:59 +0000 +Subject: user-accounts: Fix login keyring password not getting updated + +By passing the environment down to passwed rather than an empty one. +This means that passwd's PAM modules will be able to access the session +D-Bus, for the gnome-keyring PAM module to change the keyring password +for example. + +https://bugzilla.gnome.org/show_bug.cgi?id=616703 +diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c +index 6f7cfab..c6592a6 100644 +--- a/panels/user-accounts/run-passwd.c ++++ b/panels/user-accounts/run-passwd.c +@@ -149,20 +149,14 @@ static gboolean + spawn_passwd (PasswdHandler *passwd_handler, GError **error) + { + gchar *argv[2]; +- gchar *envp[1]; ++ gchar **envp; + gint my_stdin, my_stdout, my_stderr; + + argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ + argv[1] = NULL; + +- envp[0] = NULL; /* If we pass an empty array as the environment, +- * will the childs environment be empty, and the +- * locales set to the C default? From the manual: +- * "If envp is NULL, the child inherits its +- * parent'senvironment." +- * If I'm wrong here, we somehow have to set +- * the locales here. +- */ ++ envp = g_get_environ (); ++ envp = g_environ_setenv (envp, "LC_ALL", "C", TRUE); + + if (!g_spawn_async_with_pipes (NULL, /* Working directory */ + argv, /* Argument vector */ +@@ -179,9 +173,13 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) + /* An error occured */ + free_passwd_resources (passwd_handler); + ++ g_strfreev (envp); ++ + return FALSE; + } + ++ g_strfreev (envp); ++ + /* 2>&1 */ + if (dup2 (my_stderr, my_stdout) == -1) { + /* Failed! */ diff -Nru gnome-control-center-3.4.2/debian/patches/series gnome-control-center-3.4.2/debian/patches/series --- gnome-control-center-3.4.2/debian/patches/series 2012-09-03 14:25:39.000000000 +0000 +++ gnome-control-center-3.4.2/debian/patches/series 2012-11-19 10:58:54.000000000 +0000 @@ -38,3 +38,5 @@ deal_with_null_ssid.patch Brightness-fix-for-gnome-settings-daemon-changes.patch git_no_preferred_mode_in_clone.patch +git_unmute_sound_event.patch +git_update_keyring_password.patch