Merge lp:~darkxst/ubuntu/saucy/gnome-settings-daemon/lp1184812ud into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

Proposed by Tim Lunn
Status: Merged
Merged at revision: 396
Proposed branch: lp:~darkxst/ubuntu/saucy/gnome-settings-daemon/lp1184812ud
Merge into: lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu
Diff against target: 49 lines (+29/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/git_xrandr_dont_include_labeller_widget.patch (+21/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~darkxst/ubuntu/saucy/gnome-settings-daemon/lp1184812ud
Reviewer Review Type Date Requested Status
Jeremy Bicha Approve
Review via email: mp+166010@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jeremy Bicha (jbicha) wrote :

Thanks! Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-05-17 11:26:52 +0000
+++ debian/changelog 2013-05-28 10:39:26 +0000
@@ -1,3 +1,10 @@
1gnome-settings-daemon (3.6.4-0ubuntu12) saucy; urgency=low
2
3 * Rebuild for gnome-desktop 3.8 transition (LP: 1184812)
4 - debian/patches/git_xrandr_dont_include_labeller_widget.patch
5
6 -- Tim Lunn <tim@feathertop.org> Tue, 28 May 2013 10:04:36 +1000
7
1gnome-settings-daemon (3.6.4-0ubuntu11) saucy; urgency=low8gnome-settings-daemon (3.6.4-0ubuntu11) saucy; urgency=low
29
3 * debian/patches/git_sound_not_polling.patch: Create directory with correct10 * debian/patches/git_sound_not_polling.patch: Create directory with correct
411
=== added file 'debian/patches/git_xrandr_dont_include_labeller_widget.patch'
--- debian/patches/git_xrandr_dont_include_labeller_widget.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/git_xrandr_dont_include_labeller_widget.patch 2013-05-28 10:39:26 +0000
@@ -0,0 +1,21 @@
1From ec21e9a74a9091250e3161e47bafdffd355b454a Mon Sep 17 00:00:00 2001
2From: Bastien Nocera <hadess@hadess.net>
3Date: Wed, 21 Nov 2012 21:08:21 +0000
4Subject: xrandr: Don't include unneeded labeler widget
5
6---
7diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
8index 7b459c3..9cf1561 100644
9--- a/plugins/xrandr/gsd-xrandr-manager.c
10+++ b/plugins/xrandr/gsd-xrandr-manager.c
11@@ -45,7 +45,6 @@
12
13 #include <libgnome-desktop/gnome-rr-config.h>
14 #include <libgnome-desktop/gnome-rr.h>
15-#include <libgnome-desktop/gnome-rr-labeler.h>
16
17 #ifdef HAVE_WACOM
18 #include <libwacom/libwacom.h>
19--
20cgit v0.9.1
21
022
=== modified file 'debian/patches/series'
--- debian/patches/series 2013-05-17 11:05:02 +0000
+++ debian/patches/series 2013-05-28 10:39:26 +0000
@@ -24,3 +24,4 @@
24git_glib_get_xdg_dirs.patch24git_glib_get_xdg_dirs.patch
25git_sound_not_polling.patch25git_sound_not_polling.patch
26fix_broken_user_sounds_permissions.patch26fix_broken_user_sounds_permissions.patch
27git_xrandr_dont_include_labeller_widget.patch

Subscribers

People subscribed via source and target branches

to all changes: