From 693da85e85e62255e98647ced9035377a9e19aca Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <jbi...@ubuntu.com> Date: Mon, 31 Jul 2017 00:21:22 -0400 Subject: [PATCH] Add Adapt-to-gsd-3.24.patch
Closes: #870229 --- debian/control | 2 +- debian/patches/Adapt-to-gsd-3.24.patch | 60 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 debian/patches/Adapt-to-gsd-3.24.patch diff --git a/debian/control b/debian/control index 67fa5d1..f3e4a69 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-cairo-dock/cairo-dock.git Package: cairo-dock Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, cairo-dock-core (= ${binary:Version}), cairo-dock-plug-ins (>= 3.4.1) +Depends: ${shlibs:Depends}, ${misc:Depends}, cairo-dock-core (= ${binary:Version}), cairo-dock-plug-ins (>= 3.4.1), gnome-settings-daemon (>= 3.24) Description: Metapackage for cairo-dock Cairo-dock has a family-likeness with OS X dock, but with more options. It uses cairo to render nice graphics, and Glitz to use hardware acceleration. diff --git a/debian/patches/Adapt-to-gsd-3.24.patch b/debian/patches/Adapt-to-gsd-3.24.patch new file mode 100644 index 0000000..24da4df --- /dev/null +++ b/debian/patches/Adapt-to-gsd-3.24.patch @@ -0,0 +1,60 @@ +From: Jeremy Bicha <jbi...@ubuntu.com> +Date: Mon, 31 Jul 2017 00:18:59 -0400 +Subject: Adapt to gsd 3.24 + +Bug-Debian: https://bugs.debian.org/870229 +--- + data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session | 2 +- + .../desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session | 2 +- + data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session | 2 +- + data/desktop-manager/gnome-session-3.0/cairo-dock.session | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session b/data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session +index b06b2ed..8df77c3 100644 +--- a/data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session ++++ b/data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session +@@ -1,6 +1,6 @@ + [GNOME Session] + Name=Cairo-Dock Session fallback (Safe Mode) +-RequiredComponents=gnome-settings-daemon; ++RequiredComponents=org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; + RequiredProviders=windowmanager;panel; + DefaultProvider-windowmanager=metacity + DefaultProvider-panel=cairo-dock +diff --git a/data/desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session b/data/desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session +index 72c5a12..0601cc7 100644 +--- a/data/desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session ++++ b/data/desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session +@@ -1,6 +1,6 @@ + [GNOME Session] + Name=Cairo-Dock Session with Unity fallback (Safe Mode) +-RequiredComponents=gnome-settings-daemon; ++RequiredComponents=org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; + RequiredProviders=windowmanager;panel;panel_top; + DefaultProvider-windowmanager=metacity + DefaultProvider-panel=cairo-dock +diff --git a/data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session b/data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session +index 13b4c0f..bb51199 100644 +--- a/data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session ++++ b/data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session +@@ -1,6 +1,6 @@ + [GNOME Session] + Name=Cairo-Dock Session with Unity +-RequiredComponents=gnome-settings-daemon; ++RequiredComponents=org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; + RequiredProviders=windowmanager;panel;panel_top; + DefaultProvider-windowmanager=compiz + DefaultProvider-panel=cairo-dock +diff --git a/data/desktop-manager/gnome-session-3.0/cairo-dock.session b/data/desktop-manager/gnome-session-3.0/cairo-dock.session +index 2d62d50..7515023 100644 +--- a/data/desktop-manager/gnome-session-3.0/cairo-dock.session ++++ b/data/desktop-manager/gnome-session-3.0/cairo-dock.session +@@ -1,6 +1,6 @@ + [GNOME Session] + Name=Cairo-Dock Session +-RequiredComponents=gnome-settings-daemon; ++RequiredComponents=org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; + RequiredProviders=windowmanager;panel; + DefaultProvider-windowmanager=compiz + DefaultProvider-panel=cairo-dock diff --git a/debian/patches/series b/debian/patches/series index 3756918..7c97b19 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-Fix-Spelling-Error.patch 0002-Use-gnome-calculator-instead-of-gcalctool.patch +Adapt-to-gsd-3.24.patch -- 2.11.0
