[mate-desktop] 02/04: debian/patches: Drop 1000_global_menu_support.diff. Applied upstream.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch ubuntu/bionic
in repository mate-desktop.

commit b25a51fb740ff520fbebccf3272ec94db2d1e147
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Tue Jan 23 12:16:59 2018 +0000

    debian/patches: Drop 1000_global_menu_support.diff. Applied upstream.
---
 debian/patches/1000_global_menu_support.diff | 29 ----------------------------
 debian/patches/series                        |  1 -
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/1000_global_menu_support.diff b/debian/patches/1000_global_menu_support.diff
deleted file mode 100644
index 1b95425..0000000
--- a/debian/patches/1000_global_menu_support.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Add gschema keys to support Global Menu. (LP: #1675956)
-Author: Martin Wimpress <martin at ubuntu-mate.org>
-Abstract:
- These gschema keys were accidently not included in the mate-desktop
- 1.18.0 release. This patch adds them so Global Menu integration can be
- supported.
-
-
-diff --git a/schemas/org.mate.interface.gschema.xml.in b/schemas/org.mate.interface.gschema.xml.in
-index 72cb9b8..c80068c 100644
---- a/schemas/org.mate.interface.gschema.xml.in
-+++ b/schemas/org.mate.interface.gschema.xml.in
-@@ -160,6 +160,16 @@
-       <summary>Titlebar layout of GTK3 client-side decorated windows</summary>
-       <description>This setting determines which buttons should be put in the titlebar of client-side decorated windows, and whether they should be placed at the left of right. See https://developer.gnome.org/gtk3/stable/GtkSettings.html#GtkSettings--gtk-decoration-layout.</description>
-     </key>
-+    <key name="gtk-shell-shows-app-menu" type="b">
-+      <default>false</default>
-+      <summary>Use a global menubar for displaying application menus</summary>
-+      <description> This setting determines where application menu will be displayed - in a window or on a panel with MenuModel protocol. See https://developer.gnome.org/gtk3/stable/GtkSettings.html#GtkSettings--gtk-shell-shows-app-menu.</description>
-+    </key>
-+    <key name="gtk-shell-shows-menubar" type="b">
-+      <default>false</default>
-+      <summary>Use a global menubar for displaying window menubars</summary>
-+      <description> This setting determines where window menubars will be displayed - in a window or on a panel with MenuModel protocol. See https://developer.gnome.org/gtk3/stable/GtkSettings.html#GtkSettings--gtk-shell-shows-menubar.</description>
-+    </key>
-     <key name="automatic-mnemonics" type="b">
-       <default>true</default>
-       <summary>Only show mnemonics on when the Alt key is pressed</summary>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c36d04f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-1000_global_menu_support.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-desktop.git