diff -Nru ukui-settings-daemon-1.1.5/configure.ac ukui-settings-daemon-1.1.6/configure.ac
--- ukui-settings-daemon-1.1.5/configure.ac 2018-01-09 04:31:09.000000000 +0000
+++ ukui-settings-daemon-1.1.6/configure.ac 2018-03-30 09:42:35.000000000 +0000
@@ -473,8 +473,6 @@
data/ukui-settings-daemon-uninstalled.pc
data/org.ukui.applications-at.gschema.xml
data/org.ukui.font-rendering.gschema.xml
-data/org.ukui.peripherals-smartcard.gschema.xml
-data/org.ukui.peripherals-touchpad.gschema.xml
data/org.ukui.SettingsDaemon.plugins.a11y-keyboard.gschema.xml
data/org.ukui.SettingsDaemon.plugins.a11y-settings.gschema.xml
data/org.ukui.SettingsDaemon.plugins.background.gschema.xml
diff -Nru ukui-settings-daemon-1.1.5/data/Makefile.am ukui-settings-daemon-1.1.6/data/Makefile.am
--- ukui-settings-daemon-1.1.5/data/Makefile.am 2018-01-25 01:12:24.000000000 +0000
+++ ukui-settings-daemon-1.1.6/data/Makefile.am 2018-03-30 09:42:35.000000000 +0000
@@ -5,8 +5,6 @@
org.ukui.font-rendering.gschema.xml.in \
org.ukui.peripherals-smartcard.gschema.xml.in \
org.ukui.peripherals-touchpad.gschema.xml.in \
- org.ukui.peripherals-keyboard.gschema.xml.in \
- org.ukui.peripherals-mouse.gschema.xml.in \
org.ukui.peripherals-touchscreen.gschema.xml.in \
org.ukui.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in \
org.ukui.SettingsDaemon.plugins.a11y-settings.gschema.xml.in \
diff -Nru ukui-settings-daemon-1.1.5/data/org.ukui.peripherals-keyboard.gschema.xml.in ukui-settings-daemon-1.1.6/data/org.ukui.peripherals-keyboard.gschema.xml.in
--- ukui-settings-daemon-1.1.5/data/org.ukui.peripherals-keyboard.gschema.xml.in 2018-01-09 06:10:51.000000000 +0000
+++ ukui-settings-daemon-1.1.6/data/org.ukui.peripherals-keyboard.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
- 0
-
-
- 'on'
- <_description>Possible values are “on”, “off”, and “custom”.
-
-
- 400
-
-
- 100
-
-
- ''
- <_summary>Keyboard Bell Custom Filename
- <_description>File name of the bell sound to be played.
-
-
- true
- <_summary>Remember NumLock state
- <_description>When set to true, GNOME will remember the state of the NumLock LED between sessions.
-
-
- 'unknown'
- <_summary>NumLock state
- <_description>The remembered state of the NumLock LED.
-
-
-
diff -Nru ukui-settings-daemon-1.1.5/data/org.ukui.peripherals-mouse.gschema.xml.in ukui-settings-daemon-1.1.6/data/org.ukui.peripherals-mouse.gschema.xml.in
--- ukui-settings-daemon-1.1.5/data/org.ukui.peripherals-mouse.gschema.xml.in 2018-01-09 04:30:29.000000000 +0000
+++ ukui-settings-daemon-1.1.6/data/org.ukui.peripherals-mouse.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-
-
-
-
- false
- <_summary>Highlights the current location of the pointer when the Control key is pressed and released.
-
-
- 400
- <_summary>Double click time
- <_description> Length of a double click in milliseconds.
-
-
- 8
- <_summary>Drag threshold
- <_description>Distance before a drag is started.
-
-
-
diff -Nru ukui-settings-daemon-1.1.5/data/ukui-settings-daemon.desktop.in.in ukui-settings-daemon-1.1.6/data/ukui-settings-daemon.desktop.in.in
--- ukui-settings-daemon-1.1.5/data/ukui-settings-daemon.desktop.in.in 2017-12-18 07:30:33.000000000 +0000
+++ ukui-settings-daemon-1.1.6/data/ukui-settings-daemon.desktop.in.in 2018-03-29 06:29:47.000000000 +0000
@@ -3,6 +3,6 @@
_Name=UKUI Settings Daemon
Exec=@LIBEXECDIR@/ukui-settings-daemon
OnlyShowIn=UKUI;
-X-UKUI-Autostart-Phase=WindowManager
+X-UKUI-Autostart-Phase=Initialization
X-UKUI-Autostart-Notify=true
X-UKUI-AutoRestart=true
diff -Nru ukui-settings-daemon-1.1.5/debian/changelog ukui-settings-daemon-1.1.6/debian/changelog
--- ukui-settings-daemon-1.1.5/debian/changelog 2018-01-29 09:03:10.000000000 +0000
+++ ukui-settings-daemon-1.1.6/debian/changelog 2018-04-02 02:10:30.000000000 +0000
@@ -1,3 +1,12 @@
+ukui-settings-daemon (1.1.6-0ubuntu1) bionic; urgency=medium
+
+ * Change mate-screenshot to gnome-screenshot.
+ * xsettings: drop CanChangeAccels which wont't work with gtk3.
+ * Fix the error when check whether peony is drawing background.
+ (LP: #1759185)
+
+ -- handsome_feng Mon, 02 Apr 2018 10:10:30 +0800
+
ukui-settings-daemon (1.1.5-0ubuntu1) bionic; urgency=medium
* Initial release. (LP: #1738947)
diff -Nru ukui-settings-daemon-1.1.5/debian/control ukui-settings-daemon-1.1.6/debian/control
--- ukui-settings-daemon-1.1.5/debian/control 2018-01-29 09:03:10.000000000 +0000
+++ ukui-settings-daemon-1.1.6/debian/control 2018-04-02 02:10:30.000000000 +0000
@@ -33,6 +33,8 @@
x11proto-kb-dev,
Standards-Version: 4.1.3
Homepage: http://www.ukui.org/
+Vcs-Git: https://github.com/ukui/ukui-settings-daemon.git
+Vcs-Browser: https://github.com/ukui/ukui-settings-daemon
Package: ukui-settings-daemon
Architecture: any
diff -Nru ukui-settings-daemon-1.1.5/debian/copyright ukui-settings-daemon-1.1.6/debian/copyright
--- ukui-settings-daemon-1.1.5/debian/copyright 2018-01-29 09:03:10.000000000 +0000
+++ ukui-settings-daemon-1.1.6/debian/copyright 2018-04-02 02:10:30.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ukui-settings-daemon
Upstream-Contact: zhang heng
Source: http://github.com/ukui/ukui-settings-daemon
diff -Nru ukui-settings-daemon-1.1.5/debian/rules ukui-settings-daemon-1.1.6/debian/rules
--- ukui-settings-daemon-1.1.5/debian/rules 2018-01-29 09:03:10.000000000 +0000
+++ ukui-settings-daemon-1.1.6/debian/rules 2018-04-02 02:10:30.000000000 +0000
@@ -1,13 +1,11 @@
#!/usr/bin/make -f
-DHFLAGS=--parallel
-
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
%:
- dh $@ $(DHFLAGS) --without autoreconf
+ dh $@ --without autoreconf
override_dh_missing:
dh_missing --fail-missing
@@ -19,13 +17,8 @@
override_dh_auto_configure:
# upstream tarball is without configure. autogen.sh will create it
NOCONFIGURE=1 ./autogen.sh
- dh_auto_configure $(DHFLAGS) -- \
+ dh_auto_configure -- \
--disable-silent-rules \
--libexecdir=/usr/bin \
--disable-static \
--enable-pulse
-
-override_dh_makeshlibs:
-
-get-orig-source:
- uscan --noconf --force-download --rename --download-current-version --destdir=..
diff -Nru ukui-settings-daemon-1.1.5/plugins/background/usd-background-manager.c ukui-settings-daemon-1.1.6/plugins/background/usd-background-manager.c
--- ukui-settings-daemon-1.1.5/plugins/background/usd-background-manager.c 2017-12-18 07:30:33.000000000 +0000
+++ ukui-settings-daemon-1.1.6/plugins/background/usd-background-manager.c 2018-03-30 09:41:46.000000000 +0000
@@ -140,7 +140,7 @@
return FALSE;
/* See: peony_desktop_window_new(), in src/peony-desktop-window.c */
- if (nitems == 20 && after == 0 && format == 8 &&
+ if (nitems == 21 && after == 0 && format == 8 &&
!strcmp((char*) data, "desktop_window") &&
!strcmp((char*) data + strlen((char*) data) + 1, "Peony"))
{
diff -Nru ukui-settings-daemon-1.1.5/plugins/media-keys/usd-media-keys-manager.c ukui-settings-daemon-1.1.6/plugins/media-keys/usd-media-keys-manager.c
--- ukui-settings-daemon-1.1.5/plugins/media-keys/usd-media-keys-manager.c 2017-12-18 07:39:06.000000000 +0000
+++ ukui-settings-daemon-1.1.6/plugins/media-keys/usd-media-keys-manager.c 2018-03-20 11:21:22.000000000 +0000
@@ -931,19 +931,19 @@
static void
do_screenshot_action (UsdMediaKeysManager *manager)
{
- execute (manager, "mate-screenshot",FALSE,FALSE);
+ execute (manager, "gnome-screenshot",FALSE,FALSE);
}
static void
do_area_screenshot_action (UsdMediaKeysManager *manager)
{
- execute (manager, "mate-screenshot -a",FALSE,FALSE);
+ execute (manager, "gnome-screenshot -a",FALSE,FALSE);
}
static void
do_window_screenshot_action (UsdMediaKeysManager *manager)
{
- execute (manager, "mate-screenshot -w",FALSE,FALSE);
+ execute (manager, "gnome-screenshot -w",FALSE,FALSE);
}
diff -Nru ukui-settings-daemon-1.1.5/plugins/xsettings/usd-xsettings-manager.c ukui-settings-daemon-1.1.6/plugins/xsettings/usd-xsettings-manager.c
--- ukui-settings-daemon-1.1.5/plugins/xsettings/usd-xsettings-manager.c 2017-12-18 07:30:33.000000000 +0000
+++ ukui-settings-daemon-1.1.6/plugins/xsettings/usd-xsettings-manager.c 2018-03-20 11:21:22.000000000 +0000
@@ -187,7 +187,6 @@
{ INTERFACE_SCHEMA, "gtk-key-theme", "Gtk/KeyThemeName", translate_string_string },
{ INTERFACE_SCHEMA, "toolbar-style", "Gtk/ToolbarStyle", translate_string_string_toolbar },
{ INTERFACE_SCHEMA, "toolbar-icons-size", "Gtk/ToolbarIconSize", translate_string_string },
- { INTERFACE_SCHEMA, "can-change-accels", "Gtk/CanChangeAccels", translate_bool_int },
{ INTERFACE_SCHEMA, "cursor-blink", "Net/CursorBlink", translate_bool_int },
{ INTERFACE_SCHEMA, "cursor-blink-time", "Net/CursorBlinkTime", translate_int_int },
{ INTERFACE_SCHEMA, "gtk-theme", "Net/ThemeName", translate_string_string },
diff -Nru ukui-settings-daemon-1.1.5/po/POTFILES.in ukui-settings-daemon-1.1.6/po/POTFILES.in
--- ukui-settings-daemon-1.1.5/po/POTFILES.in 2018-01-09 04:53:48.000000000 +0000
+++ ukui-settings-daemon-1.1.6/po/POTFILES.in 2018-03-30 09:42:35.000000000 +0000
@@ -5,8 +5,6 @@
[type: gettext/gsettings]data/org.ukui.font-rendering.gschema.xml.in
[type: gettext/gsettings]data/org.ukui.peripherals-smartcard.gschema.xml.in
[type: gettext/gsettings]data/org.ukui.peripherals-touchpad.gschema.xml.in
-[type: gettext/gsettings]data/org.ukui.peripherals-keyboard.gschema.xml.in
-[type: gettext/gsettings]data/org.ukui.peripherals-mouse.gschema.xml.in
[type: gettext/gsettings]data/org.ukui.peripherals-touchscreen.gschema.xml.in
[type: gettext/gsettings]data/org.ukui.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in
[type: gettext/gsettings]data/org.ukui.SettingsDaemon.plugins.a11y-settings.gschema.xml.in
diff -Nru ukui-settings-daemon-1.1.5/ukui-settings-daemon/main.c ukui-settings-daemon-1.1.6/ukui-settings-daemon/main.c
--- ukui-settings-daemon-1.1.5/ukui-settings-daemon/main.c 2017-12-18 07:30:33.000000000 +0000
+++ ukui-settings-daemon-1.1.6/ukui-settings-daemon/main.c 2018-03-29 07:34:12.000000000 +0000
@@ -46,8 +46,8 @@
#define USD_DBUS_NAME "org.ukui.SettingsDaemon"
-#define DEBUG_KEY "ukui-settings-daemon"
-#define DEBUG_SCHEMA "org.ukui.debug"
+#define DEBUG_KEY "mate-settings-daemon"
+#define DEBUG_SCHEMA "org.mate.debug"
#define UKUI_SESSION_DBUS_NAME "org.gnome.SessionManager"
#define UKUI_SESSION_DBUS_OBJECT "/org/gnome/SessionManager"