[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][debian-mate-team/mate-panel][master] 6 commits: debian/patches: Add...

Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-panel

Commits:

9 changed files:

Changes:

  • debian/changelog
    1 
    +mate-panel (1.20.4-1) unstable; urgency=medium
    2 
    +
    3 
    +  * New upstream release.
    4 
    +    - Transfer focus on alt-F1 correctly. (Closes: #909176).
    5 
    +  * debian/patches:
    6 
    +    + Add 0001_RDA-support-Make-MATE-panel-aware-of-being-run-insid.patch,
    7 
    +          0002_mate-panel-panel-menu-items.c-Only-offer-Shutdown-bu.patch,
    8 
    +          0003_configure.ac-Report-RDA-support-status-in-configurat.patch.
    9 
    +      Introduce RDA (remote desktop awareness).
    10 
    +  * debian/control:
    11 
    +    + Bump Standards-Version: to 4.3.0. No changes needed.
    12 
    +    + Add B-D librda-dev.
    13 
    +  * debian/libmate-panel-applet-4-1.symbols:
    14 
    +    + Add Build-Depends-Package meta data field.
    15 
    +  * debian/compat:
    16 
    +    + Drop file. Use new debhelper-compat notation in control file (and bump
    17 
    +      to DH compat level version 12).
    18 
    +  * debian/copyright:
    19 
    +    + Update copyright attributions
    20 
    +
    21 
    + -- Mike Gabriel <sunweaver@debian.org>  Sun, 06 Jan 2019 17:10:27 +0100
    22 
    +
    1 23 
     mate-panel (1.20.3-1) unstable; urgency=medium
    2 24
    3 25 
       * New upstream release.

  • debian/compat deleted
    1 
    -11

  • debian/control
    ... ... @@ -7,7 +7,7 @@ Uploaders: Mike Gabriel <sunweaver@debian.org>,
    7 7 
                Stefano Karapetsas <stefano@karapetsas.com>,
    8 8 
                Vangelis Mouhtsis <vangelis@gnugr.org>,
    9 9 
                Petr Baudis <pasky@ucw.cz>,
    10 
    -Build-Depends: debhelper (>= 11~),
    10 
    +Build-Depends: debhelper-compat (= 12),
    11 11 
                    dpkg-dev (>= 1.16.1.1),
    12 12 
                    gir1.2-freedesktop,
    13 13 
                    gobject-introspection,
    ... ... @@ -26,6 +26,7 @@ Build-Depends: debhelper (>= 11~),
    26 26 
                    libmate-menu-dev (>= 1.18),
    27 27 
                    libmateweather-dev (>= 1.18),
    28 28 
                    libpango1.0-dev,
    29 
    +               librda-dev,
    29 30 
                    librsvg2-dev,
    30 31 
                    libsm-dev,
    31 32 
                    libsoup2.4-dev,

  • debian/copyright
    ... ... @@ -600,6 +600,8 @@ Comment:
    600 600 
      Assume license as found either in COPYING or in COPYING.LIB file.
    601 601
    602 602 
     Files: mate-panel.pot
    603 
    +       mate-clock.pot
    604 
    +       mate-fish.pot
    603 605 
            po/*.po
    604 606 
            po/gnome-copyrights.txt
    605 607 
     Copyright: THE PACKAGE'S COPYRIGHT HOLDER

  • debian/libmate-panel-applet-4-1.symbols
    1 1 
     libmate-panel-applet-4.so.1 libmate-panel-applet-4-1 #MINVER#
    2 
    +* Build-Depends-Package: libmate-panel-applet-dev
    2 3 
      _mate_panel_applet_apply_css@Base 1.14.0
    3 4 
      mate_panel_applet_background_type_get_type@Base 1.6.1
    4 5 
     #MISSING: 1.18.7# g_cclosure_marshal_VOID__ENUM@Base 1.18.6

  • debian/patches/0001_RDA-support-Make-MATE-panel-aware-of-being-run-insid.patch
    1 
    +From 4934f12e597c137822f25c456de36341bc374e4b Mon Sep 17 00:00:00 2001
    2 
    +From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 
    +Date: Wed, 27 Jun 2018 15:20:16 +0200
    4 
    +Subject: [PATCH 1/3] RDA support: Make MATE panel aware of being run inside a
    5 
    + remote desktop technology.
    6 
    +
    7 
    +---
    8 
    + configure.ac                       |  7 +++++++
    9 
    + mate-panel/Makefile.am             |  2 ++
    10 
    + mate-panel/panel-action-button.c   | 38 ++++++++++++++++++++++++++++++++++++++
    11 
    + mate-panel/panel-enums-gsettings.h |  1 +
    12 
    + mate-panel/panel-icon-names.h      |  1 +
    13 
    + mate-panel/panel-menu-items.c      | 25 +++++++++++++++++++++++++
    14 
    + 6 files changed, 74 insertions(+)
    15 
    +
    16 
    +diff --git a/configure.ac b/configure.ac
    17 
    +index 1196f44..2c544ed 100644
    18 
    +--- a/configure.ac
    19 
    ++++ b/configure.ac
    20 
    +@@ -202,6 +202,13 @@ if test "x$have_randr" = "xyes"; then
    21 
    +   AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
    22 
    + fi
    23 
    +
    24 
    ++dnl Remote Desktop Awareness
    25 
    ++
    26 
    ++PKG_CHECK_MODULES(RDA, rda, have_rda=yes, have_rda=no)
    27 
    ++if test "x$have_rda" = "xyes"; then
    28 
    ++  AC_DEFINE(HAVE_RDA, 1, [Have the Remote Desktop Awareness library])
    29 
    ++fi
    30 
    ++
    31 
    + dnl Modules dir
    32 
    + AC_SUBST([modulesdir],"\$(libdir)/mate-panel/modules")
    33 
    +
    34 
    +diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am
    35 
    +index 836b49e..3c21782 100644
    36 
    +--- a/mate-panel/Makefile.am
    37 
    ++++ b/mate-panel/Makefile.am
    38 
    +@@ -124,6 +124,7 @@ mate_panel_SOURCES = \
    39 
    + mate_panel_CPPFLAGS = \
    40 
    + 	$(AM_CPPFLAGS) \
    41 
    + 	$(XRANDR_CFLAGS) \
    42 
    ++	$(RDA_CFLAGS) \
    43 
    + 	-DPANEL_MODULES_DIR=\"$(modulesdir)\" \
    44 
    + 	-DMATEMENU_I_KNOW_THIS_IS_UNSTABLE
    45 
    +
    46 
    +@@ -135,6 +136,7 @@ mate_panel_LDADD = \
    47 
    + 	$(DCONF_LIBS) \
    48 
    + 	$(XRANDR_LIBS) \
    49 
    + 	$(X_LIBS) \
    50 
    ++	$(RDA_LIBS) \
    51 
    + 	-lm
    52 
    +
    53 
    + mate_panel_LDFLAGS = -export-dynamic
    54 
    +diff --git a/mate-panel/panel-action-button.c b/mate-panel/panel-action-button.c
    55 
    +index e0612b2..bebfc61 100644
    56 
    +--- a/mate-panel/panel-action-button.c
    57 
    ++++ b/mate-panel/panel-action-button.c
    58 
    +@@ -33,6 +33,10 @@
    59 
    + #include <glib/gi18n.h>
    60 
    + #include <gio/gio.h>
    61 
    +
    62 
    ++#ifdef HAVE_RDA
    63 
    ++#include <rda/rda.h>
    64 
    ++#endif
    65 
    ++
    66 
    + #define MATE_DESKTOP_USE_UNSTABLE_API
    67 
    + #include <libmate-desktop/mate-desktop-utils.h>
    68 
    + #include <libmate-desktop/mate-gsettings.h>
    69 
    +@@ -96,6 +100,9 @@ static ObsoleteEnumStringPair panel_action_type_map [] = {
    70 
    + 	{ PANEL_ACTION_FORCE_QUIT,     "force-quit"     },
    71 
    + 	{ PANEL_ACTION_CONNECT_SERVER, "connect-server" },
    72 
    + 	{ PANEL_ACTION_SHUTDOWN,       "shutdown"       },
    73 
    ++#ifdef HAVE_RDA
    74 
    ++	{ PANEL_ACTION_SUSPEND,        "suspend"        },
    75 
    ++#endif
    76 
    + 	{ 0,                           NULL             },
    77 
    + };
    78 
    +
    79 
    +@@ -232,6 +239,24 @@ panel_action_logout (GtkWidget *widget)
    80 
    + 						      PANEL_SESSION_MANAGER_LOGOUT_MODE_NORMAL);
    81 
    + }
    82 
    +
    83 
    ++#ifdef HAVE_RDA
    84 
    ++/* Suspend Remote Session
    85 
    ++ */
    86 
    ++static void
    87 
    ++panel_action_suspend (GtkWidget *widget)
    88 
    ++{
    89 
    ++
    90 
    ++	rda_session_suspend();
    91 
    ++
    92 
    ++}
    93 
    ++
    94 
    ++static gboolean
    95 
    ++panel_action_suspend_not_supported(void)
    96 
    ++{
    97 
    ++	return (!rda_session_can_be_suspended());
    98 
    ++}
    99 
    ++#endif /* HAVE_RDA */
    100 
    ++
    101 
    + static void
    102 
    + panel_action_shutdown (GtkWidget *widget)
    103 
    + {
    104 
    +@@ -412,6 +437,19 @@ static PanelAction actions [] = {
    105 
    + 		panel_action_shutdown, NULL, NULL,
    106 
    + 		panel_action_shutdown_reboot_is_disabled
    107 
    + 	}
    108 
    ++#ifdef HAVE_RDA
    109 
    ++        ,
    110 
    ++	{
    111 
    ++		PANEL_ACTION_SUSPEND,
    112 
    ++		PANEL_ICON_SUSPEND,
    113 
    ++		N_("Suspend Session..."),
    114 
    ++		N_("Suspend the Remote Session and Resume later"),
    115 
    ++		"gospanel-20",
    116 
    ++		"ACTION:suspend:NEW",
    117 
    ++		panel_action_suspend, NULL, NULL,
    118 
    ++		panel_action_suspend_not_supported
    119 
    ++	}
    120 
    ++#endif /* HAVE_RDA */
    121 
    + };
    122 
    +
    123 
    + gboolean
    124 
    +diff --git a/mate-panel/panel-enums-gsettings.h b/mate-panel/panel-enums-gsettings.h
    125 
    +index 3f9a756..da2bcef 100644
    126 
    +--- a/mate-panel/panel-enums-gsettings.h
    127 
    ++++ b/mate-panel/panel-enums-gsettings.h
    128 
    +@@ -68,6 +68,7 @@ typedef enum {
    129 
    + 	PANEL_ACTION_FORCE_QUIT,
    130 
    + 	PANEL_ACTION_CONNECT_SERVER,
    131 
    + 	PANEL_ACTION_SHUTDOWN,
    132 
    ++	PANEL_ACTION_SUSPEND,
    133 
    + 	PANEL_ACTION_LAST
    134 
    + } PanelActionButtonType;
    135 
    +
    136 
    +diff --git a/mate-panel/panel-icon-names.h b/mate-panel/panel-icon-names.h
    137 
    +index 4c948b7..c887a34 100644
    138 
    +--- a/mate-panel/panel-icon-names.h
    139 
    ++++ b/mate-panel/panel-icon-names.h
    140 
    +@@ -33,6 +33,7 @@
    141 
    + #define PANEL_ICON_SAVED_SEARCH		"folder-saved-search"
    142 
    + #define PANEL_ICON_SEARCHTOOL		"system-search"
    143 
    + #define PANEL_ICON_SHUTDOWN		"system-shutdown"
    144 
    ++#define PANEL_ICON_SUSPEND		"stock_media-pause"
    145 
    + #define PANEL_ICON_THEME		"preferences-desktop-theme"
    146 
    + #define PANEL_ICON_TRASH		"user-trash"
    147 
    + #define PANEL_ICON_UNKNOWN		"image-missing"
    148 
    +diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c
    149 
    +index 6ea12c2..cc73c7f 100644
    150 
    +--- a/mate-panel/panel-menu-items.c
    151 
    ++++ b/mate-panel/panel-menu-items.c
    152 
    +@@ -39,6 +39,9 @@
    153 
    + #include <string.h>
    154 
    + #include <glib/gi18n.h>
    155 
    + #include <gio/gio.h>
    156 
    ++#ifdef HAVE_RDA
    157 
    ++#include <rda/rda.h>
    158 
    ++#endif
    159 
    + #include <libmate-desktop/mate-gsettings.h>
    160 
    +
    161 
    + #include <libpanel-util/panel-error.h>
    162 
    +@@ -1582,6 +1585,28 @@ panel_menu_items_append_lock_logout (GtkWidget *menu)
    163 
    + 	}
    164 
    + 	g_list_free (children);
    165 
    +
    166 
    ++#ifdef HAVE_RDA
    167 
    ++	if (rda_session_can_be_suspended())
    168 
    ++	{
    169 
    ++
    170 
    ++		label = g_strdup_printf (_("Suspend %s Session..."),
    171 
    ++                                        rda_get_remote_technology_name());
    172 
    ++		tooltip = g_strdup_printf (_("Suspend this %s session and resume it later..."),
    173 
    ++                                        rda_get_remote_technology_name());
    174 
    ++		item = panel_menu_items_create_action_item_full (PANEL_ACTION_SUSPEND,
    175 
    ++                                                                label, tooltip);
    176 
    ++		g_free (label);
    177 
    ++		g_free (tooltip);
    178 
    ++
    179 
    ++		if (item != NULL) {
    180 
    ++			/* this separator will always be inserted */
    181 
    ++			add_menu_separator (menu);
    182 
    ++			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
    183 
    ++		}
    184 
    ++
    185 
    ++	}
    186 
    ++#endif /* HAVE_RDA */
    187 
    ++
    188 
    + 	if (panel_lock_screen_action_available("lock"))
    189 
    + 	{
    190 
    + 		item = panel_menu_items_create_action_item(PANEL_ACTION_LOCK);
    191 
    +--
    192 
    +2.11.0
    193 
    +

  • debian/patches/0002_mate-panel-panel-menu-items.c-Only-offer-Shutdown-bu.patch
    1 
    +From 9836f965bfbb16d3eb882453175f6754fe395820 Mon Sep 17 00:00:00 2001
    2 
    +From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 
    +Date: Thu, 28 Jun 2018 14:45:04 +0200
    4 
    +Subject: [PATCH 2/3] mate-panel/panel-menu-items.c: Only offer Shutdown
    5 
    + button, if not running remotely (with HAVE_RDA defined).
    6 
    +
    7 
    +---
    8 
    + mate-panel/panel-menu-items.c | 6 ++++++
    9 
    + 1 file changed, 6 insertions(+)
    10 
    +
    11 
    +diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c
    12 
    +index cc73c7f..3112e61 100644
    13 
    +--- a/mate-panel/panel-menu-items.c
    14 
    ++++ b/mate-panel/panel-menu-items.c
    15 
    +@@ -1669,6 +1669,9 @@ panel_menu_items_append_lock_logout (GtkWidget *menu)
    16 
    + 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
    17 
    + 	}
    18 
    +
    19 
    ++#ifdef HAVE_RDA
    20 
    ++	if (rda_session_is_local()) {
    21 
    ++#endif /* HAVE_RDA */
    22 
    + 	item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN);
    23 
    + 	if (item != NULL) {
    24 
    + 		if (!separator_inserted)
    25 
    +@@ -1676,6 +1679,9 @@ panel_menu_items_append_lock_logout (GtkWidget *menu)
    26 
    +
    27 
    + 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
    28 
    + 	}
    29 
    ++#ifdef HAVE_RDA
    30 
    ++	}
    31 
    ++#endif /* HAVE_RDA */
    32 
    + }
    33 
    +
    34 
    + void
    35 
    +--
    36 
    +2.11.0
    37 
    +

  • debian/patches/0003_configure.ac-Report-RDA-support-status-in-configurat.patch
    1 
    +From 191f9703a723520954f55de551b70b5849a62c74 Mon Sep 17 00:00:00 2001
    2 
    +From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 
    +Date: Thu, 28 Jun 2018 15:39:47 +0200
    4 
    +Subject: [PATCH 3/3] configure.ac: Report RDA support status in configuration
    5 
    + summary.
    6 
    +
    7 
    +---
    8 
    + configure.ac | 1 +
    9 
    + 1 file changed, 1 insertion(+)
    10 
    +
    11 
    +diff --git a/configure.ac b/configure.ac
    12 
    +index 2c544ed..276a832 100644
    13 
    +--- a/configure.ac
    14 
    ++++ b/configure.ac
    15 
    +@@ -337,6 +337,7 @@ echo "
    16 
    +         Use *_DISABLE_DEPRECATED:      ${enable_deprecation_flags}
    17 
    +         Applets to build in-process:   ${PANEL_INPROCESS_APPLETS}
    18 
    +         XRandr support:                ${have_randr}
    19 
    ++        RDA support:                   ${have_rda}
    20 
    +         Build introspection support:   ${found_introspection}
    21 
    +         Build gtk-doc documentation:   ${enable_gtk_doc}
    22 
    +
    23 
    +--
    24 
    +2.11.0
    25 
    +

  • debian/patches/series
    1 
    +0001_RDA-support-Make-MATE-panel-aware-of-being-run-insid.patch
    2 
    +0002_mate-panel-panel-menu-items.c-Only-offer-Shutdown-bu.patch
    3 
    +0003_configure.ac-Report-RDA-support-status-in-configurat.patch

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: