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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-17 11:26:52 +0000
3+++ debian/changelog 2013-05-28 10:39:26 +0000
4@@ -1,3 +1,10 @@
5+gnome-settings-daemon (3.6.4-0ubuntu12) saucy; urgency=low
6+
7+ * Rebuild for gnome-desktop 3.8 transition (LP: 1184812)
8+ - debian/patches/git_xrandr_dont_include_labeller_widget.patch
9+
10+ -- Tim Lunn <tim@feathertop.org> Tue, 28 May 2013 10:04:36 +1000
11+
12 gnome-settings-daemon (3.6.4-0ubuntu11) saucy; urgency=low
13
14 * debian/patches/git_sound_not_polling.patch: Create directory with correct
15
16=== added file 'debian/patches/git_xrandr_dont_include_labeller_widget.patch'
17--- debian/patches/git_xrandr_dont_include_labeller_widget.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/git_xrandr_dont_include_labeller_widget.patch 2013-05-28 10:39:26 +0000
19@@ -0,0 +1,21 @@
20+From ec21e9a74a9091250e3161e47bafdffd355b454a Mon Sep 17 00:00:00 2001
21+From: Bastien Nocera <hadess@hadess.net>
22+Date: Wed, 21 Nov 2012 21:08:21 +0000
23+Subject: xrandr: Don't include unneeded labeler widget
24+
25+---
26+diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
27+index 7b459c3..9cf1561 100644
28+--- a/plugins/xrandr/gsd-xrandr-manager.c
29++++ b/plugins/xrandr/gsd-xrandr-manager.c
30+@@ -45,7 +45,6 @@
31+
32+ #include <libgnome-desktop/gnome-rr-config.h>
33+ #include <libgnome-desktop/gnome-rr.h>
34+-#include <libgnome-desktop/gnome-rr-labeler.h>
35+
36+ #ifdef HAVE_WACOM
37+ #include <libwacom/libwacom.h>
38+--
39+cgit v0.9.1
40+
41
42=== modified file 'debian/patches/series'
43--- debian/patches/series 2013-05-17 11:05:02 +0000
44+++ debian/patches/series 2013-05-28 10:39:26 +0000
45@@ -24,3 +24,4 @@
46 git_glib_get_xdg_dirs.patch
47 git_sound_not_polling.patch
48 fix_broken_user_sounds_permissions.patch
49+git_xrandr_dont_include_labeller_widget.patch

Subscribers

People subscribed via source and target branches

to all changes: