diff --git a/debian/changelog b/debian/changelog index ca1b846..bd5a9ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +gnome-shell-extensions (3.22.2-2) unstable; urgency=medium + + * Add adapt-to-gsd324.patch (Closes: #869948): + - Adjust gnome-session file for gnome-settings-daemon 3.24 + * debian/control.in: + - Bump Standards-Version to 4.0.0 + - Explicitly depend on gnome-settings-daemon >= 3.24 + - Drop version from gnome-tweak-tool recommends + - Depend on gnome-session-bin instead of gnome-session (LP: #1702832) + + -- Jeremy Bicha Sun, 06 Aug 2017 17:38:06 -0400 + gnome-shell-extensions (3.22.2-1kali1) kali-dev; urgency=medium * Sync with Debian. Remaining changes: diff --git a/debian/control b/debian/control index 1678125..44cc8fa 100644 --- a/debian/control +++ b/debian/control @@ -6,13 +6,13 @@ Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Michael Biebl +Uploaders: Andreas Henriksson , Jeremy Bicha , Michael Biebl Build-Depends: debhelper (>= 10), pkg-config (>= 0.22), gettext, gnome-pkg-tools, libgnome-desktop-3-dev (>= 3.2.0), -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell-extensions Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell-extensions @@ -31,8 +31,9 @@ gir1.2-mutter-3.0, gir1.2-pango-1.0, gvfs (>= 1.16.0), - gnome-session (>= 3.8) -Recommends: gnome-tweak-tool (>= ${gnome:Version}) + gnome-session-bin (>= 3.8), + gnome-settings-daemon (>= 3.24) +Recommends: gnome-tweak-tool Replaces: gnome-shell-common (<< 3.18) Breaks: gnome-shell-common (<< 3.18) Description: Extensions to extend functionality of GNOME Shell diff --git a/debian/control.in b/debian/control.in index 68ed092..7feed1b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -8,7 +8,7 @@ gettext, gnome-pkg-tools, libgnome-desktop-3-dev (>= 3.2.0), -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell-extensions Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell-extensions @@ -27,8 +27,9 @@ gir1.2-mutter-3.0, gir1.2-pango-1.0, gvfs (>= 1.16.0), - gnome-session (>= 3.8) -Recommends: gnome-tweak-tool (>= ${gnome:Version}) + gnome-session-bin (>= 3.8), + gnome-settings-daemon (>= 3.24) +Recommends: gnome-tweak-tool Replaces: gnome-shell-common (<< 3.18) Breaks: gnome-shell-common (<< 3.18) Description: Extensions to extend functionality of GNOME Shell diff --git a/debian/patches/adapt-to-gsd324.patch b/debian/patches/adapt-to-gsd324.patch new file mode 100644 index 0000000..be3ebb7 --- /dev/null +++ b/debian/patches/adapt-to-gsd324.patch @@ -0,0 +1,22 @@ +From 4fa73145b489423ef099aa1229193352ae6e2a77 Mon Sep 17 00:00:00 2001 +From: Rui Matos +Date: Tue, 2 May 2017 19:25:53 +0200 +Subject: data: Adjust to g-s-d's plugin removals + +These plugins have been removed. + +https://bugzilla.gnome.org/show_bug.cgi?id=782233 +--- + data/gnome-classic.session.desktop.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/gnome-classic.session.desktop.in b/data/gnome-classic.session.desktop.in +index b7b8d02..392ec37 100644 +--- a/data/gnome-classic.session.desktop.in ++++ b/data/gnome-classic.session.desktop.in +@@ -1,3 +1,3 @@ + [GNOME Session] + Name=GNOME Classic +-RequiredComponents=org.gnome.Shell;gnome-settings-daemon;nautilus-classic; ++RequiredComponents=org.gnome.Shell;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;nautilus-classic; + diff --git a/debian/patches/dont-require-nautilus-classic.patch b/debian/patches/dont-require-nautilus-classic.patch index 2140dfe..5f18c36 100644 --- a/debian/patches/dont-require-nautilus-classic.patch +++ b/debian/patches/dont-require-nautilus-classic.patch @@ -7,5 +7,5 @@ @@ -1,3 +1,3 @@ [GNOME Session] Name=GNOME Classic --RequiredComponents=org.gnome.Shell;gnome-settings-daemon;nautilus-classic; -+RequiredComponents=org.gnome.Shell;gnome-settings-daemon; +-RequiredComponents=org.gnome.Shell;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;nautilus-classic; ++RequiredComponents=org.gnome.Shell;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; diff --git a/debian/patches/series b/debian/patches/series index c3e3b18..3808404 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +adapt-to-gsd324.patch dont-require-nautilus-classic.patch gnome-session-classic-wrapper-script.patch apps-menu-with-multiple-levels.patch