← Back to branch summary

~ubuntu-branches/ubuntu/utopic/gnome-settings-daemon/utopic

« back to all changes in this revision

Viewing changes to debian/patches/64_restore_terminal_keyboard_shortcut_schema.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Sebastien Bacher, Robert Ancell, Rico Tzschichholz, Iain Lane
  • Date: 2012-11-21 17:16:23 UTC
  • mfrom: (1.1.62)
  • Revision ID: package-import@ubuntu.com-20121121171623-k7iufrs14qoiozeq
Tags: 3.6.3-0ubuntu1
https://launchpad.net/bugs/1008840
[ Sebastien Bacher ]
* New upstream version (lp: #1008840)
* debian/patches/git*,
  debian/patches/power-ignore-bad-dbus-requests.patch,
  debian/patches/power-ignore-bad-dbus-requests.patch,
  debian/patches/10_smaller_syndaemon_timeout.patch: 
  - dropped, those fixes are in the new version
* debian/control.in:
  - restore build-depends on libgnomekbd-dev, libxklavier-dev,
    drop the build-depends on libxkbfile-dev
* debian/patches/20_migrate_background_uri.patch:
  - dropped, it was only needed until the LTS
* debian/patches/40_xres_lcddefault.patch:
  - dropped, that was a workaround for libreoffice that shouldn't be
    needed and we should better fix libreoffice
* debian/patches/61_unity_use_application_indicator.patch:
  - drop the keyboard indicator code, that will need to be turned 
    into a proper indicator refactored to handle the new ibus config
* debian/patches/90_set_gmenus_xsettings.patch:
  - refreshed for the new version
* debian/patches/revert_new_ibus_use.patch:
  - revert keyboard code to our 3.4 version
* debian/patches/sync_keyboard_layout_to_accountsservice.patch:
  - dropped, the changes are included in the previous patch

[ Robert Ancell ]
* New upstream release
* debian/control:
  - Bump build-depends on libgnome-desktop-3-dev, libwacom-dev
  - Drop build-depends on libgnomekbd-dev, libxklavier-dev
  - Add build-depends on libxkbfile-dev

[ Rico Tzschichholz ]
* debian/control.in:
  - Build-depend on gtk-doc-tools

[ Iain Lane ]
* New upstream release
* Refresh patches and remove those applied upstream.
* Remove gstreamer BDs which are now obsolete. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/64_restore_terminal_keyboard_shortcut_schema.patch
1
 
Index: gnome-settings-daemon-3.4.2/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
 
1
Index: gnome-settings-daemon-3.6.1/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
2
2
===================================================================
3
 
--- gnome-settings-daemon-3.4.2.orig/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in        2012-05-15 06:14:45.000000000 -0400
4
 
+++ gnome-settings-daemon-3.4.2/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in     2012-08-26 01:20:36.672802081 -0400
 
3
--- gnome-settings-daemon-3.6.1.orig/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in        2012-10-05 13:56:43.000000000 +0200
 
4
+++ gnome-settings-daemon-3.6.1/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in     2012-10-26 10:19:49.647004183 +0200
5
5
@@ -130,6 +130,11 @@
6
6
       <_summary>Copy a screenshot of an area to clipboard</_summary>
7
7
       <_description>Binding to copy a screenshot of an area to clipboard.</_description>
14
14
     <key name="www" type="s">
15
15
       <default>'XF86WWW'</default>
16
16
       <_summary>Launch web browser</_summary>
17
 
Index: gnome-settings-daemon-3.4.2/plugins/media-keys/gsd-media-keys-manager.c
 
17
Index: gnome-settings-daemon-3.6.1/plugins/media-keys/gsd-media-keys-manager.c
18
18
===================================================================
19
 
--- gnome-settings-daemon-3.4.2.orig/plugins/media-keys/gsd-media-keys-manager.c        2012-08-26 01:20:36.464801049 -0400
20
 
+++ gnome-settings-daemon-3.4.2/plugins/media-keys/gsd-media-keys-manager.c     2012-08-26 01:20:47.880857664 -0400
21
 
@@ -895,6 +895,22 @@
 
19
--- gnome-settings-daemon-3.6.1.orig/plugins/media-keys/gsd-media-keys-manager.c        2012-10-26 10:19:49.507004176 +0200
 
20
+++ gnome-settings-daemon-3.6.1/plugins/media-keys/gsd-media-keys-manager.c     2012-10-26 10:20:04.815004917 +0200
 
21
@@ -891,6 +891,22 @@
22
22
 }
23
23
 
24
24
 static void
41
41
 gnome_session_shutdown (GsdMediaKeysManager *manager)
42
42
 {
43
43
        GError *error = NULL;
44
 
@@ -2071,6 +2087,9 @@
 
44
@@ -2087,6 +2103,9 @@
45
45
         case AREA_SCREENSHOT_CLIP_KEY:
46
46
                 execute (manager, "gnome-screenshot --area --clipboard", FALSE);
47
47
                 break;
51
51
         case WWW_KEY:
52
52
                 do_url_action (manager, "http", timestamp);
53
53
                 break;
54
 
Index: gnome-settings-daemon-3.4.2/plugins/media-keys/shortcuts-list.h
 
54
Index: gnome-settings-daemon-3.6.1/plugins/media-keys/shortcuts-list.h
55
55
===================================================================
56
 
--- gnome-settings-daemon-3.4.2.orig/plugins/media-keys/shortcuts-list.h        2012-05-15 06:14:45.000000000 -0400
57
 
+++ gnome-settings-daemon-3.4.2/plugins/media-keys/shortcuts-list.h     2012-08-26 01:21:22.077027223 -0400
 
56
--- gnome-settings-daemon-3.6.1.orig/plugins/media-keys/shortcuts-list.h        2012-10-05 13:56:44.000000000 +0200
 
57
+++ gnome-settings-daemon-3.6.1/plugins/media-keys/shortcuts-list.h     2012-10-26 10:19:49.651004184 +0200
58
58
@@ -50,6 +50,7 @@
59
59
         SCREENSHOT_CLIP_KEY,
60
60
         WINDOW_SCREENSHOT_CLIP_KEY,
63
63
         WWW_KEY,
64
64
         PLAY_KEY,
65
65
         PAUSE_KEY,
66
 
@@ -113,6 +114,7 @@
 
66
@@ -115,6 +116,7 @@
67
67
         { SCREENSHOT_CLIP_KEY, "screenshot-clip", NULL },
68
68
         { WINDOW_SCREENSHOT_CLIP_KEY, "window-screenshot-clip", NULL },
69
69
         { AREA_SCREENSHOT_CLIP_KEY, "area-screenshot-clip", NULL },