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

[Git][debian-mate-team/mate-screensaver][master] 3 commits: debian/patches: Rebase RDA patches.

Title: GitLab

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

Commits:

4 changed files:

Changes:

  • debian/changelog
    1 
    +mate-screensaver (1.26.1-1) unstable; urgency=medium
    2 
    +
    3 
    +  * New upstream release.
    4 
    +  * debian/patches:
    5 
    +    + Rebase RDA patches.
    6 
    +  * debian/copyright:
    7 
    +    + Update copyright attributions.
    8 
    +
    9 
    + -- Mike Gabriel <sunweaver@debian.org>  Tue, 14 Dec 2021 07:45:02 +0100
    10 
    +
    1 11 
     mate-screensaver (1.26.0-1) unstable; urgency=medium
    2 12
    3 13 
       [ Martin Wimpress ]

  • debian/copyright
    ... ... @@ -49,6 +49,19 @@ Copyright: 2004-2008, William Jon McCann <mccann@jhu.edu>
    49 49 
                2012-2021, MATE Developers
    50 50 
     License: GPL-2+
    51 51
    52 
    +Files: helper/pam-helper.c
    53 
    +Copyright: 2002, SuSE Linux AG.
    54 
    +           2019-2021, Paul Wolneykien <manowar@altlinux.org>
    55 
    +License: GPL-2+
    56 
    +
    57 
    +Files: helper/helper_proto.c
    58 
    +       helper/helper_proto.h
    59 
    +Copyright: 2019-2021, Paul Wolneykien <manowar@altlinux.org>
    60 
    +License: GPL-2+
    61 
    +
    62 
    +Files: src/gs-auth-pam.h
    63 
    +Copyright: 2019, Paul Wolneykien <manowar@altlinux.org>
    64 
    +License: GPL-2+
    52 65
    53 66 
     Files: src/gs-auth-bsdauth.c
    54 67 
     Copyright: 2006, William Jon McCann <mccann@jhu.edu>
    ... ... @@ -153,6 +166,7 @@ Files: .build.yml
    153 166 
            data/images/*.svg
    154 167 
            data/images/cosmos/*
    155 168 
            doc/*
    169 
    +       helper/Makefile.am
    156 170 
            its/wallpaper.its
    157 171 
            its/wallpaper.loc
    158 172 
            po/LINGUAS

  • debian/patches/1002_RDA-support-Make-MATE-s-screensaver-aware-of-being-r.patch
    ... ... @@ -20,7 +20,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    20 20
    21 21 
     --- a/configure.ac
    22 22 
     +++ b/configure.ac
    23 
    -@@ -50,6 +50,7 @@
    23 
    +@@ -52,6 +52,7 @@
    24 24 
      LIBMATE_MENU_REQUIRED_VERSION=1.21.0
    25 25 
      MATE_DESKTOP_REQUIRED_VERSION=1.17.0
    26 26 
      LIBMATEKBDUI_REQUIRED_VERSION=1.17.0
    ... ... @@ -28,7 +28,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    28 28
    29 29 
      AC_CHECK_HEADERS(unistd.h)
    30 30 
      AC_CHECK_HEADERS(crypt.h sys/select.h)
    31 
    -@@ -414,6 +415,15 @@
    31 
    +@@ -429,6 +430,15 @@
    32 32 
      fi
    33 33
    34 34 
      dnl ---------------------------------------------------------------------------
    ... ... @@ -44,7 +44,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    44 44 
      dnl - The --enable-locking option
    45 45 
      dnl ---------------------------------------------------------------------------
    46 46
    47 
    -@@ -1182,6 +1192,7 @@
    47 
    +@@ -1168,6 +1178,7 @@
    48 48 
              Have enhanced shadow:     ${have_shadow_enhanced}
    49 49 
              Have HPUX shadow:         ${have_shadow_hpux}
    50 50 
              Have password helper:     ${have_passwd_helper}
    ... ... @@ -54,7 +54,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    54 54 
      if test "x$need_setuid" = "xyes" -a "x$have_pam" != "xyes" ; then
    55 55 
     --- a/data/lock-dialog-default.ui
    56 56 
     +++ b/data/lock-dialog-default.ui
    57 
    -@@ -250,6 +250,22 @@
    57 
    +@@ -261,6 +261,22 @@
    58 58 
                            </packing>
    59 59 
                          </child>
    60 60 
                          <child>
    ... ... @@ -77,7 +77,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    77 77 
                            <object class="GtkButton" id="auth-logout-button">
    78 78 
                              <property name="label" translatable="yes">_Log Out</property>
    79 79 
                              <property name="visible">True</property>
    80 
    -@@ -262,7 +278,7 @@
    80 
    +@@ -273,7 +289,7 @@
    81 81 
                            <packing>
    82 82 
                              <property name="expand">False</property>
    83 83 
                              <property name="fill">False</property>
    ... ... @@ -86,7 +86,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    86 86 
                            </packing>
    87 87 
                          </child>
    88 88 
                          <child>
    89 
    -@@ -278,7 +294,7 @@
    89 
    +@@ -289,7 +305,7 @@
    90 90 
                            <packing>
    91 91 
                              <property name="expand">False</property>
    92 92 
                              <property name="fill">False</property>
    ... ... @@ -95,7 +95,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    95 95 
                            </packing>
    96 96 
                          </child>
    97 97 
                          <child>
    98 
    -@@ -293,7 +309,7 @@
    98 
    +@@ -304,7 +320,7 @@
    99 99 
                            <packing>
    100 100 
                              <property name="expand">False</property>
    101 101 
                              <property name="fill">False</property>
    ... ... @@ -106,7 +106,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    106 106 
                        </object>
    107 107 
     --- a/src/Makefile.am
    108 108 
     +++ b/src/Makefile.am
    109 
    -@@ -33,6 +33,7 @@
    109 
    +@@ -34,6 +34,7 @@
    110 110 
      	$(LIBNOTIFY_CFLAGS)					\
    111 111 
      	$(SYSTEMD_CFLAGS)					\
    112 112 
      	$(LIBELOGIND_CFLAGS)					\
    ... ... @@ -114,7 +114,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    114 114 
      	$(NULL)
    115 115
    116 116 
      bin_PROGRAMS = \
    117 
    -@@ -130,6 +131,7 @@
    117 
    +@@ -138,6 +139,7 @@
    118 118 
      test_window_LDADD =			\
    119 119 
      	$(MATE_SCREENSAVER_LIBS)	\
    120 120 
      	$(SAVER_LIBS)			\
    ... ... @@ -122,15 +122,15 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    122 122 
      	$(NULL)
    123 123
    124 124 
      mate_screensaver_dialog_SOURCES = 	\
    125 
    -@@ -158,6 +160,7 @@
    125 
    +@@ -166,6 +168,7 @@
    126 126 
      	$(AUTH_LIBS)			\
    127 127 
      	$(LIBMATEKBDUI_LIBS)		\
    128 128 
      	$(LIBNOTIFY_LIBS)		\
    129 129 
     +	$(RDA_LIBS)			\
    130 130 
      	$(NULL)
    131 131
    132 
    - BUILT_SOURCES = 		\
    133 
    -@@ -218,6 +221,7 @@
    132 
    + if HAVE_PASSWD_HELPER
    133 
    +@@ -233,6 +236,7 @@
    134 134 
      	$(SAVER_LIBS)			\
    135 135 
      	$(SYSTEMD_LIBS)			\
    136 136 
      	$(LIBELOGIND_LIBS)		\
    ... ... @@ -140,7 +140,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    140 140 
      mate_screensaver_LDFLAGS = -export-dynamic
    141 141 
     --- a/src/gs-lock-plug.c
    142 142 
     +++ b/src/gs-lock-plug.c
    143 
    -@@ -39,6 +39,10 @@
    143 
    +@@ -40,6 +40,10 @@
    144 144 
      #include <gtk/gtkx.h>
    145 145 
      #include <gio/gio.h>
    146 146
    ... ... @@ -151,7 +151,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    151 151 
      #define MATE_DESKTOP_USE_UNSTABLE_API
    152 152 
      #include <libmate-desktop/mate-desktop-utils.h>
    153 153
    154 
    -@@ -101,6 +105,7 @@
    154 
    +@@ -104,6 +108,7 @@
    155 155 
      	GtkWidget   *auth_switch_button;
    156 156 
      	GtkWidget   *auth_cancel_button;
    157 157 
      	GtkWidget   *auth_logout_button;
    ... ... @@ -159,7 +159,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    159 159 
      	GtkWidget   *auth_note_button;
    160 160 
      	GtkWidget   *note_tab;
    161 161 
      	GtkWidget   *note_tab_label;
    162 
    -@@ -112,6 +117,9 @@
    162 
    +@@ -115,6 +120,9 @@
    163 163
    164 164 
      	gboolean     caps_lock_on;
    165 165 
      	gboolean     switch_enabled;
    ... ... @@ -169,7 +169,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    169 169 
      	gboolean     leave_note_enabled;
    170 170 
      	gboolean     logout_enabled;
    171 171 
      	char        *logout_command;
    172 
    -@@ -148,6 +156,9 @@
    172 
    +@@ -151,6 +159,9 @@
    173 173 
          PROP_LOGOUT_ENABLED,
    174 174 
          PROP_LOGOUT_COMMAND,
    175 175 
          PROP_SWITCH_ENABLED,
    ... ... @@ -179,7 +179,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    179 179 
          PROP_STATUS_MESSAGE
    180 180 
      };
    181 181
    182 
    -@@ -1096,6 +1107,37 @@
    182 
    +@@ -1135,6 +1146,37 @@
    183 183 
      	}
    184 184 
      }
    185 185
    ... ... @@ -217,7 +217,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    217 217 
      static void
    218 218 
      gs_lock_plug_set_logout_command (GSLockPlug *plug,
    219 219 
                                       const char *command)
    220 
    -@@ -1159,6 +1201,11 @@
    220 
    +@@ -1198,6 +1240,11 @@
    221 221 
      	case PROP_SWITCH_ENABLED:
    222 222 
      		g_value_set_boolean (value, self->priv->switch_enabled);
    223 223 
      		break;
    ... ... @@ -229,7 +229,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    229 229 
      	case PROP_STATUS_MESSAGE:
    230 230 
      		g_value_set_string (value, self->priv->status_message);
    231 231 
      		break;
    232 
    -@@ -1240,6 +1287,11 @@
    232 
    +@@ -1279,6 +1326,11 @@
    233 233 
      	case PROP_SWITCH_ENABLED:
    234 234 
      		gs_lock_plug_set_switch_enabled (self, g_value_get_boolean (value));
    235 235 
      		break;
    ... ... @@ -241,7 +241,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    241 241 
      	default:
    242 242 
      		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
    243 243 
      		break;
    244 
    -@@ -1329,6 +1381,15 @@
    244 
    +@@ -1366,6 +1418,15 @@
    245 245 
      	                                         NULL,
    246 246 
      	                                         FALSE,
    247 247 
      	                                         G_PARAM_READWRITE));
    ... ... @@ -257,7 +257,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    257 257
    258 258 
      	binding_set = gtk_binding_set_by_class (klass);
    259 259
    260 
    -@@ -1456,6 +1517,25 @@
    260 
    +@@ -1493,6 +1554,25 @@
    261 261 
      	}
    262 262 
      }
    263 263
    ... ... @@ -283,7 +283,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    283 283 
      void
    284 284 
      gs_lock_plug_set_busy (GSLockPlug *plug)
    285 285 
      {
    286 
    -@@ -1670,6 +1750,12 @@
    286 
    +@@ -1707,6 +1787,12 @@
    287 287 
      	gtk_widget_set_focus_on_click (GTK_WIDGET (plug->priv->auth_logout_button), FALSE);
    288 288 
      	gtk_widget_set_no_show_all (plug->priv->auth_logout_button, TRUE);
    289 289
    ... ... @@ -296,7 +296,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    296 296 
      	plug->priv->auth_cancel_button =  gs_lock_plug_add_button (GS_LOCK_PLUG (plug),
    297 297 
      	                                  plug->priv->auth_action_area,
    298 298 
      	                                  "gtk-cancel");
    299 
    -@@ -2044,6 +2130,7 @@
    299 
    +@@ -2090,6 +2176,7 @@
    300 300 
      	plug->priv->auth_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-cancel-button"));
    301 301 
      	plug->priv->auth_logout_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-logout-button"));
    302 302 
      	plug->priv->auth_switch_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-switch-button"));
    ... ... @@ -304,7 +304,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    304 304 
      	plug->priv->auth_note_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-note-button"));
    305 305 
      	plug->priv->note_tab = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab"));
    306 306 
      	plug->priv->note_tab_label = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab-label"));
    307 
    -@@ -2061,6 +2148,10 @@
    307 
    +@@ -2107,6 +2194,10 @@
    308 308 
      	{
    309 309 
      		gtk_widget_set_no_show_all (plug->priv->auth_switch_button, TRUE);
    310 310 
      	}
    ... ... @@ -315,7 +315,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    315 315 
      	if (plug->priv->auth_note_button != NULL)
    316 316 
      	{
    317 317 
      		gtk_widget_set_no_show_all (plug->priv->auth_note_button, TRUE);
    318 
    -@@ -2219,6 +2310,24 @@
    318 
    +@@ -2289,6 +2380,24 @@
    319 319 
      		}
    320 320 
      	}
    321 321
    ... ... @@ -340,7 +340,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    340 340 
      	plug->priv->timeout = DIALOG_TIMEOUT_MSEC;
    341 341
    342 342 
      	g_signal_connect (plug, "key_press_event",
    343 
    -@@ -2255,6 +2364,14 @@
    343 
    +@@ -2329,6 +2438,14 @@
    344 344 
      		                  G_CALLBACK (switch_user_button_clicked), plug);
    345 345 
      	}
    346 346
    ... ... @@ -357,7 +357,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    357 357 
      		g_signal_connect (plug->priv->auth_note_button, "clicked",
    358 358 
     --- a/src/gs-window-x11.c
    359 359 
     +++ b/src/gs-window-x11.c
    360 
    -@@ -32,6 +32,10 @@
    360 
    +@@ -33,6 +33,10 @@
    361 361 
      #include <gtk/gtk.h>
    362 362 
      #include <gtk/gtkx.h>
    363 363
    ... ... @@ -368,7 +368,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    368 368 
      #include "gs-window.h"
    369 369 
      #include "gs-marshal.h"
    370 370 
      #include "subprocs.h"
    371 
    -@@ -1729,6 +1733,13 @@
    371 
    +@@ -1726,6 +1730,13 @@
    372 372 
      		command = g_string_append (command, " --enable-switch");
    373 373 
      	}
    374 374
    ... ... @@ -384,7 +384,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    384 384 
      		command = g_string_append (command, " --verbose");
    385 385 
     --- a/src/mate-screensaver-dialog.c
    386 386 
     +++ b/src/mate-screensaver-dialog.c
    387 
    -@@ -49,6 +49,9 @@
    387 
    +@@ -50,6 +50,9 @@
    388 388 
      static gboolean show_version = FALSE;
    389 389 
      static gboolean enable_logout = FALSE;
    390 390 
      static gboolean enable_switch = FALSE;
    ... ... @@ -394,7 +394,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    394 394 
      static char* logout_command = NULL;
    395 395 
      static char* status_message = NULL;
    396 396 
      static char* away_message = NULL;
    397 
    -@@ -57,6 +60,9 @@
    397 
    +@@ -58,6 +61,9 @@
    398 398 
      	{"verbose", 0, 0, G_OPTION_ARG_NONE, &verbose, N_("Show debugging output"), NULL},
    399 399 
      	{"version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL},
    400 400 
      	{"enable-logout", 0, 0, G_OPTION_ARG_NONE, &enable_logout, N_("Show the logout button"), NULL},
    ... ... @@ -404,7 +404,7 @@ Subject: [PATCH] RDA support: Make MATE's screensaver aware of being run
    404 404 
      	{"logout-command", 0, 0, G_OPTION_ARG_STRING, &logout_command, N_("Command to invoke from the logout button"), NULL},
    405 405 
      	{"enable-switch", 0, 0, G_OPTION_ARG_NONE, &enable_switch, N_("Show the switch user button"), NULL},
    406 406 
      	{"status-message", 0, 0, G_OPTION_ARG_STRING, &status_message, N_("Message to show in the dialog"), N_("MESSAGE")},
    407 
    -@@ -389,6 +395,13 @@
    407 
    +@@ -394,6 +400,13 @@
    408 408 
      		g_object_set(widget, "logout-enabled", TRUE, NULL);
    409 409 
      	}
    410 410

  • debian/patches/1003_RDA-Disable-switch-user-button-if-session-is-remote.patch
    ... ... @@ -9,7 +9,7 @@ Subject: [PATCH] RDA: Disable switch user button, if session is remote.
    9 9
    10 10 
     --- a/src/gs-lock-plug.c
    11 11 
     +++ b/src/gs-lock-plug.c
    12 
    -@@ -1236,6 +1236,12 @@
    12 
    +@@ -1275,6 +1275,12 @@
    13 13
    14 14 
      	if (switch_enabled)
    15 15 
      	{

    • —
    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: