Initial release for Aramo, removed BUILD_UNTIL=10.0 helpers

2022-03-10 13:02:59 -05:00 · 2022-03-10 13:02:59 -05:00 · fa3c8e3190
commit fa3c8e3190
parent 60bc04ac4f
86 changed files with 0 additions and 4921 deletions
--- a/helpers/DATA/caja-extensions/nabia_caja-extensions_fix_based_on_09268d1.patch
+++ b/helpers/DATA/caja-extensions/nabia_caja-extensions_fix_based_on_09268d1.patch
@ -1,103 +0,0 @@
 From 09268d17746f7b956ae0c018f4f5b1f736c8818b Mon Sep 17 00:00:00 2001
 From: raveit65 <mate@raveit.de>
 Date: Wed, 4 Mar 2020 11:05:54 +0100
 Subject: [PATCH] Do not collect the translation for Icon
 ---
 gksu/Makefile.am            | 2 +-
 image-converter/Makefile.am | 2 +-
 open-terminal/Makefile.am   | 2 +-
 sendto/Makefile.am          | 2 +-
 share/Makefile.am           | 2 +-
 wallpaper/Makefile.am       | 2 +-
 xattr-tags/Makefile.am      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 diff --git a/gksu/Makefile.am b/gksu/Makefile.am
 index 93431c8..3cf4ed8 100644
 --- a/gksu/Makefile.am
 +++ b/gksu/Makefile.am
