callisto-debian/mate-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debian/{changelog,libmate-desktop-2-17.symbols}: resolve merge conflict

Browse Source
This commit is contained in:
Martin Wimpress 2018-02-07 18:22:43 +00:00
commit ece739808f
5 changed files with 42 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,9 @@
mate-desktop (1.20.0-1) UNRELEASED; urgency=medium
* New upstream release.
-- Martin Wimpress <martin.wimpress@ubuntu.com> Wed, 07 Feb 2018 14:03:55 +0000
mate-desktop (1.18.0-2) unstable; urgency=medium
[ Mike Gabriel ]
@ -86,7 +92,7 @@ mate-desktop (1.16.0-1) unstable; urgency=medium
[ Mike Gabriel ]
* debian/changelog:
+ Fix missing changelog items for 1.15.1-0ubuntu1 upload.
+ Fix missing changelog items for 1.15.1-1 upload.
* debian/control:
+ Dependencies updated for MATE 1.16.
* debian/watch:
@ -94,7 +100,7 @@ mate-desktop (1.16.0-1) unstable; urgency=medium
-- Mike Gabriel <sunweaver@debian.org> Fri, 30 Sep 2016 11:02:53 +0200
mate-desktop (1.15.1-0ubuntu1) yakkety; urgency=medium
mate-desktop (1.15.1-1) yakkety; urgency=medium
* New upstream development release.
* debian/control:

5
debian/copyright vendored
View File

@ -56,9 +56,7 @@ Files: libmate-desktop/mate-gsettings.c
Copyright: 2013, Stefano Karapetsas <stefano@karapetsas.com>
License: GPL-2+
Files: libmate-desktop/mate-aboutdialog.c
libmate-desktop/mate-aboutdialog.h
libmate-desktop/mate-colorbutton.c
Files: libmate-desktop/mate-colorbutton.c
libmate-desktop/mate-colorbutton.h
Copyright: 2001. CodeFactory AB
2001, 2002 Anders Carlsson
@ -146,6 +144,7 @@ Comment:
COPYING.LIB file.
Files: .tx/config
.github/issue_template.md
docs/Makefile.am
docs/reference/Makefile.am
docs/reference/mate-desktop/Makefile.am

64
debian/libmate-desktop-2-17.symbols vendored
View File

@ -20,36 +20,36 @@ libmate-desktop-2.so.17 libmate-desktop-2-17 #MINVER#
mate_desktop_gtk_style_get_dark_color@Base 1.14.0
mate_desktop_gtk_style_get_light_color@Base 1.14.0
mate_rr_labeler_get_rgba_for_output@Base 1.14.0
mate_about_dialog_get_artists@Base 1.10.0
mate_about_dialog_get_authors@Base 1.10.0
mate_about_dialog_get_comments@Base 1.10.0
mate_about_dialog_get_copyright@Base 1.10.0
mate_about_dialog_get_documenters@Base 1.10.0
mate_about_dialog_get_license@Base 1.10.0
mate_about_dialog_get_logo@Base 1.10.0
mate_about_dialog_get_logo_icon_name@Base 1.10.0
mate_about_dialog_get_program_name@Base 1.10.0
mate_about_dialog_get_translator_credits@Base 1.10.0
mate_about_dialog_get_type@Base 1.10.0
mate_about_dialog_get_version@Base 1.10.0
mate_about_dialog_get_website@Base 1.10.0
mate_about_dialog_get_website_label@Base 1.10.0
mate_about_dialog_get_wrap_license@Base 1.10.0
mate_about_dialog_new@Base 1.10.0
mate_about_dialog_set_artists@Base 1.10.0
mate_about_dialog_set_authors@Base 1.10.0
mate_about_dialog_set_comments@Base 1.10.0
mate_about_dialog_set_copyright@Base 1.10.0
mate_about_dialog_set_documenters@Base 1.10.0
mate_about_dialog_set_license@Base 1.10.0
mate_about_dialog_set_logo@Base 1.10.0
mate_about_dialog_set_logo_icon_name@Base 1.10.0
mate_about_dialog_set_program_name@Base 1.10.0
mate_about_dialog_set_translator_credits@Base 1.10.0
mate_about_dialog_set_version@Base 1.10.0
mate_about_dialog_set_website@Base 1.10.0
mate_about_dialog_set_website_label@Base 1.10.0
mate_about_dialog_set_wrap_license@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_artists@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_authors@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_comments@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_copyright@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_documenters@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_license@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_logo@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_logo_icon_name@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_program_name@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_translator_credits@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_type@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_version@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_website@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_website_label@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_get_wrap_license@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_new@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_artists@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_authors@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_comments@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_copyright@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_documenters@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_license@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_logo@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_logo_icon_name@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_program_name@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_translator_credits@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_version@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_website@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_website_label@Base 1.10.0
#MISSING: 1.19.2# mate_about_dialog_set_wrap_license@Base 1.10.0
mate_bg_changes_with_time@Base 1.6.1
mate_bg_create_frame_thumbnail@Base 1.6.1
mate_bg_create_thumbnail@Base 1.6.1
@ -57,7 +57,7 @@ libmate-desktop-2.so.17 libmate-desktop-2-17 #MINVER#
mate_bg_crossfade_is_started@Base 1.6.1
mate_bg_crossfade_new@Base 1.6.1
mate_bg_crossfade_start@Base 1.6.1
mate_bg_crossfade_start_widget@Base 1.18.0
mate_bg_crossfade_start_widget@Base 1.19.2
mate_bg_crossfade_stop@Base 1.6.1
mate_bg_draw@Base 1.6.1
mate_bg_get_color@Base 1.6.1
@ -275,4 +275,4 @@ libmate-desktop-2.so.17 libmate-desktop-2-17 #MINVER#
mate_rr_screen_refresh@Base 1.6.1
mate_rr_screen_set_primary_output@Base 1.6.1
mate_rr_screen_set_size@Base 1.6.1
mate_show_about_dialog@Base 1.10.0
#MISSING: 1.19.2# mate_show_about_dialog@Base 1.10.0

29
debian/patches/1000_global_menu_support.diff vendored
View File

@ -1,29 +0,0 @@
Description: Add gschema keys to support Global Menu. (LP: #1675956)
Author: Martin Wimpress <martin@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>

1
debian/patches/series vendored
View File

@ -1 +0,0 @@
1000_global_menu_support.diff