← Back to branch summary

~ubuntu-desktop/gnome-settings-daemon/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/revert-gsettings-removals.patch

  • Committer: Tim Lunn
  • Date: 2015-10-28 06:24:04 UTC
  • Revision ID: tim@feathertop.org-20151028062404-wq4hxd2p59ckdkbw
https://launchpad.net/bugs/961501
https://launchpad.net/bugs/1427877
https://launchpad.net/bugs/1468943
* Merge with Debian, remaining changes (LP: #1468943):
  + Split out schemas into gnome-settings-daemon-schemas so
    unity-settings-daemon can use them
  + Provide upstart user-session
  + debian/patches:
     - 05_disable_corner_tapping.patch:
        Disable corner tapping when disabling tap to click
     - 43_disable_locale_settings.patch:
        Don't set locales after sourcing .profile
     - 45_suppress-printer-may-not-be-connected-notification.patch
     - 53_sync_input_sources_to_accountsservice.patch
     - 64_restore_terminal_keyboard_shortcut_schema.patch
     - correct_logout_action.patch
        display the logout action on ctrl-alt-del (lp: #961501)
     - ubuntu-lid-close-suspend.patch
        Reimplement support for setting lid close suspend actions
     - revert_background_dropping.patch
        Keep gsettings keys background u-s-d needs them
     - revert-gsettings-removals.patch
        Revert gsettings keys that were dropped since 3.8, for u-s-d
     - 01_reinstate_updates_plugin.patch, keep this for now until we have
       gnome-software now which is responsible for the update notifications.
  + debian/gnome-settings-daemon.install: Install apport hook
  + debian/rules: 
    - install upstart scripts
    - Dont link with "-Wl,-Bsymbolic-functions",
      this was causing GType mismatches between plugins using
      gsd-device-manager (LP: #1427877)
* debian/patches:
  + revert-gsettings-removals.patch: updated for keys removed in 3.18
  + nexus-orientation.patch: Dropped this will be handled by iio-sensor-proxy
  + ubuntu-lid-close-suspend.patch: refreshed
* debian/gnome-settings-daemon-schemas.gsettings-override: Dropped, these are
  already the default settings
* New upstream release.
* New upstream release.
* Drop debian/patches/01_reinstate_updates_plugin.patch, we have
  gnome-software now which is responsible for the update notifications.
* Upload to unstable.
* New upstream release candidate.
* New upstream beta release.
* Add iio-sensor-proxy to recommends
  - now used as source for ambient light and orientation information.
* New upstream release.
* Refresh patches.
* Remove Suggests on x11-xserver-utils. The xrdb plugin has been removed
  upstream a long time ago.
* Remove Suggests on gnome-screensaver. Screen locking is nowadays done by
  gnome-shell/gdm and gnome-settings-daemon no longer starts
  gnome-screensaver directly.
* Remove Suggests on metacity | x-window-manager as gnome-settings-daemon no
  longer starts a window manager directly.
* Remove obsolete Breaks from pre-wheezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/revert-gsettings-removals.patch
10
10
 plugins/power/gsd-power-manager.c                  | 32 +++++++++++++++++
11
11
 5 files changed, 94 insertions(+)
12
12
 
13
 
Index: gnome-settings-daemon-3.16.2/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
 
13
Index: gnome-settings-daemon-3.17.92/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
14
14
===================================================================
15
 
--- gnome-settings-daemon-3.16.2.orig/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
16
 
+++ gnome-settings-daemon-3.16.2/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
17
 
@@ -41,6 +41,16 @@
 
15
--- gnome-settings-daemon-3.17.92.orig/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
 
16
+++ gnome-settings-daemon-3.17.92/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
 
17
@@ -41,6 +41,11 @@
18
18
       <_summary>Wacom touch feature</_summary>
19
19
       <_description>Enable this to move the cursor when the user touches the tablet.</_description>
20
20
     </key>
23
23
+      <_summary>Wacom tablet PC feature</_summary>
24
24
+      <_description>Enable this to only report stylus events when the tip is pressed.</_description>
25
25
+    </key>
26
 
+    <key name="display" type="as">
27
 
+      <default>["", "", ""]</default>
28
 
+      <_summary>Wacom display mapping</_summary>
29
 
+      <_description>EDID information of monitor to map tablet to. Must be in the format [vendor, product, serial]. ["","",""] disables mapping.</_description>
30
 
+    </key>
31
26
   </schema>
32
27
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.wacom.stylus">
33
28
     <key name="pressurecurve" type="ai">
34
 
Index: gnome-settings-daemon-3.16.2/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
 
29
Index: gnome-settings-daemon-3.17.92/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
35
30
===================================================================
36
 
--- gnome-settings-daemon-3.16.2.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
37
 
+++ gnome-settings-daemon-3.16.2/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
38
 
@@ -14,6 +14,7 @@
39
 
     <child name="background" schema="org.gnome.settings-daemon.plugins.background"/>
40
 
     <child name="clipboard" schema="org.gnome.settings-daemon.plugins.clipboard"/>
41
 
     <child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
42
 
+    <child name="cursor" schema="org.gnome.settings-daemon.plugins.cursor"/>
43
 
     <child name="datetime" schema="org.gnome.settings-daemon.plugins.datetime"/>
44
 
     <child name="gsdwacom" schema="org.gnome.settings-daemon.plugins.gsdwacom"/>
45
 
     <child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
46
 
@@ -23,6 +24,7 @@
 
31
--- gnome-settings-daemon-3.17.92.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
 
32
+++ gnome-settings-daemon-3.17.92/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
 
33
@@ -23,6 +23,7 @@
47
34
     <child name="orientation" schema="org.gnome.settings-daemon.plugins.orientation"/>
48
35
     <child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
49
36
     <child name="print-notifications" schema="org.gnome.settings-daemon.plugins.print-notifications"/>
51
38
     <child name="screensaver-proxy" schema="org.gnome.settings-daemon.plugins.screensaver-proxy"/>
52
39
     <child name="sharing" schema="org.gnome.settings-daemon.plugins.sharing"/>
53
40
     <child name="smartcard" schema="org.gnome.settings-daemon.plugins.smartcard"/>
54
 
@@ -79,6 +81,18 @@
55
 
       <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
56
 
     </key>
57
 
   </schema>
58
 
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.cursor" path="/org/gnome/settings-daemon/plugins/cursor/">
59
 
+    <key name="active" type="b">
60
 
+      <default>true</default>
61
 
+      <_summary>Activation of this plugin</_summary>
62
 
+      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
63
 
+    </key>
64
 
+    <key name="priority" type="i">
65
 
+      <default>0</default>
66
 
+      <_summary>Priority to use for this plugin</_summary>
67
 
+      <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
68
 
+    </key>
69
 
+  </schema>
70
 
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.mouse" path="/org/gnome/settings-daemon/plugins/mouse/">
71
 
     <key name="active" type="b">
72
 
       <default>true</default>
73
 
@@ -95,6 +109,18 @@
 
41
@@ -95,6 +96,18 @@
74
42
     <key name="active" type="b">
75
43
       <default>true</default>
76
44
       <_summary>Activation of this plugin</_summary>
89
57
       <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
90
58
     </key>
91
59
     <key name="priority" type="i">
92
 
Index: gnome-settings-daemon-3.16.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
 
60
Index: gnome-settings-daemon-3.17.92/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
93
61
===================================================================
94
 
--- gnome-settings-daemon-3.16.2.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
95
 
+++ gnome-settings-daemon-3.16.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
96
 
@@ -88,5 +88,45 @@
97
 
       <summary>Battery critical low action</summary>
98
 
       <description>The action to take when the battery is critically low.</description>
 
62
--- gnome-settings-daemon-3.17.92.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
 
63
+++ gnome-settings-daemon-3.17.92/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
 
64
@@ -62,10 +62,76 @@
 
65
        key to False to keep the default behavior, or to True to suspend the laptop whenever the
 
66
        lid is closed and regardless of external monitors.</description>
 
67
     </key>
 
68
+    <key name="button-suspend" enum="org.gnome.settings-daemon.GsdPowerActionType">
 
69
+      <default>'suspend'</default>
 
70
+      <summary>Suspend button action</summary>
 
71
+      <description>The action to take when the system suspend button is pressed.</description>
 
72
+    </key>
 
73
+    <key name="button-hibernate" enum="org.gnome.settings-daemon.GsdPowerActionType">
 
74
+      <default>'hibernate'</default>
 
75
+      <summary>Hibernate button action</summary>
 
76
+      <description>The action to take when the system hibernate button is pressed.</description>
 
77
+    </key>
 
78
+    <key name="button-sleep" enum="org.gnome.settings-daemon.GsdPowerActionType">
 
79
+      <default>'hibernate'</default>
 
80
+      <summary>Sleep button action</summary>
 
81
+      <description>The action to take when the system sleep (non-specific type) button is pressed.</description>
 
82
+    </key>
 
83
+    <!-- See https://bugzilla.gnome.org/show_bug.cgi?id=652183 for rationale -->
 
84
+    <key name="button-power" enum="org.gnome.settings-daemon.GsdPowerActionType">
 
85
+      <default>'suspend'</default>
 
86
+      <summary>Power button action</summary>
 
87
+      <description>The action to take when the system power button is pressed.</description>
 
88
+    </key>
 
89
+    <key name="critical-battery-action" enum="org.gnome.settings-daemon.GsdPowerActionType">
 
90
+      <default>'hibernate'</default>
 
91
+      <summary>Battery critical low action</summary>
 
92
+      <description>The action to take when the battery is critically low.</description>
 
93
+    </key>
 
94
     <key name="ambient-enabled" type="b">
 
95
       <default>true</default>
 
96
       <summary>Enable the ALS sensor</summary>
 
97
       <description>If the ambient light sensor functionality is enabled.</description>
99
98
     </key>
100
99
+    <key name="percentage-low" type="i">
101
100
+      <default>10</default>