@@ -31,6 +31,6 @@ extensiondir = $(datadir)/caja/extensions
 extension_in_files = libcaja-gksu.caja-extension.desktop.in
 extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
 $(extension_DATA): $(extension_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 CLEANFILES = $(extension_DATA)
 diff --git a/image-converter/Makefile.am b/image-converter/Makefile.am
 index 0b8154f..df93167 100644
 --- a/image-converter/Makefile.am
 +++ b/image-converter/Makefile.am
@@ -48,7 +48,7 @@ extensiondir = $(datadir)/caja/extensions
 extension_in_files = libcaja-image-converter.caja-extension.desktop.in
 extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
 $(extension_DATA): $(extension_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 EXTRA_DIST = $(builder_DATA)
 diff --git a/open-terminal/Makefile.am b/open-terminal/Makefile.am
 index f1c77fb..d65fade 100644
 --- a/open-terminal/Makefile.am
 +++ b/open-terminal/Makefile.am
@@ -40,7 +40,7 @@ extensiondir = $(datadir)/caja/extensions
 extension_in_files = libcaja-open-terminal.caja-extension.desktop.in
 extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
 $(extension_DATA): $(extension_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 DISTCLEANFILES = \
 	org.mate.caja-open-terminal.gschema.xml
 diff --git a/sendto/Makefile.am b/sendto/Makefile.am
 index e23cde8..d4f056c 100644
 --- a/sendto/Makefile.am
 +++ b/sendto/Makefile.am
@@ -83,7 +83,7 @@ extensiondir = $(datadir)/caja/extensions
 extension_in_files = libcaja-sendto.caja-extension.desktop.in
 extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
 $(extension_DATA): $(extension_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 EXTRA_DIST = \
 	$(man_MANS) \
 diff --git a/share/Makefile.am b/share/Makefile.am
 index 8a257f3..6fc1a32 100644
 --- a/share/Makefile.am
 +++ b/share/Makefile.am
@@ -41,7 +41,7 @@ extensiondir = $(datadir)/caja/extensions
 extension_in_files = libcaja-share.caja-extension.desktop.in
 extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
 $(extension_DATA): $(extension_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 EXTRA_DIST = share-dialog.ui
 diff --git a/wallpaper/Makefile.am b/wallpaper/Makefile.am
 index 5bb905e..acc6496 100644
 --- a/wallpaper/Makefile.am
 +++ b/wallpaper/Makefile.am
@@ -33,6 +33,6 @@ extensiondir = $(datadir)/caja/extensions
 extension_in_files = libcaja-wallpaper.caja-extension.desktop.in
 extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
 $(extension_DATA): $(extension_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 CLEANFILES = $(extension_DATA)
 diff --git a/xattr-tags/Makefile.am b/xattr-tags/Makefile.am
 index 27cd567..515d8e1 100644
 --- a/xattr-tags/Makefile.am
 +++ b/xattr-tags/Makefile.am
@@ -34,6 +34,6 @@ extensiondir = $(datadir)/caja/extensions
 extension_in_files = libcaja-xattr-tags.caja-extension.desktop.in
 extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
 $(extension_DATA): $(extension_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 CLEANFILES = $(extension_DATA)
--- a/helpers/DATA/celluloid/mpris-v0.22.patch
+++ b/helpers/DATA/celluloid/mpris-v0.22.patch
@ -1,786 +0,0 @@
 Backports src/mpris from upstream v0.22 to fix mpris integration
 diff --git a/src/mpris/celluloid-mpris-base.c b/src/mpris/celluloid-mpris-base.c
 index 223f571..c44a63e 100644
 --- a/src/mpris/celluloid-mpris-base.c
 +++ b/src/mpris/celluloid-mpris-base.c
@@ -1,5 +1,5 @@
 /*
 - * Copyright (c) 2015-2019 gnome-mpv
 + * Copyright (c) 2015-2019, 2021 gnome-mpv
  *
  * This file is part of Celluloid.
  *
@@ -42,6 +42,7 @@ struct _CelluloidMprisBase
 {
 	CelluloidMprisModule parent;
 	CelluloidController *controller;
 +	GHashTable *readonly_table;
 	guint reg_id;
 };
@@ -230,6 +231,7 @@ method_handler(	GDBusConnection *connection,
 		gpointer data )
 {
 	CelluloidMprisBase *base = data;
 +	gboolean unknown_method = FALSE;
 	if(g_strcmp0(method_name, "Raise") == 0)
 	{
@@ -240,9 +242,25 @@ method_handler(	GDBusConnection *connection,
 	{
 		celluloid_controller_quit(base->controller);
 	}
 +	else
 +	{
 +		unknown_method = TRUE;
 +	}
 -	g_dbus_method_invocation_return_value
 -		(invocation, g_variant_new("()", NULL));
 +	if(unknown_method)
 +	{
 +		g_dbus_method_invocation_return_error
 +			(	invocation,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_UNKNOWN_METHOD,
 +				"Attempted to call unknown method \"%s\"",
 +				method_name );
 +	}
 +	else
 +	{
 +		g_dbus_method_invocation_return_value
 +			(invocation, g_variant_new("()", NULL));
 +	}
 }
 static GVariant *
@@ -254,9 +272,24 @@ get_prop_handler(	GDBusConnection *connection,
 			GError **error,
 			gpointer data )
 {
 +	CelluloidMprisBase *base = CELLULOID_MPRIS_BASE(data);
 +	CelluloidMprisModule *module = CELLULOID_MPRIS_MODULE(data);
 	GVariant *value = NULL;
 -	celluloid_mpris_module_get_properties(data, property_name, &value, NULL);
 +	if(!g_hash_table_contains(base->readonly_table, property_name))
 +	{
 +		g_set_error
 +			(	error,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_UNKNOWN_PROPERTY,
 +				"Failed to get value of unknown property \"%s\"",
 +				property_name );
 +	}
 +	else
 +	{
 +		celluloid_mpris_module_get_properties
 +			(module, property_name, &value, NULL);
 +	}
 	return value?g_variant_ref(value):NULL;
 }
@@ -271,22 +304,39 @@ set_prop_handler(	GDBusConnection *connection,
 			GError **error,
 			gpointer data )
 {
 -	CelluloidMprisBase *base = data;
 +	CelluloidMprisBase *base = CELLULOID_MPRIS_BASE(data);
 +	gboolean result = TRUE;
 -	if(g_strcmp0(property_name, "Fullscreen") == 0)
 +	if(!g_hash_table_contains(base->readonly_table, property_name))
 +	{
 +		result = FALSE;
 +
 +		g_set_error
 +			(	error,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_UNKNOWN_PROPERTY,
 +				"Failed to set value of unknown property \"%s\"",
 +				property_name );
 +	}
 +	else if(GPOINTER_TO_INT(g_hash_table_lookup(base->readonly_table, property_name)))
 +	{
 +		result = FALSE;
 +
 +		g_set_error
 +			(	error,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_SET_READONLY,
 +				"Attempted to set value of readonly property \"%s\"",
 +				property_name );
 +	}
 +	else if(g_strcmp0(property_name, "Fullscreen") == 0)
 	{
 		CelluloidView *view = celluloid_controller_get_view(base->controller);
 		celluloid_view_set_fullscreen(view, g_variant_get_boolean(value));
 	}
 -	else
 -	{
 -		celluloid_mpris_module_set_properties(	data,
 -							property_name, value,
 -							NULL );
 -	}
 -	return TRUE; /* This function should always succeed */
 +	return result;
 }
 static void
@@ -360,8 +410,39 @@ celluloid_mpris_base_class_init(CelluloidMprisBaseClass *klass)
 static void
 celluloid_mpris_base_init(CelluloidMprisBase *base)
 {
 -	base->controller = NULL;
 -	base->reg_id = 0;
 +	const struct
 +	{
 +		const gchar *name;
 +		gboolean readonly;
 +	}
 +	properties[] =
 +	{
 +		{"CanQuit", TRUE},
 +		{"Fullscreen", FALSE},
 +		{"CanSetFullscreen", TRUE},
 +		{"CanRaise", TRUE},
 +		{"HasTrackList", TRUE},
 +		{"Identity", TRUE},
 +		{"DesktopEntry", TRUE},
 +		{"SupportedUriSchemes", TRUE},
 +		{"SupportedMimeTypes", TRUE},
 +		{NULL, FALSE}
 +	};
 +
 +	base->controller =
 +		NULL;
 +	base->readonly_table =
 +		g_hash_table_new_full(g_str_hash, g_int_equal, g_free, NULL);
 +	base->reg_id =
 +		0;
 +
 +	for(gint i = 0; properties[i].name; i++)
 +	{
 +		g_hash_table_replace
 +			(	base->readonly_table,
 +				g_strdup(properties[i].name),
 +				GINT_TO_POINTER(properties[i].readonly) );
 +	}
 }
 CelluloidMprisModule *
 diff --git a/src/mpris/celluloid-mpris-module.c b/src/mpris/celluloid-mpris-module.c
 index 677c8a0..358516c 100644
 --- a/src/mpris/celluloid-mpris-module.c
 +++ b/src/mpris/celluloid-mpris-module.c
@@ -1,5 +1,5 @@
 /*
 - * Copyright (c) 2017-2019 gnome-mpv
 + * Copyright (c) 2017-2019, 2021 gnome-mpv
  *
  * This file is part of Celluloid.
  *
@@ -83,9 +83,8 @@ set_property(	GObject *object,
 {
 	CelluloidMprisModulePrivate *priv;
 -	priv =	G_TYPE_INSTANCE_GET_PRIVATE(	object,
 -						CELLULOID_TYPE_MPRIS_MODULE,
 -						CelluloidMprisModulePrivate );
 +	priv =	celluloid_mpris_module_get_instance_private
 +		(CELLULOID_MPRIS_MODULE(object));
 	switch(property_id)
 	{
@@ -111,9 +110,8 @@ get_property(	GObject *object,
 {
 	CelluloidMprisModulePrivate *priv;
 -	priv =	G_TYPE_INSTANCE_GET_PRIVATE(	object,
 -						CELLULOID_TYPE_MPRIS_MODULE,
 -						CelluloidMprisModulePrivate );
 +	priv =	celluloid_mpris_module_get_instance_private
 +		(CELLULOID_MPRIS_MODULE(object));
 	switch(property_id)
 	{
@@ -136,9 +134,8 @@ dispose(GObject *object)
 {
 	CelluloidMprisModulePrivate *priv;
 -	priv =	G_TYPE_INSTANCE_GET_PRIVATE(	object,
 -						CELLULOID_TYPE_MPRIS_MODULE,
 -						CelluloidMprisModulePrivate );
 +	priv =	celluloid_mpris_module_get_instance_private
 +		(CELLULOID_MPRIS_MODULE(object));
 	g_hash_table_unref(priv->prop_table);
@@ -150,9 +147,8 @@ finalize(GObject *object)
 {
 	CelluloidMprisModulePrivate *priv;
 -	priv =	G_TYPE_INSTANCE_GET_PRIVATE(	object,
 -						CELLULOID_TYPE_MPRIS_MODULE,
 -						CelluloidMprisModulePrivate );
 +	priv =	celluloid_mpris_module_get_instance_private
 +		(CELLULOID_MPRIS_MODULE(object));
 	g_slist_foreach(priv->signal_ids, (GFunc)disconnect_signal, NULL);
 	g_slist_free_full(priv->signal_ids, g_free);
@@ -197,9 +193,7 @@ celluloid_mpris_module_init(CelluloidMprisModule *module)
 {
 	CelluloidMprisModulePrivate *priv;
 -	priv =	G_TYPE_INSTANCE_GET_PRIVATE(	module,
 -						CELLULOID_TYPE_MPRIS_MODULE,
 -						CelluloidMprisModulePrivate );
 +	priv = celluloid_mpris_module_get_instance_private(module);
 	priv->conn = NULL;
 	priv->iface = NULL;
@@ -222,9 +216,7 @@ celluloid_mpris_module_connect_signal(	CelluloidMprisModule *module,
 	CelluloidMprisModulePrivate *priv;
 	CelluloidSignalHandlerInfo *info;
 -	priv =	G_TYPE_INSTANCE_GET_PRIVATE(	module,
 -						CELLULOID_TYPE_MPRIS_MODULE,
 -						CelluloidMprisModulePrivate );
 +	priv = celluloid_mpris_module_get_instance_private(module);
 	info = g_malloc(sizeof(CelluloidSignalHandlerInfo));
 	info->instance = instance;
@@ -241,9 +233,7 @@ celluloid_mpris_module_get_properties(CelluloidMprisModule *module, ...)
 	gchar *name;
 	GVariant **value_ptr;
 -	priv =	G_TYPE_INSTANCE_GET_PRIVATE(	module,
 -						CELLULOID_TYPE_MPRIS_MODULE,
 -						CelluloidMprisModulePrivate );
 +	priv = celluloid_mpris_module_get_instance_private(module);
 	va_start(arg, module);
@@ -255,6 +245,8 @@ celluloid_mpris_module_get_properties(CelluloidMprisModule *module, ...)
 	{
 		*value_ptr = g_hash_table_lookup(priv->prop_table, name);
 	}
 +
 +	va_end(arg);
 }
 void
@@ -271,9 +263,7 @@ celluloid_mpris_module_set_properties_full(	CelluloidMprisModule *module,
 	const gchar *elem_type_string;
 	GVariant *sig_args;
 -	priv =	G_TYPE_INSTANCE_GET_PRIVATE(	module,
 -						CELLULOID_TYPE_MPRIS_MODULE,
 -						CelluloidMprisModulePrivate );
 +	priv = celluloid_mpris_module_get_instance_private(module);
 	builder_type_string = send_new_value?"a{sv}":"as";
 	elem_type_string = builder_type_string+1;
@@ -296,6 +286,8 @@ celluloid_mpris_module_set_properties_full(	CelluloidMprisModule *module,
 		g_variant_builder_add(&builder, elem_type_string, name, value);
 	}
 +	va_end(arg);
 +
 	sig_args = g_variant_new(	"(sa{sv}as)",
 					priv->iface->name,
 					send_new_value?&builder:NULL,
 diff --git a/src/mpris/celluloid-mpris-player.c b/src/mpris/celluloid-mpris-player.c
 index cd276d0..a3a52cf 100644
 --- a/src/mpris/celluloid-mpris-player.c
 +++ b/src/mpris/celluloid-mpris-player.c
@@ -1,5 +1,5 @@
 /*
 - * Copyright (c) 2015-2019 gnome-mpv
 + * Copyright (c) 2015-2019, 2021 gnome-mpv
  *
  * This file is part of Celluloid.
  *
@@ -42,6 +42,7 @@ struct _CelluloidMprisPlayer
 {
 	CelluloidMprisModule parent;
 	CelluloidController *controller;
 +	GHashTable *readonly_table;
 	guint reg_id;
 };
@@ -402,30 +403,34 @@ method_handler(	GDBusConnection *connection,
 	CelluloidMprisPlayer *player = data;
 	CelluloidModel *model =	celluloid_controller_get_model
 				(player->controller);
 +	gboolean unknown_method = FALSE;
 	if(g_strcmp0(method_name, "Next") == 0)
 	{
 -		celluloid_model_key_press(model, "NEXT");
 +		celluloid_model_next_playlist_entry(model);
 	}
 	else if(g_strcmp0(method_name, "Previous") == 0)
 	{
 -		celluloid_model_key_press(model, "PREV");
 +		celluloid_model_previous_playlist_entry(model);
 	}
 	else if(g_strcmp0(method_name, "Pause") == 0)
 	{
 -		celluloid_model_key_press(model, "PAUSE");
 +		celluloid_model_pause(model);
 	}
 	else if(g_strcmp0(method_name, "PlayPause") == 0)
 	{
 -		celluloid_model_key_press(model, "PLAYPAUSE");
 +		gboolean pause = FALSE;
 +
 +		g_object_get(model, "pause", &pause, NULL);
 +		g_object_set(model, "pause", !pause, NULL);
 	}
 	else if(g_strcmp0(method_name, "Stop") == 0)
 	{
 -		celluloid_model_key_press(model, "STOP");
 +		celluloid_model_stop(model);
 	}
 	else if(g_strcmp0(method_name, "Play") == 0)
 	{
 -		celluloid_model_key_press(model, "PLAY");
 +		celluloid_model_play(model);
 	}
 	else if(g_strcmp0(method_name, "Seek") == 0)
 	{
@@ -459,9 +464,25 @@ method_handler(	GDBusConnection *connection,
 		g_variant_get(parameters, "(&s)", &uri);
 		celluloid_model_load_file(model, uri, FALSE);
 	}
 +	else
 +	{
 +		unknown_method = TRUE;
 +	}
 -	g_dbus_method_invocation_return_value
 -		(invocation, g_variant_new("()", NULL));
 +	if(unknown_method)
 +	{
 +		g_dbus_method_invocation_return_error
 +			(	invocation,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_UNKNOWN_METHOD,
 +				"Attempted to call unknown method \"%s\"",
 +				method_name );
 +	}
 +	else
 +	{
 +		g_dbus_method_invocation_return_value
 +			(invocation, g_variant_new("()", NULL));
 +	}
 }
 static GVariant *
@@ -473,10 +494,20 @@ get_prop_handler(	GDBusConnection *connection,
 			GError **error,
 			gpointer data )
 {
 -	CelluloidMprisPlayer *player = data;
 -	GVariant *value;
 +	CelluloidMprisPlayer *player = CELLULOID_MPRIS_PLAYER(data);
 +	CelluloidMprisModule *module = CELLULOID_MPRIS_MODULE(data);
 +	GVariant *value = NULL;
 -	if(g_strcmp0(property_name, "Position") == 0)
 +	if(!g_hash_table_contains(player->readonly_table, property_name))
 +	{
 +		g_set_error
 +			(	error,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_UNKNOWN_PROPERTY,
 +				"Failed to get value of unknown property \"%s\"",
 +				property_name );
 +	}
 +	else if(g_strcmp0(property_name, "Position") == 0)
 	{
 		CelluloidModel *model;
 		gdouble position;
@@ -488,7 +519,7 @@ get_prop_handler(	GDBusConnection *connection,
 	else
 	{
 		celluloid_mpris_module_get_properties
 -			(	CELLULOID_MPRIS_MODULE(data),
 +			(	module,
 				property_name, &value,
 				NULL );
 	}
@@ -506,11 +537,32 @@ set_prop_handler(	GDBusConnection *connection,
 			GError **error,
 			gpointer data )
 {
 -	CelluloidMprisPlayer *player = data;
 +	CelluloidMprisPlayer *player = CELLULOID_MPRIS_PLAYER(data);
 	CelluloidModel *model =	celluloid_controller_get_model
 				(player->controller);
 +	gboolean result = TRUE;
 -	if(g_strcmp0(property_name, "LoopStatus") == 0)
 +	if(!g_hash_table_contains(player->readonly_table, property_name))
 +	{
 +		result = FALSE;
 +
 +		g_set_error
 +			(	error,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_UNKNOWN_PROPERTY,
 +				"Failed to set value of unknown property \"%s\"",
 +				property_name );
 +	}
 +	else if(GPOINTER_TO_INT(g_hash_table_lookup(player->readonly_table, property_name)))
 +	{
 +		g_set_error
 +			(	error,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_SET_READONLY,
 +				"Attempted to set value of readonly property \"%s\"",
 +				property_name );
 +	}
 +	else if(g_strcmp0(property_name, "LoopStatus") == 0)
 	{
 		const gchar *loop = g_variant_get_string(value, NULL);
 		const gchar *loop_file =	g_strcmp0(loop, "Track") == 0 ?
@@ -536,11 +588,7 @@ set_prop_handler(	GDBusConnection *connection,
 				NULL );
 	}
 -	celluloid_mpris_module_set_properties(	CELLULOID_MPRIS_MODULE(data),
 -						property_name, value,
 -						NULL );
 -
 -	return TRUE; /* This function should always succeed */
 +	return result;
 }
 static void
@@ -840,8 +888,43 @@ celluloid_mpris_player_class_init(CelluloidMprisPlayerClass *klass)
 static void
 celluloid_mpris_player_init(CelluloidMprisPlayer *player)
 {
 -	player->controller = NULL;
 -	player->reg_id = 0;
 +	const struct
 +	{
 +		const gchar *name;
 +		gboolean readonly;
 +	}
 +	properties[] =
 +	{
 +		{"PlaybackStatus", TRUE},
 +		{"LoopStatus", FALSE},
 +		{"Rate", FALSE},
 +		{"Metadata", TRUE},
 +		{"Volume", FALSE},
 +		{"MinimumRate", TRUE},
 +		{"MaximumRate", TRUE},
 +		{"CanGoNext", TRUE},
 +		{"CanGoPrevious", TRUE},
 +		{"CanPlay", TRUE},
 +		{"CanPause", TRUE},
 +		{"CanSeek", TRUE},
 +		{"CanControl", TRUE},
 +		{NULL, FALSE}
 +	};
 +
 +	player->controller =
 +		NULL;
 +	player->readonly_table =
 +		g_hash_table_new_full(g_str_hash, g_int_equal, g_free, NULL);
 +	player->reg_id =
 +		0;
 +
 +	for(gint i = 0; properties[i].name; i++)
 +	{
 +		g_hash_table_replace
 +			(	player->readonly_table,
 +				g_strdup(properties[i].name),
 +				GINT_TO_POINTER(properties[i].readonly) );
 +	}
 }
 CelluloidMprisModule *
 diff --git a/src/mpris/celluloid-mpris-track-list.c b/src/mpris/celluloid-mpris-track-list.c
 index 7b5d8c5..7784ad2 100644
 --- a/src/mpris/celluloid-mpris-track-list.c
 +++ b/src/mpris/celluloid-mpris-track-list.c
@@ -1,5 +1,5 @@
 /*
 - * Copyright (c) 2017-2019 gnome-mpv
 + * Copyright (c) 2017-2019, 2021 gnome-mpv
  *
  * This file is part of Celluloid.
  *
@@ -19,6 +19,7 @@
 #include "celluloid-mpris-track-list.h"
 #include "celluloid-mpris-gdbus.h"
 +#include "celluloid-mpris.h"
 #include "celluloid-common.h"
 #include "celluloid-def.h"
@@ -35,6 +36,7 @@ struct _CelluloidMprisTrackList
 {
 	CelluloidMprisModule parent;
 	CelluloidController *controller;
 +	GHashTable *readonly_table;
 	guint reg_id;
 };
@@ -226,6 +228,7 @@ method_handler(	GDBusConnection *connection,
 	CelluloidMprisTrackList *track_list = data;
 	CelluloidModel *model =	celluloid_controller_get_model
 				(track_list->controller);
 +	gboolean unknown_method = FALSE;
 	GVariant *return_value = NULL;
 	if(g_strcmp0(method_name, "GetTracksMetadata") == 0)
@@ -283,12 +286,22 @@ method_handler(	GDBusConnection *connection,
 	}
 	else
 	{
 -		g_critical("Attempted to call unknown method: %s", method_name);
 -
 -		return_value = g_variant_new("()", NULL);
 +		unknown_method = TRUE;
 	}
 -	g_dbus_method_invocation_return_value(invocation, return_value);
 +	if(unknown_method)
 +	{
 +		g_dbus_method_invocation_return_error
 +			(	invocation,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_UNKNOWN_METHOD,
 +				"Attempted to call unknown method \"%s\"",
 +				method_name );
 +	}
 +	else
 +	{
 +		g_dbus_method_invocation_return_value(invocation, return_value);
 +	}
 }
 static GVariant *
@@ -300,15 +313,25 @@ get_prop_handler(	GDBusConnection *connection,
 			GError **error,
 			gpointer data )
 {
 +	CelluloidMprisTrackList *track_list = CELLULOID_MPRIS_TRACK_LIST(data);
 +	CelluloidMprisModule *module = CELLULOID_MPRIS_MODULE(data);
 	GVariant *value = NULL;
 -	celluloid_mpris_module_get_properties(	CELLULOID_MPRIS_MODULE(data),
 -						property_name, &value,
 -						NULL );
 +	if(!g_hash_table_contains(track_list->readonly_table, property_name))
 +	{
 +		g_set_error
 +			(	error,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_UNKNOWN_PROPERTY,
 +				"Failed to get value of unknown property \"%s\"",
 +				property_name );
 +	}
 +	else
 +	{
 +		celluloid_mpris_module_get_properties
 +			(module, property_name, &value, NULL);
 +	}
 -	/* Call g_variant_ref() to prevent the value of the property in the
 -	 * properties table from being freed.
 -	 */
 	return value?g_variant_ref(value):NULL;
 }
@@ -322,10 +345,26 @@ set_prop_handler(	GDBusConnection *connection,
 			GError **error,
 			gpointer data )
 {
 -	g_warning(	"Attempted to set property %s in "
 -			"org.mpris.MediaPlayer2.TrackList, but the interface "
 -			"only has read-only properties.",
 -			property_name );
 +	CelluloidMprisTrackList *track_list = CELLULOID_MPRIS_TRACK_LIST(data);
 +
 +	if(!g_hash_table_contains(track_list->readonly_table, property_name))
 +	{
 +		g_set_error
 +			(	error,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_UNKNOWN_PROPERTY,
 +				"Failed to set value of unknown property \"%s\"",
 +				property_name );
 +	}
 +	else if(GPOINTER_TO_INT(g_hash_table_lookup(track_list->readonly_table, property_name)))
 +	{
 +		g_set_error
 +			(	error,
 +				CELLULOID_MPRIS_ERROR,
 +				CELLULOID_MPRIS_ERROR_SET_READONLY,
 +				"Attempted to set value of readonly property \"%s\"",
 +				property_name );
 +	}
 	/* Always fail since the interface only has read-only properties */
 	return FALSE;
@@ -576,8 +615,32 @@ celluloid_mpris_track_list_class_init(CelluloidMprisTrackListClass *klass)
 static void
 celluloid_mpris_track_list_init(CelluloidMprisTrackList *track_list)
 {
 -	track_list->controller = NULL;
 -	track_list->reg_id = 0;
 +	const struct
 +	{
 +		const gchar *name;
 +		gboolean readonly;
 +	}
 +	properties[] =
 +	{
 +		{"Tracks", TRUE},
 +		{"Fullscreen", TRUE},
 +		{NULL, FALSE}
 +	};
 +
 +	track_list->controller =
 +		NULL;
 +	track_list->readonly_table =
 +		g_hash_table_new_full(g_str_hash, g_int_equal, g_free, NULL);
 +	track_list->reg_id =
 +		0;
 +
 +	for(gint i = 0; properties[i].name; i++)
 +	{
 +		g_hash_table_replace
 +			(	track_list->readonly_table,
 +				g_strdup(properties[i].name),
 +				GINT_TO_POINTER(properties[i].readonly) );
 +	}
 }
 CelluloidMprisModule *
 diff --git a/src/mpris/celluloid-mpris.c b/src/mpris/celluloid-mpris.c
 index 053aa4c..5d14065 100644
 --- a/src/mpris/celluloid-mpris.c
 +++ b/src/mpris/celluloid-mpris.c
@@ -1,5 +1,5 @@
 /*
 - * Copyright (c) 2015-2019 gnome-mpv
 + * Copyright (c) 2015-2019, 2021 gnome-mpv
  *
  * This file is part of Celluloid.
  *
@@ -55,6 +55,8 @@ struct _CelluloidMprisClass
 G_DEFINE_TYPE(CelluloidMpris, celluloid_mpris, G_TYPE_OBJECT)
 +G_DEFINE_QUARK(celluloid-mpris-error-quark, celluloid_mpris_error)
 +
 static void
 constructed(GObject *object);
@@ -73,11 +75,6 @@ get_property(	GObject *object,
 		GValue *value,
 		GParamSpec *pspec );
 -static void
 -name_acquired_handler(	GDBusConnection *connection,
 -			const gchar *name,
 -			gpointer data );
 -
 static void
 name_lost_handler(	GDBusConnection *connection,
 			const gchar *name,
@@ -119,12 +116,23 @@ constructed(GObject *object)
 		gchar *name =	g_strdup_printf
 				(MPRIS_BUS_NAME ".instance-%u", window_id);
 +		self->session_bus_conn = conn;
 +		self->base =	celluloid_mpris_base_new
 +				(self->controller, conn);
 +		self->player =	celluloid_mpris_player_new
 +				(self->controller, conn);
 +		self->track_list =	celluloid_mpris_track_list_new
 +					(self->controller, conn);
 +
 +		celluloid_mpris_module_register(self->base);
 +		celluloid_mpris_module_register(self->player);
 +		celluloid_mpris_module_register(self->track_list);
 +
 		self->name_id =	g_bus_own_name_on_connection
 				(	conn,
 					name,
 					G_BUS_NAME_OWNER_FLAGS_NONE,
 -					(GBusNameAcquiredCallback)
 -					name_acquired_handler,
 +					NULL,
 					(GBusNameLostCallback)
 					name_lost_handler,
 					self,
@@ -197,26 +205,6 @@ get_property(	GObject *object,
 }
 -static void
 -name_acquired_handler(	GDBusConnection *connection,
 -			const gchar *name,
 -			gpointer data )
 -{
 -	CelluloidMpris *self = data;
 -
 -	self->session_bus_conn = connection;
 -	self->base =		celluloid_mpris_base_new
 -				(self->controller, connection);
 -	self->player =		celluloid_mpris_player_new
 -				(self->controller, connection);
 -	self->track_list =	celluloid_mpris_track_list_new
 -				(self->controller, connection);
 -
 -	celluloid_mpris_module_register(self->base);
 -	celluloid_mpris_module_register(self->player);
 -	celluloid_mpris_module_register(self->track_list);
 -}
 -
 static void
 name_lost_handler(	GDBusConnection *connection,
 			const gchar *name,
 diff --git a/src/mpris/celluloid-mpris.h b/src/mpris/celluloid-mpris.h
 index 3ac9d57..6618f4b 100644
 --- a/src/mpris/celluloid-mpris.h
 +++ b/src/mpris/celluloid-mpris.h
@@ -1,5 +1,5 @@
 /*
 - * Copyright (c) 2015-2019 gnome-mpv
 + * Copyright (c) 2015-2019, 2021 gnome-mpv
  *
  * This file is part of Celluloid.
  *
@@ -31,6 +31,19 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE(CelluloidMpris, celluloid_mpris, CELLULOID, MPRIS, GObject)
 +#define CELLULOID_MPRIS_ERROR celluloid_mpris_error_quark()
 +
 +enum
 +{
 +	CELLULOID_MPRIS_ERROR_UNKNOWN_METHOD,
 +	CELLULOID_MPRIS_ERROR_UNKNOWN_PROPERTY,
 +	CELLULOID_MPRIS_ERROR_SET_READONLY,
 +	CELLULOID_MPRIS_ERROR_FAILED
 +};
 +
 +GQuark
 +celluloid_mpris_error_quark(void);
 +
 GVariant *
 celluloid_mpris_build_g_variant_string_array(const gchar** list);
--- a/helpers/DATA/eom/nabia_eom_fix_based_on_0c8d17a.patch
+++ b/helpers/DATA/eom/nabia_eom_fix_based_on_0c8d17a.patch
@ -1,22 +0,0 @@
 From 0c8d17a76050af39b22f26b33f7b47de949ef379 Mon Sep 17 00:00:00 2001
 From: rbuj <robert.buj@gmail.com>
 Date: Mon, 2 Mar 2020 13:14:13 +0100
 Subject: [PATCH] eom.desktop: Do not collect the translation for Icon
 ---
 data/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/data/Makefile.am b/data/Makefile.am
 index 48c352e0..4842527a 100644
 --- a/data/Makefile.am
 +++ b/data/Makefile.am
@@ -6,7 +6,7 @@ DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 $(desktop_DATA): $(DESKTOP_IN_FILES)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = eom.appdata.xml.in
--- a/helpers/DATA/kdeconnect/Fix_kdeconnect_open_MimeType.patch
+++ b/helpers/DATA/kdeconnect/Fix_kdeconnect_open_MimeType.patch
@ -1,26 +0,0 @@
 From f1ce22124ce7dd630b8e909b4c50f90f035166d5 Mon Sep 17 00:00:00 2001
 From: Thomas Staudinger <staudi.kaos@gmail.com>
 Date: Sun, 4 Oct 2020 21:03:03 +0000
 Subject: [PATCH] Fix kdeconnect_open MimeType
 This changes the MimeType handler of the kdeconnect_open desktop file from an invalid "*/*" to the (hopefully) appropriate "application/octet-stream;" as discussed [here](https://bugs.launchpad.net/ubuntu/+source/kdeconnect/+bug/1878400)(including this solution), [here](https://github.com/clearlinux/distribution/issues/1906) and [here](https://bugs.archlinux.org/task/65865).
 ---
 data/org.kde.kdeconnect_open.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop
 index 0e0fb8ff..fce4da31 100644
 --- a/data/org.kde.kdeconnect_open.desktop
 +++ b/data/org.kde.kdeconnect_open.desktop
@@ -97,7 +97,7 @@ Comment[uk]=Відкрити на з'єднаному пристрої за до
 Comment[x-test]=xxOpen on a connected device using KDE Connectxx
 Comment[zh_CN]=通过 KDE Connect 在已连接的设备上打开
 Comment[zh_TW]=使用 KDE 連線於連線裝置中開啟
 -MimeType=*/*;
 +MimeType=application/octet-stream;
 Exec=kdeconnect-handler --open %U
 Icon=kdeconnect
 Type=Service
 -- 
 GitLab
--- a/helpers/DATA/libreoffice/debian-rules.patch
+++ b/helpers/DATA/libreoffice/debian-rules.patch
@ -1,23 +0,0 @@
 --- debian/rules	2021-05-29 00:59:51.510029198 +0200
 +++ debian/rules	2021-05-29 01:06:26.661451380 +0200
@@ -595,17 +595,19 @@
   BULLSEYE_BACKPORT=y
 endif
 -ifeq "$(DEB_VENDOR)" "Ubuntu"
 +ifeq ("$(DEB_VENDOR)",$(filter "$(DEB_VENDOR)","Ubuntu" "Trisquel"))
 +  ifeq "$(DEB_VENDOR)" "Ubuntu"
   # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
   # Note: these are for Ubuntu use ONLY. For your own distribution,
   # please get your own set of keys.
   # Permission to add API keys, from Paweł Hajdan, To chad.miller@canonical.com
   # msgid: CAADNaOFSFoch68NM1SGpCTRXqmspyKQgUPUtsF7SGRsRXiHZcg@mail.gmail.com
   # reused from chromium-browser 48.0.2564.82-0ubuntu1.1222
   GOOGLEAPI_APIKEY_UBUNTU := AIzaSyDDiKg-iNf3zW2j16KDsnSDnJJAgh4TnCc
   GOOGLEAPI_CLIENTID_UBUNTU := 424119844901-gee57209rkbo1rgula4i0arilvgv3lsf.apps.googleusercontent.com
   GOOGLEAPI_CLIENTSECRET_UBUNTU := 3h1DknIrVsq2wEhIuADVxQ3E
   CONFIGURE_FLAGS += --with-gdrive-client-id=$(GOOGLEAPI_CLIENTID_UBUNTU) --with-gdrive-client-secret=$(GOOGLEAPI_CLIENTSECRET_UBUNTU)
 +  endif
   # lp#1034560: MIR troubles make it easier to use internal jfreereport
   SYSTEM_STUFF := $(filter-out jfreereport npapi-headers, $(SYSTEM_STUFF))
--- a/helpers/DATA/mate-calc/nabia_mate-calc_fix_based_on_9196271.patch
+++ b/helpers/DATA/mate-calc/nabia_mate-calc_fix_based_on_9196271.patch
@ -1,22 +0,0 @@
 From 91962719d06ce16d8bc3523872b83fae4d151e10 Mon Sep 17 00:00:00 2001
 From: rbuj <robert.buj@gmail.com>
 Date: Mon, 2 Mar 2020 08:53:51 +0100
 Subject: [PATCH] mate-calc.desktop: Do not collect the translation for Icon
 ---
 data/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/data/Makefile.am b/data/Makefile.am
 index 80db3448..f12b6dac 100644
 --- a/data/Makefile.am
 +++ b/data/Makefile.am
@@ -11,7 +11,7 @@ Utilitiesdir = $(datadir)/applications
 Utilities_in_files = mate-calc.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
 $(Utilities_DATA): $(Utilities_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=GenericName --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 man1_MANS = mate-calc.1 mate-calc-cmd.1
--- a/helpers/DATA/mate-control-center/nabia_mate-control-center_fix_based_on_1438fc1.patch
+++ b/helpers/DATA/mate-control-center/nabia_mate-control-center_fix_based_on_1438fc1.patch
@ -1,190 +0,0 @@
 From 1438fc157ef1646af33adf7dcf6ca8773d5935f5 Mon Sep 17 00:00:00 2001
 From: rbuj <robert.buj@gmail.com>
 Date: Mon, 2 Mar 2020 11:34:36 +0100
 Subject: [PATCH] Do not collect the translation for Icon
 ---
 capplets/about-me/Makefile.am                    | 2 +-
 capplets/accessibility/at-properties/Makefile.am | 2 +-
 capplets/appearance/data/Makefile.am             | 2 +-
 capplets/default-applications/Makefile.am        | 2 +-
 capplets/display/Makefile.am                     | 2 +-
 capplets/keybindings/Makefile.am                 | 2 +-
 capplets/keyboard/Makefile.am                    | 2 +-
 capplets/mouse/Makefile.am                       | 2 +-
 capplets/network/Makefile.am                     | 2 +-
 capplets/time-admin/data/Makefile.am             | 2 +-
 capplets/windows/Makefile.am                     | 2 +-
 font-viewer/Makefile.am                          | 2 +-
 shell/Makefile.am                                | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
 diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
 index 4c72622e8..e9a9ebf4d 100644
 --- a/capplets/about-me/Makefile.am
 +++ b/capplets/about-me/Makefile.am
@@ -35,7 +35,7 @@ mate_about_me_LDFLAGS = -export-dynamic
 desktopdir = $(datadir)/applications
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(Desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 include $(top_srcdir)/gla11y.mk
 diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am
 index 3475536f2..e81036213 100644
 --- a/capplets/accessibility/at-properties/Makefile.am
 +++ b/capplets/accessibility/at-properties/Makefile.am
@@ -18,7 +18,7 @@ Desktop_in_files = mate-at-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(Desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 pixmapdir  = $(pkgdatadir)/pixmaps
 pixmap_DATA =					\
 diff --git a/capplets/appearance/data/Makefile.am b/capplets/appearance/data/Makefile.am
 index 46fe49315..bbb1919e1 100644
 --- a/capplets/appearance/data/Makefile.am
 +++ b/capplets/appearance/data/Makefile.am
@@ -23,7 +23,7 @@ desktop_in_files = \
 	mate-theme-installer.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 %.desktop: %.desktop.in
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 xml_in_files = \
 	mate-theme-package.xml.in
 diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
 index 4468fc2a5..8aac00ffd 100644
 --- a/capplets/default-applications/Makefile.am
 +++ b/capplets/default-applications/Makefile.am
@@ -23,7 +23,7 @@ desktopdir = $(datadir)/applications
 Desktop_in_files = mate-default-applications-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(Desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = mate-default-applications.pc
 diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
 index 24dfa1b73..7ca1180f7 100644
 --- a/capplets/display/Makefile.am
 +++ b/capplets/display/Makefile.am
@@ -45,7 +45,7 @@ Desktop_in_files = mate-display-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(Desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 AM_CPPFLAGS =					\
 	$(WARN_CFLAGS)				\
 diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
 index 298105773..f3e500c59 100644
 --- a/capplets/keybindings/Makefile.am
 +++ b/capplets/keybindings/Makefile.am
@@ -23,7 +23,7 @@ Desktop_in_files = mate-keybinding.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(Desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 xmldir = $(pkgdatadir)/keybindings
 xml_in_files = 00-multimedia-key.xml.in 01-desktop-key.xml.in
 diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
 index 33a4fea3f..8c54ef8dd 100644
 --- a/capplets/keyboard/Makefile.am
 +++ b/capplets/keyboard/Makefile.am
@@ -34,7 +34,7 @@ Desktop_in_files = mate-keyboard.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(Desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 mate-keyboard-properties-resources.h mate-keyboard-properties-resources.c: org.mate.mcc.keyboard.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.keyboard.gresource.xml)
 	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name keyboard $<
 diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
 index e4e72516a..dfeb69e1e 100644
 --- a/capplets/mouse/Makefile.am
 +++ b/capplets/mouse/Makefile.am
@@ -21,7 +21,7 @@ Desktop_in_files = mate-settings-mouse.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(Desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 mate-mouse-properties-resources.h mate-mouse-properties-resources.c: org.mate.mcc.mouse.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.mouse.gresource.xml)
 	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name mouse $<
 diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am
 index 09bf2abe7..e36a3ddaa 100644
 --- a/capplets/network/Makefile.am
 +++ b/capplets/network/Makefile.am
@@ -18,7 +18,7 @@ desktop_in_files = mate-network-properties.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 mate-network-properties-resources.h mate-network-properties-resources.c: org.mate.mcc.network.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.network.gresource.xml)
 	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name network $<
 diff --git a/capplets/time-admin/data/Makefile.am b/capplets/time-admin/data/Makefile.am
 index f9a035736..f8d5c5249 100644
 --- a/capplets/time-admin/data/Makefile.am
 +++ b/capplets/time-admin/data/Makefile.am
@@ -28,7 +28,7 @@ desktop_in_files = mate-time-admin.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 CLEANFILES = $(desktop_DATA)
 EXTRA_DIST = \
 diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am
 index b6f5e854d..11777e7be 100644
 --- a/capplets/windows/Makefile.am
 +++ b/capplets/windows/Makefile.am
@@ -20,7 +20,7 @@ mate-window-properties-resources.h mate-window-properties-resources.c: org.mate.
 	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name window_properties $<
 $(desktop_DATA): $(Desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 AM_CPPFLAGS =				\
 	$(WARN_CFLAGS)			\
 diff --git a/font-viewer/Makefile.am b/font-viewer/Makefile.am
 index 501c610cb..9dbaee9c0 100644
 --- a/font-viewer/Makefile.am
 +++ b/font-viewer/Makefile.am
@@ -35,7 +35,7 @@ desktopdir = $(datadir)/applications
 desktop_in_files = mate-font-viewer.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 install-data-local: install-desktop-database
 diff --git a/shell/Makefile.am b/shell/Makefile.am
 index 154471082..77d1c1ac7 100644
 --- a/shell/Makefile.am
 +++ b/shell/Makefile.am
@@ -21,7 +21,7 @@ sysdir = $(datadir)/applications
 sys_in_files = matecc.desktop.in
 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
 $(sys_DATA): $(sys_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 directorydir = $(datadir)/desktop-directories
 directory_in_files = matecc.directory.desktop.in
--- a/helpers/DATA/mate-desktop/nabia_mate-desktop_fix_based_on_b222081.patch
+++ b/helpers/DATA/mate-desktop/nabia_mate-desktop_fix_based_on_b222081.patch
@ -1,22 +0,0 @@
 From b222081467e85e45dd9451060c369f4fa582c870 Mon Sep 17 00:00:00 2001
 From: rbuj <robert.buj@gmail.com>
 Date: Mon, 2 Mar 2020 11:20:58 +0100
 Subject: [PATCH] mate-about.desktop: Do not collect the translation for Icon
 ---
 mate-about/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/mate-about/Makefile.am b/mate-about/Makefile.am
 index 67a42935..e557bbe7 100644
 --- a/mate-about/Makefile.am
 +++ b/mate-about/Makefile.am
@@ -13,7 +13,7 @@ desktopdir = $(datadir)/applications
 desktop_in_files = mate-about.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 mate-about.desktop: mate-about.desktop.in
 -	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN)$(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --template $< -d $(top_srcdir)/po -o $@
 versiondir = $(datadir)/mate-about
 version_DATA = mate-version.xml
--- a/helpers/DATA/mate-screensaver/nabia_mate-screensaver_fix_based_on_51e6322.patch
+++ b/helpers/DATA/mate-screensaver/nabia_mate-screensaver_fix_based_on_51e6322.patch
@ -1,22 +0,0 @@
 From 51e6322db5717c7baa9a517a19af163fbeed56a5 Mon Sep 17 00:00:00 2001
 From: rbuj <robert.buj@gmail.com>
 Date: Fri, 15 Jan 2021 18:18:39 +0100
 Subject: [PATCH] i18n: Do not collect the translation for Icon
 ---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/Makefile.am b/src/Makefile.am
 index a1c65ed9..f26612be 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
@@ -57,7 +57,7 @@ desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = mate-screensaver.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 mate_screensaver_command_SOURCES = 	\
 	mate-screensaver-command.c	\
--- a/helpers/DATA/mate-screensaver/nabia_mate-screensaver_fix_based_on_dd0f927.patch
+++ b/helpers/DATA/mate-screensaver/nabia_mate-screensaver_fix_based_on_dd0f927.patch
@ -1,31 +0,0 @@
 From dd0f9279eb831c49ac73b15f565bc9abcf9005ed Mon Sep 17 00:00:00 2001
 From: rbuj <robert.buj@gmail.com>
 Date: Sun, 31 Jan 2021 20:52:34 +0100
 Subject: [PATCH] i18n: Do not collect the translation for Icon (data folder)
 ---
 data/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/data/Makefile.am b/data/Makefile.am
 index e3e0eb9f..b7056353 100644
 --- a/data/Makefile.am
 +++ b/data/Makefile.am
@@ -14,7 +14,7 @@ desktop_in_files = mate-screensaver-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 directorydir = $(datadir)/desktop-directories
 directory_in_files =                            \
@@ -23,7 +23,7 @@ directory_in_files =                            \
 directory_DATA = $(directory_in_files:.directory.desktop.in=.directory)
 $(directory_DATA): $(directory_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --template $< -d $(top_srcdir)/po -o $@
 menudir = $(sysconfdir)/xdg/menus
 menu_DATA =					\
--- a/helpers/DATA/mate-system-monitor/nabia_mate-screensaver_fix_based_on_d245a2f.patch
+++ b/helpers/DATA/mate-system-monitor/nabia_mate-screensaver_fix_based_on_d245a2f.patch
@ -1,22 +0,0 @@
 From d245a2f56302b7a26528194f30c788f5ab80e38f Mon Sep 17 00:00:00 2001
 From: rbuj <robert.buj@gmail.com>
 Date: Sun, 31 Jan 2021 22:28:37 +0100
 Subject: [PATCH] i18n: Do not collect the translation for Icon
 ---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/Makefile.am b/Makefile.am
 index 95f16ecf..d7e22e71 100644
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -41,7 +41,7 @@ Applications_in_files = mate-system-monitor.desktop.in
 Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
 $(Applications_DATA): $(Applications_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 distuninstallcheck_listfiles = find . -type f -print
--- a/helpers/DATA/mate-utils/nabia_mate_fix_based_on_7680719.patch
+++ b/helpers/DATA/mate-utils/nabia_mate_fix_based_on_7680719.patch
@ -1,96 +0,0 @@
 diff -Nru baobab/data/Makefile.am baobab/data/Makefile.am
 --- a/baobab/data/Makefile.am	2020-02-09 19:39:11.000000000 -0600
 +++ b/baobab/data/Makefile.am	2022-02-16 16:41:58.357104436 -0600
@@ -6,7 +6,7 @@
 	sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
 $(baobabapp_DATA): $(baobabapp_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-disk-usage-analyzer.appdata.xml.in
 diff -Nru gsearchtool/data/Makefile.am gsearchtool/data/Makefile.am
 --- a/gsearchtool/data/Makefile.am	2020-02-09 19:39:11.000000000 -0600
 +++ b/gsearchtool/data/Makefile.am	2022-02-16 16:41:59.341116566 -0600
@@ -18,7 +18,7 @@
 Utilities_in_files = mate-search-tool.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
 $(Utilities_DATA): $(Utilities_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 EXTRA_DIST = \
 	$(icon_DATA) \
 diff -Nru logview/data/Makefile.am logview/data/Makefile.am
 --- a/logview/data/Makefile.am	2020-02-09 19:39:11.000000000 -0600
 +++ b/logview/data/Makefile.am	2022-02-16 16:41:59.989124555 -0600
@@ -6,7 +6,7 @@
 $(desktop_in_files): $(desktop_in_files:.desktop.in=.desktop.in.in)
 	@sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
 $(desktop_DATA): $(desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 man_MANS = mate-system-log.1
 diff -Nru mate-dictionary/data/Makefile.am mate-dictionary/data/Makefile.am
 --- a/mate-dictionary/data/Makefile.am	2020-02-09 19:39:11.000000000 -0600
 +++ b/mate-dictionary/data/Makefile.am	2022-02-16 16:42:00.853135206 -0600
@@ -9,6 +9,9 @@
 $(gdictapp_in_files): $(gdictapp_in_files:.desktop.in=.desktop.in.in)
 	$(AM_V_GEN)sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
 +$(gdictapp_DATA): $(gdictapp_in_files)
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 +
 # dictionary sources definitions
 dictsourcedir = $(datadir)/mate-dict/sources
 dictsource_in_files = \
@@ -17,8 +20,8 @@
 	$(NULL)
 dictsource_DATA = $(dictsource_in_files:.desktop.in=.desktop)
 -%.desktop: %.desktop.in
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +$(dictsource_DATA): $(dictsource_in_files)
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 builderdir = $(datadir)/mate-dictionary
 builder_DATA = \
 diff -Nru mate-disk-image-mounter/data/Makefile.am mate-disk-image-mounter/data/Makefile.am
 --- a/mate-disk-image-mounter/data/Makefile.am	2020-02-09 19:39:11.000000000 -0600
 +++ b/mate-disk-image-mounter/data/Makefile.am	2022-02-16 16:42:02.137151035 -0600
@@ -4,7 +4,7 @@
 diskimagemounter_in_files = mate-disk-image-mounter.desktop.in
 diskimagemounter_DATA = $(diskimagemounter_in_files:.desktop.in=.desktop)
 $(diskimagemounter_DATA): $(diskimagemounter_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 EXTRA_DIST = 					\
 	$(diskimagemounter_in_files)		\
 diff -Nru mate-screenshot/data/Makefile.am mate-screenshot/data/Makefile.am
 --- a/mate-screenshot/data/Makefile.am	2020-02-09 19:39:11.000000000 -0600
 +++ b/mate-screenshot/data/Makefile.am	2022-02-16 16:42:02.157151282 -0600
@@ -2,7 +2,7 @@
 mate_screenshot_in_files = mate-screenshot.desktop.in
 mate_screenshot_DATA = $(mate_screenshot_in_files:.desktop.in=.desktop)
 $(mate_screenshot_DATA): $(mate_screenshot_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 man_MANS = mate-screenshot.1
 diff -Nru po/Makevars po/Makevars
 --- a/po/Makevars	2020-02-09 19:39:11.000000000 -0600
 +++ b/po/Makevars	2022-02-16 16:42:02.233152218 -0600
@@ -8,7 +8,7 @@
 top_builddir = ..
 # These options get passed to xgettext.
 -XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments=Translators:
 +XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --keyword=Description --add-comments=Translators:
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
--- a/helpers/DATA/mozo/nabia_mate-mozo_fix_based_on_79e576c.patch
+++ b/helpers/DATA/mozo/nabia_mate-mozo_fix_based_on_79e576c.patch
@ -1,22 +0,0 @@
 From 79e576c9d7f8a80ac0bbd60749726a11786809a9 Mon Sep 17 00:00:00 2001
 From: rbuj <robert.buj@gmail.com>
 Date: Sun, 31 Jan 2021 22:16:42 +0100
 Subject: [PATCH] i18n: Do not collect the translation for Icon
 ---
 data/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/data/Makefile.am b/data/Makefile.am
 index ce5f3fb..8a456d6 100644
 --- a/data/Makefile.am
 +++ b/data/Makefile.am
@@ -5,7 +5,7 @@ desktop_in_files = mozo.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(desktop_in_files)
 -	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 +	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 man_MANS = mozo.1
--- a/helpers/DATA/pcmanfm/pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch
+++ b/helpers/DATA/pcmanfm/pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch
@ -1,31 +0,0 @@
 From ec3c00ed4c5130fdc8a83b84b587da8457e067f1 Mon Sep 17 00:00:00 2001
 From: Mamoru TASAKA <mtasaka@fedoraproject.org>
 Date: Sun, 22 Mar 2020 16:46:48 +0900
 Subject: [PATCH] main: set the GIOChannel encoding to binary
 https://developer.gnome.org/glib/stable/glib-IO-Channels.html#g-io-channel-set-encoding
 says the default encoding is UTF-8, and setting encoding to NULL is safe
 use with binary data.
 Actually without setting encoding to NULL, on Fedora 32, trying to terminate pcmanfm with
 Ctrl-C (SIGINT) causes pcmanfm hang at g_io_channel_read_chars() in on_unix_signal(),
 and this is now causing system reboot delayed for 90 seconds with systemd.
 ---
 src/pcmanfm.c | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/src/pcmanfm.c b/src/pcmanfm.c
 index 9be80f7..c0fe84f 100644
 --- a/src/pcmanfm.c
 +++ b/src/pcmanfm.c
@@ -239,6 +239,7 @@ int main(int argc, char** argv)
     {
         GIOChannel* ch = g_io_channel_unix_new(signal_pipe[0]);
         g_io_add_watch(ch, G_IO_IN|G_IO_PRI, (GIOFunc)on_unix_signal, NULL);
 +        g_io_channel_set_encoding(ch, NULL, NULL);
         g_io_channel_unref(ch);
         /* intercept signals */
 -- 
 2.26.0.rc2
--- a/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-device-wired-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-device-wired-secure.svg
@ -1,106 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3200"
   version="1.0"
   width="22"
   sodipodi:docname="nm-device-wired-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview13"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3200" />
  <metadata
     id="metadata8">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3202" />
  <path
     d="m 20,16 -5,5 -5,-5 3,0 0,-7 4,0 0,7 3,0 z M 12,9 7,4 2,9 l 3,0 0,7 4,0 0,-7 3,0 z"
     id="path4348-1-9"
     style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 20,15 -5,5 -5,-5 3,0 0,-7 4,0 0,7 3,0 z M 12,8 7,3 2,8 l 3,0 0,7 4,0 0,-7 3,0 z"
     id="path4348-1"
     style="fill:#dfdbd2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <!-- imported from 'ubuntu-mono-dark/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#dfdbd2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-signal-00-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-signal-00-secure.svg
@ -1,150 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3229"
   version="1.0"
   width="22"
   sodipodi:docname="nm-signal-00-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview23"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3229" />
  <metadata
     id="metadata9">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3231" />
  <g
     id="g3893"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 2.85,11.144409 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3"
       id="path3683-5"
       style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 2.85,10.144409 c 0,0 2.8977535,-3.2944092 9.131958,-3.2944092 C 18.185515,6.8499998 21.15,10.15 21.15,10.15"
       id="path3683"
       style="fill:none;stroke:#dfdbd2;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3916"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 5.3499998,13.752608 c 0,0 2.1468917,-2.21577 6.6500012,-2.136936 4.54046,0.07949 6.649999,2.172525 6.649999,2.172525"
       id="path3681-0"
       style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 5.3499998,12.752608 c 0,0 2.1468917,-2.215771 6.6500012,-2.136937 4.54046,0.07949 6.649999,2.172526 6.649999,2.172526"
       id="path3681"
       style="fill:none;stroke:#dfdbd2;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3939"
     style="opacity:0.5"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 8.3499999,16.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
       id="path3209-5"
       style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 8.3499999,15.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
       id="path3209"
       style="fill:none;stroke:#dfdbd2;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3962"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 11.145105,18 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 11.591259,19.938886 11.786534,20 12.000001,20 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
       id="path3196-5-7"
       style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 11.145105,17 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 11.591259,18.938886 11.786534,19 12.000001,19 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
       id="path3196-5"
       style="fill:#dfdbd2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <!-- imported from 'ubuntu-mono-dark/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#dfdbd2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-signal-100-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-signal-100-secure.svg
@ -1,130 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3229"
   version="1.0"
   width="22"
   sodipodi:docname="nm-signal-100-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview19"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3229" />
  <metadata
     id="metadata9">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3231" />
  <path
     d="m 1.85,10.144409 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3"
     id="path3683-5"
     style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 1.85,9.144409 c 0,0 2.8977535,-3.2944092 9.131958,-3.2944092 C 17.185515,5.8499998 20.15,9.15 20.15,9.15"
     id="path3683"
     style="fill:none;stroke:#dfdbd2;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 4.3499998,12.752608 c 0,0 2.1468917,-2.21577 6.6500012,-2.136936 4.54046,0.07949 6.649999,2.172525 6.649999,2.172525"
     id="path3681-0"
     style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 4.3499998,11.752608 c 0,0 2.1468917,-2.215771 6.6500012,-2.136937 4.54046,0.07949 6.649999,2.172526 6.649999,2.172526"
     id="path3681"
     style="fill:none;stroke:#dfdbd2;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 7.3499999,15.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209-5"
     style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 7.3499999,14.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209"
     style="fill:none;stroke:#dfdbd2;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,17 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,18.938886 10.786534,19 11.000001,19 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5-7"
     style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,16 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,17.938886 10.786534,18 11.000001,18 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5"
     style="fill:#dfdbd2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <!-- imported from 'ubuntu-mono-dark/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#dfdbd2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-signal-25-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-signal-25-secure.svg
@ -1,145 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3229"
   version="1.0"
   width="22"
   sodipodi:docname="nm-signal-25-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview22"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3229" />
  <metadata
     id="metadata9">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3231" />
  <g
     id="g3893"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 2.85,11.144409 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3"
       id="path3683-5"
       style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 2.85,10.144409 c 0,0 2.8977535,-3.2944092 9.131958,-3.2944092 C 18.185515,6.8499998 21.15,10.15 21.15,10.15"
       id="path3683"
       style="fill:none;stroke:#dfdbd2;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3916"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 5.3499998,13.752608 c 0,0 2.1468917,-2.21577 6.6500012,-2.136936 4.54046,0.07949 6.649999,2.172525 6.649999,2.172525"
       id="path3681-0"
       style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 5.3499998,12.752608 c 0,0 2.1468917,-2.215771 6.6500012,-2.136937 4.54046,0.07949 6.649999,2.172526 6.649999,2.172526"
       id="path3681"
       style="fill:none;stroke:#dfdbd2;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3939"
     style="opacity:0.5"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 8.3499999,16.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
       id="path3209-5"
       style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 8.3499999,15.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
       id="path3209"
       style="fill:none;stroke:#dfdbd2;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <path
     d="m 10.145105,17 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,18.938886 10.786534,19 11.000001,19 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5-7"
     style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,16 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,17.938886 10.786534,18 11.000001,18 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5"
     style="fill:#dfdbd2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <!-- imported from 'ubuntu-mono-dark/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#dfdbd2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-signal-50-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-signal-50-secure.svg
@ -1,140 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3229"
   version="1.0"
   width="22"
   sodipodi:docname="nm-signal-50-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview21"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3229" />
  <metadata
     id="metadata9">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3231" />
  <g
     id="g3893"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 2.85,11.144409 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3"
       id="path3683-5"
       style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 2.85,10.144409 c 0,0 2.8977535,-3.2944092 9.131958,-3.2944092 C 18.185515,6.8499998 21.15,10.15 21.15,10.15"
       id="path3683"
       style="fill:none;stroke:#dfdbd2;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3916"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 5.3499998,13.752608 c 0,0 2.1468917,-2.21577 6.6500012,-2.136936 4.54046,0.07949 6.649999,2.172525 6.649999,2.172525"
       id="path3681-0"
       style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 5.3499998,12.752608 c 0,0 2.1468917,-2.215771 6.6500012,-2.136937 4.54046,0.07949 6.649999,2.172526 6.649999,2.172526"
       id="path3681"
       style="fill:none;stroke:#dfdbd2;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <path
     d="m 7.3499999,15.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209-5"
     style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 7.3499999,14.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209"
     style="fill:none;stroke:#dfdbd2;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,17 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,18.938886 10.786534,19 11.000001,19 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5-7"
     style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,16 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,17.938886 10.786534,18 11.000001,18 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5"
     style="fill:#dfdbd2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <!-- imported from 'ubuntu-mono-dark/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#dfdbd2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-signal-75-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Ambiant-MATE/nm-signal-75-secure.svg
@ -1,135 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3229"
   version="1.0"
   width="22"
   sodipodi:docname="nm-signal-75-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview20"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3229" />
  <metadata
     id="metadata9">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3231" />
  <g
     id="g3893"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 2.85,11.144409 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3"
       id="path3683-5"
       style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 2.85,10.144409 c 0,0 2.8977535,-3.2944092 9.131958,-3.2944092 C 18.185515,6.8499998 21.15,10.15 21.15,10.15"
       id="path3683"
       style="fill:none;stroke:#dfdbd2;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <path
     d="m 4.3499998,12.752608 c 0,0 2.1468917,-2.21577 6.6500012,-2.136936 4.54046,0.07949 6.649999,2.172525 6.649999,2.172525"
     id="path3681-0"
     style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 4.3499998,11.752608 c 0,0 2.1468917,-2.215771 6.6500012,-2.136937 4.54046,0.07949 6.649999,2.172526 6.649999,2.172526"
     id="path3681"
     style="fill:none;stroke:#dfdbd2;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 7.3499999,15.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209-5"
     style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 7.3499999,14.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209"
     style="fill:none;stroke:#dfdbd2;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,17 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,18.938886 10.786534,19 11.000001,19 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5-7"
     style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,16 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,17.938886 10.786534,18 11.000001,18 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5"
     style="fill:#dfdbd2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <!-- imported from 'ubuntu-mono-dark/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#dfdbd2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-device-wired-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-device-wired-secure.svg
@ -1,106 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3200"
   version="1.0"
   width="22"
   sodipodi:docname="nm-device-wired-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview13"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3200" />
  <metadata
     id="metadata8">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3202" />
  <path
     d="m 20,16 -5,5 -5,-5 3,0 0,-7 4,0 0,7 3,0 z M 12,9 7,4 2,9 l 3,0 0,7 4,0 0,-7 3,0 z"
     id="path4348-1-9"
     style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 20,15 -5,5 -5,-5 3,0 0,-7 4,0 0,7 3,0 z M 12,8 7,3 2,8 l 3,0 0,7 4,0 0,-7 3,0 z"
     id="path4348-1"
     style="fill:#3c3c3c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <!-- imported from 'ubuntu-mono-light/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#3c3c3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-signal-00-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-signal-00-secure.svg
@ -1,150 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3229"
   version="1.0"
   width="22"
   sodipodi:docname="nm-signal-00-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview23"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3229" />
  <metadata
     id="metadata9">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3231" />
  <g
     id="g3893"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 2.85,11.144409 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3"
       id="path3683-5"
       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 2.85,10.144409 c 0,0 2.8977535,-3.2944092 9.131958,-3.2944092 C 18.185515,6.8499998 21.15,10.15 21.15,10.15"
       id="path3683"
       style="fill:none;stroke:#3c3c3c;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3916"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 5.3499998,13.752608 c 0,0 2.1468917,-2.21577 6.6500012,-2.136936 4.54046,0.07949 6.649999,2.172525 6.649999,2.172525"
       id="path3681-0"
       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 5.3499998,12.752608 c 0,0 2.1468917,-2.215771 6.6500012,-2.136937 4.54046,0.07949 6.649999,2.172526 6.649999,2.172526"
       id="path3681"
       style="fill:none;stroke:#3c3c3c;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3939"
     style="opacity:0.5"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 8.3499999,16.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
       id="path3209-5"
       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 8.3499999,15.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
       id="path3209"
       style="fill:none;stroke:#3c3c3c;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3962"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 11.145105,18 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 11.591259,19.938886 11.786534,20 12.000001,20 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
       id="path3196-5-7"
       style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 11.145105,17 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 11.591259,18.938886 11.786534,19 12.000001,19 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
       id="path3196-5"
       style="fill:#3c3c3c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <!-- imported from 'ubuntu-mono-light/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#3c3c3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-signal-100-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-signal-100-secure.svg
@ -1,130 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3229"
   version="1.0"
   width="22"
   sodipodi:docname="nm-signal-100-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview19"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3229" />
  <metadata
     id="metadata9">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3231" />
  <path
     d="m 1.85,10.144409 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3"
     id="path3683-5"
     style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 1.85,9.144409 c 0,0 2.8977535,-3.2944092 9.131958,-3.2944092 C 17.185515,5.8499998 20.15,9.15 20.15,9.15"
     id="path3683"
     style="fill:none;stroke:#3c3c3c;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 4.3499998,12.752608 c 0,0 2.1468917,-2.21577 6.6500012,-2.136936 4.54046,0.07949 6.649999,2.172525 6.649999,2.172525"
     id="path3681-0"
     style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 4.3499998,11.752608 c 0,0 2.1468917,-2.215771 6.6500012,-2.136937 4.54046,0.07949 6.649999,2.172526 6.649999,2.172526"
     id="path3681"
     style="fill:none;stroke:#3c3c3c;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 7.3499999,15.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209-5"
     style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 7.3499999,14.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209"
     style="fill:none;stroke:#3c3c3c;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,17 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,18.938886 10.786534,19 11.000001,19 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5-7"
     style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,16 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,17.938886 10.786534,18 11.000001,18 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5"
     style="fill:#3c3c3c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <!-- imported from 'ubuntu-mono-light/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#3c3c3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-signal-25-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-signal-25-secure.svg
@ -1,145 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3229"
   version="1.0"
   width="22"
   sodipodi:docname="nm-signal-25-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview22"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3229" />
  <metadata
     id="metadata9">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3231" />
  <g
     id="g3893"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 2.85,11.144409 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3"
       id="path3683-5"
       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 2.85,10.144409 c 0,0 2.8977535,-3.2944092 9.131958,-3.2944092 C 18.185515,6.8499998 21.15,10.15 21.15,10.15"
       id="path3683"
       style="fill:none;stroke:#3c3c3c;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3916"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 5.3499998,13.752608 c 0,0 2.1468917,-2.21577 6.6500012,-2.136936 4.54046,0.07949 6.649999,2.172525 6.649999,2.172525"
       id="path3681-0"
       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 5.3499998,12.752608 c 0,0 2.1468917,-2.215771 6.6500012,-2.136937 4.54046,0.07949 6.649999,2.172526 6.649999,2.172526"
       id="path3681"
       style="fill:none;stroke:#3c3c3c;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3939"
     style="opacity:0.5"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 8.3499999,16.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
       id="path3209-5"
       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 8.3499999,15.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
       id="path3209"
       style="fill:none;stroke:#3c3c3c;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <path
     d="m 10.145105,17 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,18.938886 10.786534,19 11.000001,19 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5-7"
     style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,16 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,17.938886 10.786534,18 11.000001,18 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5"
     style="fill:#3c3c3c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <!-- imported from 'ubuntu-mono-light/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#3c3c3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-signal-50-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-signal-50-secure.svg
@ -1,140 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3229"
   version="1.0"
   width="22"
   sodipodi:docname="nm-signal-50-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview21"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3229" />
  <metadata
     id="metadata9">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3231" />
  <g
     id="g3893"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 2.85,11.144409 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3"
       id="path3683-5"
       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 2.85,10.144409 c 0,0 2.8977535,-3.2944092 9.131958,-3.2944092 C 18.185515,6.8499998 21.15,10.15 21.15,10.15"
       id="path3683"
       style="fill:none;stroke:#3c3c3c;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <g
     id="g3916"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 5.3499998,13.752608 c 0,0 2.1468917,-2.21577 6.6500012,-2.136936 4.54046,0.07949 6.649999,2.172525 6.649999,2.172525"
       id="path3681-0"
       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 5.3499998,12.752608 c 0,0 2.1468917,-2.215771 6.6500012,-2.136937 4.54046,0.07949 6.649999,2.172526 6.649999,2.172526"
       id="path3681"
       style="fill:none;stroke:#3c3c3c;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <path
     d="m 7.3499999,15.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209-5"
     style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 7.3499999,14.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209"
     style="fill:none;stroke:#3c3c3c;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,17 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,18.938886 10.786534,19 11.000001,19 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5-7"
     style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,16 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,17.938886 10.786534,18 11.000001,18 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5"
     style="fill:#3c3c3c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <!-- imported from 'ubuntu-mono-light/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#3c3c3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-signal-75-secure.svg
+++ b/helpers/DATA/ubuntu-mate-artwork/Radiant-MATE/nm-signal-75-secure.svg
@ -1,135 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   height="22"
   id="svg3229"
   version="1.0"
   width="22"
   sodipodi:docname="nm-signal-75-secure.svg"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="640"
     inkscape:window-height="480"
     id="namedview20"
     showgrid="false"
     inkscape:zoom="10.727273"
     inkscape:cx="11"
     inkscape:cy="11"
     inkscape:window-x="0"
     inkscape:window-y="28"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg3229" />
  <metadata
     id="metadata9">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs3231" />
  <g
     id="g3893"
     style="opacity:0.4"
     transform="translate(-0.99999998,-1)">
    <path
       d="m 2.85,11.144409 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3"
       id="path3683-5"
       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="m 2.85,10.144409 c 0,0 2.8977535,-3.2944092 9.131958,-3.2944092 C 18.185515,6.8499998 21.15,10.15 21.15,10.15"
       id="path3683"
       style="fill:none;stroke:#3c3c3c;stroke-width:1.70000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
  <path
     d="m 4.3499998,12.752608 c 0,0 2.1468917,-2.21577 6.6500012,-2.136936 4.54046,0.07949 6.649999,2.172525 6.649999,2.172525"
     id="path3681-0"
     style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 4.3499998,11.752608 c 0,0 2.1468917,-2.215771 6.6500012,-2.136937 4.54046,0.07949 6.649999,2.172526 6.649999,2.172526"
     id="path3681"
     style="fill:none;stroke:#3c3c3c;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 7.3499999,15.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209-5"
     style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 7.3499999,14.191046 c 0,0 0.9668981,-1.071983 3.5986811,-1.092208 2.598976,-0.01997 3.701319,1.092208 3.701319,1.092208"
     id="path3209"
     style="fill:none;stroke:#3c3c3c;stroke-width:1.69999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,17 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,18.938886 10.786534,19 11.000001,19 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5-7"
     style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <path
     d="m 10.145105,16 c -0.471902,0 -0.854895,0.298667 -0.854895,0.666667 0,0.136758 0.0529,0.263941 0.143587,0.369778 0,0 1.007602,0.801438 1.007602,0.801438 C 10.591259,17.938886 10.786534,18 11.000001,18 c 0.253303,0 0.480993,-0.08605 0.63758,-0.222693 0,0 0.900909,-0.710397 0.900909,-0.710397 0.107541,-0.111488 0.1713,-0.250094 0.1713,-0.400243 0,-0.368 -0.382993,-0.666667 -0.854895,-0.666667 0,0 -1.70979,0 -1.70979,0 z"
     id="path3196-5"
     style="fill:#3c3c3c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  <!-- imported from 'ubuntu-mono-light/status/22/nm-vpn-lock.svg' -->
  <g
     id="svg3215">
    <metadata
       id="metadata12">
      <rdf:RDF>
        <cc:Work
           rdf:about="">
          <dc:format>image/svg+xml</dc:format>
          <dc:type
             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
          <dc:title />
        </cc:Work>
      </rdf:RDF>
    </metadata>
    <sodipodi:namedview
       bordercolor="#666666"
       borderopacity="1.0"
       gridtolerance="10.0"
       guidetolerance="10.0"
       id="base"
       inkscape:current-layer="svg3215"
       inkscape:cx="-2.6506024"
       inkscape:cy="13.012048"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
       inkscape:window-height="753"
       inkscape:window-maximized="1"
       inkscape:window-width="1280"
       inkscape:window-x="0"
       inkscape:window-y="24"
       inkscape:zoom="10.375"
       objecttolerance="10.0"
       pagecolor="#ffffff"
       showgrid="false" />
    <defs
       id="defs3217" />
    <path
       d="M 19,14 C 17.892,14 17,14.910763 17,16.03125 L 17,17 C 16.446,17 16,17.446 16,18 L 16,21 C 16,21.554 16.446,22 17,22 L 21,22 C 21.554,22 22,21.554 22,21 L 22,18 C 22,17.446 21.554,17 21,17 L 21,16.03125 C 21,14.910764 20.108,14 19,14 z M 19,15 C 19.554,15 20,15.442363 20,16 L 20,17 L 18,17 L 18,16 C 18,15.442363 18.446,15 19,15 z"
       id="path2441"
       style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
    <path
       d="M 19,13 C 17.892,13 17,13.910763 17,15.03125 L 17,16 C 16.446,16 16,16.446 16,17 L 16,20 C 16,20.554 16.446,21 17,21 L 21,21 C 21.554,21 22,20.554 22,20 L 22,17 C 22,16.446 21.554,16 21,16 L 21,15.03125 C 21,13.910764 20.108,13 19,13 z M 19,14 C 19.554,14 20,14.442363 20,15 L 20,16 L 18,16 L 18,15 C 18,14.442363 18.446,14 19,14 z"
       id="rect2822"
       style="opacity:1;fill:#3c3c3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  </g>
 </svg>
--- a/helpers/make-0ad
+++ b/helpers/make-0ad
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/oibaf/graphics-drivers/ubuntu $UPSTREAM main'
 REPOKEY="957D2708A03A4626"
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported to get latest version into Trisquel"
 compile
--- a/helpers/make-0ad-data
+++ b/helpers/make-0ad-data
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/oibaf/graphics-drivers/ubuntu $UPSTREAM main'
 REPOKEY="957D2708A03A4626"
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported as companion package for 0ad"
 compile
--- a/helpers/make-aiohttp-socks
+++ b/helpers/make-aiohttp-socks
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2019 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 DEPENDS=python-pytest-asyncio
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian stable"
 compile
--- a/helpers/make-aiorpcx
+++ b/helpers/make-aiorpcx
@ -1,29 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2019 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian-testing"
 compile
--- a/helpers/make-alembic
+++ b/helpers/make-alembic
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 BACKPORTS=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian stable"
 compile
--- a/helpers/make-caja-extensions
+++ b/helpers/make-caja-extensions
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=0
 BUILD_UNTIL=10.0
 . ./config
 #Fix LP:1891891 Broken icons on localization MATE (only for nabia)
 patch -p1 < $DATA/nabia_caja-extensions_fix_based_on_09268d1.patch
 changelog "Fix LP:1891891 Broken icons on localization MATE."
 compile
--- a/helpers/make-carla
+++ b/helpers/make-carla
@ -1,35 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2019 Mason Hock <mason@masonhock.com>
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntustudio-ppa/backports/ubuntu $UPSTREAM main '
 REPOKEY=F596CF7036BBAA6D
 BACKPORTS=true
 BUILD_UNTIL=10.0
 . ./config
 #Set only for amd64 (no docs for armhf), more at
 #https://answers.launchpad.net/ubuntu/+source/carla/+question/698213
 sed -i "s|Architecture: any|Architecture: amd64 i386|g" debian/control
 changelog "Backported from ppa"
 compile
--- a/helpers/make-catch2
+++ b/helpers/make-catch2
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu hirsute main universe'
 REPOKEY=871920D1991BC93C
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from Hirsute"
 compile
--- a/helpers/make-celluloid
+++ b/helpers/make-celluloid
@ -1,52 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 #
 VERSION=2
 EXTERNAL='deb-src https://ppa.launchpadcontent.net/xuzhen666/gnome-mpv/ubuntu $UPSTREAM main'
 REPOKEY=6CAE7FA0B44EEF4EBD4E955F77D026E2EEAD66BD
 BUILD_UNTIL=10.0
 . ./config
 # Disable client-side-decorations by default
 sed '/csd-enable/,/summary/s/true/false/' -i data/io.github.celluloid_player.Celluloid.gschema.xml
 # Add a quit entry to fullscreen menu
 cat << EOF | patch -p1
 diff -ur source.orig/src/celluloid-menu.c source/src/celluloid-menu.c
 --- source.orig/src/celluloid-menu.c	2020-11-19 03:49:19.955413754 -0500
 +++ source/src/celluloid-menu.c	2022-01-27 16:00:07.681380177 -0500
@@ -296,6 +296,7 @@
 			CELLULOID_MENU_ITEM(_("_Preferences"), "win.show-preferences-dialog"),
 			CELLULOID_MENU_ITEM(_("_Keyboard Shortcuts"), "win.show-shortcuts-dialog"),
 			CELLULOID_MENU_ITEM(_("_About Celluloid"), "win.show-about-dialog"),
 +			CELLULOID_MENU_ITEM(_("_Quit"), "win.quit"),
 			CELLULOID_MENU_END };
 	celluloid_menu_build_menu(menu, entries, TRUE);
 EOF
 # Fix mpris integration
 patch -p1 < $DATA/mpris-v0.22.patch
 changelog "Backported from ppa"
 compile
--- a/helpers/make-debhelper
+++ b/helpers/make-debhelper
@ -1,34 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
 REPOKEY="871920D1991BC93C"
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from jammy."
 compile
--- a/helpers/make-dvdstyler
+++ b/helpers/make-dvdstyler
@ -1,33 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2019 David Philipe GIl <davidpgil@protonmail.com>
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 #
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main'
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 DEPENDS=cdrkit,libbonobo,gnome-vfs,libgnome,libbonoboui,libgnome-keyring,libgnomeui,orbit2
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from ppa"
 compile
--- a/helpers/make-eom
+++ b/helpers/make-eom
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=0
 BUILD_UNTIL=10.0
 . ./config
 #Fix LP:1891891 Broken icons on localization MATE (only for nabia)
 patch -p1 < $DATA/nabia_eom_fix_based_on_0c8d17a.patch
 changelog "Fix LP:1891891 Broken icons on localization MATE."
 compile
--- a/helpers/make-evolution-data-server
+++ b/helpers/make-evolution-data-server
@ -1,26 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program. If not, see <http://www.gnu.org/licenses/>.
 VERSION=1
 BUILD_UNTIL=10.0
 . ./config
 changelog "Rebuild to use trisquel updated repositories and depencies."
 compile
--- a/helpers/make-gcompris-qt
+++ b/helpers/make-gcompris-qt
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports main'
 REPOKEY=648ACFD622F3D138
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian oldstable-backports"
 compile
--- a/helpers/make-gnome-vfs
+++ b/helpers/make-gnome-vfs
@ -1,32 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 #
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main'
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from ppa as part of dvdstyler dependency"
 compile
--- a/helpers/make-handbrake
+++ b/helpers/make-handbrake
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2020  Luis Guzmán <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL="deb-src http://ppa.launchpad.net/stebbins/handbrake-releases/ubuntu $UPSTREAM main"
 REPOKEY="8771ADB0816950D8"
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Imported into Trisquel from PPA"
 compile
--- a/helpers/make-ibus-typing-booster
+++ b/helpers/make-ibus-typing-booster
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021  Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM-backports main universe'
 BACKPORTS=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Add backport for ibus-typing-booster"
 compile
--- a/helpers/make-kdeconnect
+++ b/helpers/make-kdeconnect
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 BUILD_UNTIL=10.0
 . ./config
 #Apply patch Fix kdeconnect_open MimeType (f1ce2212)
 patch -p1 < $DATA/Fix_kdeconnect_open_MimeType.patch
 changelog "Fix kdeconnect_open MimeType"
 compile
--- a/helpers/make-kiwix
+++ b/helpers/make-kiwix
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=04EE7237B7D453EC
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian stable"
 compile
--- a/helpers/make-libbaseencode
+++ b/helpers/make-libbaseencode
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021  Luis Guzman <ark@switnet.net>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY="648ACFD622F3D138"
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from Debian stable as a dependency for otpclient"
 compile
--- a/helpers/make-libbonobo
+++ b/helpers/make-libbonobo
@ -1,33 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 #
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main'
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 DEPENDS=orbit2
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from ppa as part of dvdstyler dependency"
 compile
--- a/helpers/make-libbonoboui
+++ b/helpers/make-libbonoboui
@ -1,33 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switne.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 #
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main'
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 DEPENDS=libbonobo,libgnome,orbit2
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from ppa as part of dvdstyler dependency"
 compile
--- a/helpers/make-libcotp
+++ b/helpers/make-libcotp
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021  Luis Guzman <ark@switnet.net>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY="648ACFD622F3D138"
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from Debian stable as a dependency for otpclient"
 compile
--- a/helpers/make-libgnome
+++ b/helpers/make-libgnome
@ -1,33 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 #
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main'
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 DEPENDS=gnome-vfs,libbonobo,orbit2
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from ppa as part of dvdstyler dependency"
 compile
--- a/helpers/make-libgnome-keyring
+++ b/helpers/make-libgnome-keyring
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 #
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main'
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from ppa as part of dvdstyler dependency"
 compile
--- a/helpers/make-libgnomeui
+++ b/helpers/make-libgnomeui
@ -1,33 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 #
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main'
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 DEPENDS=libbonoboui,libbonobo,libgnome,gnome-vfs,libgnome-keyring
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from ppa as part of dvdstyler dependency"
 compile
--- a/helpers/make-libkainjow-mustache
+++ b/helpers/make-libkainjow-mustache
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=04EE7237B7D453EC
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian stable as a dependency for kiwix"
 compile
--- a/helpers/make-libkiwix
+++ b/helpers/make-libkiwix
@ -1,33 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=04EE7237B7D453EC
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 sed -i "/override_dh_auto_test/a #Prevent tests because of webserver failing" debian/rules
 sed -i "s|dh_auto_test --|#dh_auto_test --|" debian/rules
 changelog "Backported from debian stable as a kiwix dependency"
 compile
--- a/helpers/make-libphonenumber
+++ b/helpers/make-libphonenumber
@ -1,29 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian stable as part of protobuf reverse dependency"
 compile
--- a/helpers/make-libreoffice
+++ b/helpers/make-libreoffice
@ -1,32 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Pablo Correa Gómez <ablocorrea@hotmail.com>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=4
 EXTERNAL='deb-src https://ppa.launchpadcontent.net/libreoffice/libreoffice-still/ubuntu $UPSTREAM main'
 REPOKEY="83FBA1751378B444"
 BUILD_UNTIL=10.0
 . ./config
 # Make sure that Trisquel gets compiled same as Ubuntu
 patch -p0 < $DATA/debian-rules.patch
 changelog "Backported to get latest version into Trisquel"
 compile
--- a/helpers/make-libtgowt
+++ b/helpers/make-libtgowt
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports-sloppy main'
 REPOKEY=648ACFD622F3D138
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian oldstable-backports-sloppy as telegram-desktop dependency"
 compile
--- a/helpers/make-libtgvoip
+++ b/helpers/make-libtgvoip
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports main'
 REPOKEY=648ACFD622F3D138
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian oldstable-backports as telegram-desktop dependency"
 compile
--- a/helpers/make-mate-calc
+++ b/helpers/make-mate-calc
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=0
 BUILD_UNTIL=10.0
 . ./config
 #Fix LP:1891891 Broken icons on localization MATE (only for nabia)
 patch -p1 < $DATA/nabia_mate-calc_fix_based_on_9196271.patch
 changelog "Fix LP:1891891 Broken icons on localization MATE."
 compile
--- a/helpers/make-mate-control-center
+++ b/helpers/make-mate-control-center
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=0
 BUILD_UNTIL=10.0
 . ./config
 #Fix LP:1891891 Broken icons on localization MATE (only for nabia)
 patch -p1 < $DATA/nabia_mate-control-center_fix_based_on_1438fc1.patch
 changelog "Fix LP:1891891 Broken icons on localization MATE."
 compile
--- a/helpers/make-mate-desktop
+++ b/helpers/make-mate-desktop
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=0
 BUILD_UNTIL=10.0
 . ./config
 #Fix LP:1891891 Broken icons on localization MATE (only for nabia)
 patch -p1 < $DATA/nabia_mate-desktop_fix_based_on_b222081.patch
 changelog "Fix LP:1891891 Broken icons on localization MATE."
 compile
--- a/helpers/make-mate-screensaver
+++ b/helpers/make-mate-screensaver
@ -1,32 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=0
 BUILD_UNTIL=10.0
 . ./config
 #Fix LP:1891891 Broken icons on localization MATE (only for nabia)
 patch -p1 < $DATA/nabia_mate-screensaver_fix_based_on_dd0f927.patch
 patch -p1 < $DATA/nabia_mate-screensaver_fix_based_on_51e6322.patch
 changelog "Fix LP:1891891 Broken icons on localization MATE."
 compile
--- a/helpers/make-mate-system-monitor
+++ b/helpers/make-mate-system-monitor
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=0
 BUILD_UNTIL=10.0
 . ./config
 #Fix LP:1891891 Broken icons on localization MATE (only for nabia)
 patch -p1 < $DATA/nabia_mate-screensaver_fix_based_on_d245a2f.patch
 changelog "Fix LP:1891891 Broken icons on localization MATE."
 compile
--- a/helpers/make-mate-utils
+++ b/helpers/make-mate-utils
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=0
 BUILD_UNTIL=10.0
 . ./config
 #Fix LP:1891891 Broken icons on localization MATE (only for nabia)
 patch -p1 < $DATA/nabia_mate_fix_based_on_7680719.patch
 changelog "Fix LP:1891891 Broken icons on localization MATE."
 compile
--- a/helpers/make-mozo
+++ b/helpers/make-mozo
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=0
 BUILD_UNTIL=10.0
 . ./config
 #Fix LP:1891891 Broken icons on localization MATE (only for nabia)
 patch -p1 < $DATA/nabia_mate-mozo_fix_based_on_79e576c.patch
 changelog "Fix LP:1891891 Broken icons on localization MATE."
 compile
--- a/helpers/make-mumble
+++ b/helpers/make-mumble
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=3
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
 REPOKEY="871920D1991BC93C"
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from jammy"
 compile
--- a/helpers/make-nextcloud-desktop
+++ b/helpers/make-nextcloud-desktop
@ -1,34 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021  Luis Guzmán <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu $UPSTREAM main'
 REPOKEY="60EE47FBAD3DD469"
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 #Force non-backports inkscape version
 sed -i "s|inkscape|inkscape (<= 0.93)|" debian/control
 sed -i "s|Utility|Network|" mirall.desktop.in
 changelog "Imported into Trisquel"
 compile
--- a/helpers/make-opendht
+++ b/helpers/make-opendht
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu hirsute main universe'
 REPOKEY=871920D1991BC93C
 DEPENDS=restinio
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from Hirsute"
 compile
--- a/helpers/make-orbit2
+++ b/helpers/make-orbit2
@ -1,32 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switne.net>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 #
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main'
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from ppa as part of dvdstyler dependency"
 compile
--- a/helpers/make-otpclient
+++ b/helpers/make-otpclient
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021  Luis Guzman <ark@switnet.net>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY="648ACFD622F3D138"
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported optclient from Debian stable into Trisquel"
 compile
--- a/helpers/make-pagure
+++ b/helpers/make-pagure
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 BACKPORTS=true
 DEPENDS=alembic,python-email-validator
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian testing"
 compile
--- a/helpers/make-pcmanfm
+++ b/helpers/make-pcmanfm
@ -1,29 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021  Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 BUILD_UNTIL=10.0
 . ./config
 patch -p1 < $DATA/pcmanfm-0201-main-set-the-GIOChannel-encoding-to-binary.patch
 changelog "Fix hanging issue LP#1878625, remove after 1.3.2-1."
 compile
--- a/helpers/make-protobuf
+++ b/helpers/make-protobuf
@ -1,29 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2019 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian stable"
 compile
--- a/helpers/make-pspp
+++ b/helpers/make-pspp
@ -1,33 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2022 Trisquel GNU/Linux developers
 #                       <trisquel-devel@listas.trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=0
 EXTERNAL='deb-src http://ftp.us.debian.org/debian oldstable main'
 REPOKEY=648ACFD622F3D138
 BUILD_UNTIL=10.0
 . ./config
 #This helper is for nabia only
 sed -i '/texlive-generic/d' debian/control
 changelog "Backported from oldstable due to lack of packaging upstream."
 compile
--- a/helpers/make-python-email-validator
+++ b/helpers/make-python-email-validator
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 BACKPORTS=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian testing"
 compile
--- a/helpers/make-python-gwebsockets
+++ b/helpers/make-python-gwebsockets
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
 REPOKEY="871920D1991BC93C"
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from jammy"
 compile
--- a/helpers/make-restinio
+++ b/helpers/make-restinio
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu hirsute main universe'
 REPOKEY=871920D1991BC93C
 DEPENDS=catch2
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from Hirsute"
 compile
--- a/helpers/make-ring
+++ b/helpers/make-ring
@ -1,31 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu hirsute main universe'
 REPOKEY=871920D1991BC93C
 DEPENDS=opendht
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from Hirsute"
 compile
--- a/helpers/make-sane-airscan
+++ b/helpers/make-sane-airscan
@ -1,33 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
 REPOKEY="871920D1991BC93C"
 BUILD_UNTIL=10.0
 . ./config
 sed 's/debhelper.*/debhelper,/' -i debian/control
 echo 12 > debian/compat
 changelog "Backported from jammy"
 compile
--- a/helpers/make-sugar
+++ b/helpers/make-sugar
@ -1,35 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 REPOKEY="871920D1991BC93C"
 BUILD_UNTIL=10.0
 . ./config
 sed '/ImageViewerActivity/d;/sugar.Jukebox/d;/sugar.ReadActivity/d' -i data/activities.hidden
 #Replace upstream dependencies with trisquel sugar-activities
 sed '/sucrose/,/\${cdbs:Depends}/s|\${cdbs:Depends}|sugar-honey|' -i debian/control
 changelog "Backported from impish for trisquel-sugar"
 compile
--- a/helpers/make-sugar-artwork
+++ b/helpers/make-sugar-artwork
@ -1,33 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 REPOKEY="871920D1991BC93C"
 BUILD_UNTIL=10.0
 . ./config
 sed '/debhelper-compat/s|13|12|' -i debian/control
 changelog "Backported from impish as dependency of sugar package"
 compile
--- a/helpers/make-sugar-datastore
+++ b/helpers/make-sugar-datastore
@ -1,33 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 REPOKEY="871920D1991BC93C"
 BUILD_UNTIL=10.0
 . ./config
 sed '/dh-sequence-gir/d' -i debian/control
 sed '/debhelper-compat/s|13|12|' -i debian/control
 changelog "Backported from impish as dependency for sugar"
 compile
--- a/helpers/make-sugar-toolkit-gtk3
+++ b/helpers/make-sugar-toolkit-gtk3
@ -1,35 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 REPOKEY="871920D1991BC93C"
 BUILD_UNTIL=10.0
 . ./config
 rm debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch debian/patches/1001_espeak-ng.patch
 sed '/2003_bundlebuilder_exit_nonzero_on_error.patch/d; /1001_espeak-ng.patch/d' -i debian/patches/series
 sed '/dh-sequence-gir/d' -i debian/control
 sed '/debhelper-compat/s|13|12|' -i debian/control
 changelog "Backported from impish as dependency of sugar"
 compile
--- a/helpers/make-telegram-desktop
+++ b/helpers/make-telegram-desktop
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports-sloppy main'
 REPOKEY=648ACFD622F3D138
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian oldstable-backports-sloppy"
 compile
--- a/helpers/make-ubuntu-mate-artwork
+++ b/helpers/make-ubuntu-mate-artwork
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=1
 BUILD_UNTIL=10.0
 . ./config
 cp $DATA/Radiant-MATE/*.svg usr/share/icons/Radiant-MATE/status/22/
 cp $DATA/Ambiant-MATE/*.svg usr/share/icons/Ambiant-MATE/status/22/
 changelog "Fixing malformed SVG 22x22 icons for nm-applet VPN"
 compile
--- a/helpers/make-zimlib
+++ b/helpers/make-zimlib
@ -1,30 +0,0 @@
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=04EE7237B7D453EC
 BACKPORT=true
 BUILD_UNTIL=10.0
 . ./config
 changelog "Backported from debian stable as a dependency for kiwix"
 compile