diff --git a/desktop/mate/mate-screensaver/actions.py b/desktop/mate/mate-screensaver/actions.py
index 686a9c00f6..d99a1cd90d 100644
--- a/desktop/mate/mate-screensaver/actions.py
+++ b/desktop/mate/mate-screensaver/actions.py
@@ -11,6 +11,7 @@ from pisi.actionsapi import get
def setup():
autotools.configure(" --enable-locking \
+ --libexecdir=/usr/lib/mate-screensaver \
--with-xf86gamma-ext \
--with-kbd-layout-indicator \
--with-systemd=no \
diff --git a/desktop/mate/mate-screensaver/files/pisi_screen_saver.patch b/desktop/mate/mate-screensaver/files/pisi_screen_saver.patch
index 286d3701c1..bdea701ac8 100644
--- a/desktop/mate/mate-screensaver/files/pisi_screen_saver.patch
+++ b/desktop/mate/mate-screensaver/files/pisi_screen_saver.patch
@@ -1,7 +1,7 @@
diff -Nuar a/configure b/configure
---- a/configure 2019-09-21 19:04:30.000000000 +0300
-+++ b/configure 2020-03-18 14:32:46.468779843 +0300
-@@ -640,7 +640,7 @@
+--- a/configure 2020-02-10 15:37:38.000000000 +0300
++++ b/configure 2020-03-23 14:46:21.449967069 +0300
+@@ -641,7 +641,7 @@
privdatadir
privlibexecdir
MATE_SCREENSAVER_THEMES_DIR
@@ -10,19 +10,20 @@ diff -Nuar a/configure b/configure
FLOATERS_FOOT_LOGO_IMAGE
SLIDESHOW_COSMOS_DIR
DEBUG_CFLAGS
-@@ -18298,7 +18298,7 @@
+@@ -19955,8 +19955,7 @@
FLOATERS_FOOT_LOGO_IMAGE="${EXPANDED_DATADIR}/pixmaps/mate-logo-white.svg"
-FLOATERS_FOOT_GNOME_LOGO_IMAGE="${EXPANDED_DATADIR}/pixmaps/gnome-logo-white.svg"
+-
+FLOATERS_FOOT_PISI_LOGO_IMAGE="${EXPANDED_DATADIR}/pixmaps/pisi-logo-white.svg"
-
# Menu stuff
+
diff -Nuar a/configure.ac b/configure.ac
---- a/configure.ac 2019-09-21 19:01:26.000000000 +0300
-+++ b/configure.ac 2020-03-18 14:32:50.952780172 +0300
-@@ -1107,8 +1107,8 @@
+--- a/configure.ac 2020-02-10 15:35:28.000000000 +0300
++++ b/configure.ac 2020-03-23 14:45:46.404967165 +0300
+@@ -1080,8 +1080,8 @@
FLOATERS_FOOT_LOGO_IMAGE="${EXPANDED_DATADIR}/pixmaps/mate-logo-white.svg"
AC_SUBST(FLOATERS_FOOT_LOGO_IMAGE)
@@ -34,8 +35,8 @@ diff -Nuar a/configure.ac b/configure.ac
# Menu stuff
diff -Nuar a/data/images/cosmos/Makefile.in b/data/images/cosmos/Makefile.in
---- a/data/images/cosmos/Makefile.in 2019-09-21 19:04:31.000000000 +0300
-+++ b/data/images/cosmos/Makefile.in 2020-03-18 14:21:52.055731740 +0300
+--- a/data/images/cosmos/Makefile.in 2020-02-10 15:37:39.000000000 +0300
++++ b/data/images/cosmos/Makefile.in 2020-03-23 14:30:28.847969684 +0300
@@ -191,7 +191,7 @@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
@@ -43,10 +44,10 @@ diff -Nuar a/data/images/cosmos/Makefile.in b/data/images/cosmos/Makefile.in
-FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@
+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@
FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@
+ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
diff -Nuar a/data/images/gnome-logo-white.svg b/data/images/gnome-logo-white.svg
---- a/data/images/gnome-logo-white.svg 2019-09-21 19:01:26.000000000 +0300
+--- a/data/images/gnome-logo-white.svg 2020-02-10 15:35:28.000000000 +0300
+++ b/data/images/gnome-logo-white.svg 1970-01-01 02:00:00.000000000 +0200
@@ -1,14 +0,0 @@
-
@@ -64,20 +65,20 @@ diff -Nuar a/data/images/gnome-logo-white.svg b/data/images/gnome-logo-white.svg
-
-
diff -Nuar a/data/images/Makefile.am b/data/images/Makefile.am
---- a/data/images/Makefile.am 2019-09-21 19:01:26.000000000 +0300
-+++ b/data/images/Makefile.am 2020-03-18 13:45:45.464572486 +0300
+--- a/data/images/Makefile.am 2020-02-10 15:35:28.000000000 +0300
++++ b/data/images/Makefile.am 2020-03-23 14:44:31.638967370 +0300
@@ -7,7 +7,7 @@
imagedir = $(datadir)/pixmaps
image_DATA = \
mate-logo-white.svg \
- gnome-logo-white.svg \
-+ pisi-logo-white.svg \
++ pisi-logo-white.svg \
$(NULL)
EXTRA_DIST = \
diff -Nuar a/data/images/Makefile.in b/data/images/Makefile.in
---- a/data/images/Makefile.in 2019-09-21 19:04:31.000000000 +0300
-+++ b/data/images/Makefile.in 2020-03-18 14:13:51.833696442 +0300
+--- a/data/images/Makefile.in 2020-02-10 15:37:39.000000000 +0300
++++ b/data/images/Makefile.in 2020-03-23 14:44:11.623967425 +0300
@@ -251,7 +251,7 @@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
@@ -85,21 +86,21 @@ diff -Nuar a/data/images/Makefile.in b/data/images/Makefile.in
-FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@
+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@
FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@
+ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-@@ -425,7 +425,7 @@
+@@ -419,7 +419,7 @@
imagedir = $(datadir)/pixmaps
image_DATA = \
mate-logo-white.svg \
- gnome-logo-white.svg \
-+ pisi-logo-white.svg \
++ pisi-logo-white.svg \
$(NULL)
EXTRA_DIST = \
diff -Nuar a/data/images/pisi-logo-white.svg b/data/images/pisi-logo-white.svg
--- a/data/images/pisi-logo-white.svg 1970-01-01 02:00:00.000000000 +0200
-+++ b/data/images/pisi-logo-white.svg 2017-09-01 14:50:03.000000000 +0300
-@@ -0,0 +1,447 @@
++++ b/data/images/pisi-logo-white.svg 2020-03-19 22:26:14.959997000 +0300
+@@ -0,0 +1,317 @@
+
+
+
@@ -109,18 +110,36 @@ diff -Nuar a/data/images/pisi-logo-white.svg b/data/images/pisi-logo-white.svg
+ 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:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-+ id="svg3336"
++ width="200"
++ height="200"
++ id="svg3236"
+ version="1.1"
-+ inkscape:version="0.91 r13725"
-+ width="500"
-+ height="500"
-+ viewBox="0 0 500 500"
-+ sodipodi:docname="package-manager-icon-systemtr.svg">
++ inkscape:version="0.48.4 r9939"
++ sodipodi:docname="logotype-pisi-print.svg">
++
++
+
++ id="metadata3241">
+
+
@@ -131,425 +150,277 @@ diff -Nuar a/data/images/pisi-logo-white.svg b/data/images/pisi-logo-white.svg
+
+
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+
-+
-+
-+
-+
-+
++ inkscape:label="Layer 1"
++ inkscape:groupmode="layer"
++ id="layer1"
++ transform="translate(0,-852.36218)">
+
++ id="g3066"
++ transform="matrix(1.7625227,0,0,1.7859159,-20.192857,-694.21164)">
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++ transform="translate(-30.549898,-35.03055)"
++ id="g4198">
++
++
+
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++ inkscape:export-ydpi="598.79999"
++ inkscape:export-xdpi="598.79999"
++ style="fill:#000000"
++ id="g4295-7"
++ transform="matrix(-1,0,0,1,251.4705,872.94567)">
++
++
+
+
-+
-+
-+
-+
-+
-+
-+
-+
+
-+
-+
-+
-+
+
++
diff -Nuar a/data/Makefile.in b/data/Makefile.in
---- a/data/Makefile.in 2019-09-21 19:04:31.000000000 +0300
-+++ b/data/Makefile.in 2020-03-18 14:20:38.198726312 +0300
+--- a/data/Makefile.in 2020-02-10 15:37:39.000000000 +0300
++++ b/data/Makefile.in 2020-03-23 14:29:44.312969806 +0300
@@ -263,7 +263,7 @@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
@@ -557,11 +428,11 @@ diff -Nuar a/data/Makefile.in b/data/Makefile.in
-FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@
+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@
FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@
+ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
diff -Nuar a/doc/Makefile.in b/doc/Makefile.in
---- a/doc/Makefile.in 2019-09-21 19:04:31.000000000 +0300
-+++ b/doc/Makefile.in 2020-03-18 14:19:49.389722724 +0300
+--- a/doc/Makefile.in 2020-02-10 15:37:39.000000000 +0300
++++ b/doc/Makefile.in 2020-03-23 14:31:04.468969586 +0300
@@ -192,7 +192,7 @@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
@@ -569,67 +440,79 @@ diff -Nuar a/doc/Makefile.in b/doc/Makefile.in
-FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@
+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@
FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@
+ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
diff -Nuar a/Makefile.in b/Makefile.in
---- a/Makefile.in 2019-09-21 19:04:31.000000000 +0300
-+++ b/Makefile.in 2020-03-18 14:17:39.363713166 +0300
-@@ -246,7 +246,7 @@
+--- a/Makefile.in 2020-02-10 15:37:39.000000000 +0300
++++ b/Makefile.in 2020-03-23 14:36:30.305968692 +0300
+@@ -247,7 +247,7 @@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@
+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@
FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@
+ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
diff -Nuar a/po/tr.po b/po/tr.po
---- a/po/tr.po 2019-09-21 19:01:26.000000000 +0300
-+++ b/po/tr.po 2020-03-18 13:49:38.291589600 +0300
-@@ -318,9 +318,9 @@
- msgid "Bubbles the MATE logo around the screen"
- msgstr "Ekran üzerinde MATE logosu baloncukları oluşturur"
+--- a/po/tr.po 2020-02-10 15:38:02.000000000 +0300
++++ b/po/tr.po 2020-03-23 14:32:20.335969378 +0300
+@@ -338,13 +338,14 @@
+ msgid "MATE;screensaver;logo;bubbles;"
+ msgstr ""
--#: ../savers/gnomelogo-floaters.desktop.in.in.h:1
+-#: savers/gnomelogo-floaters.desktop.in.in:3
-msgid "Floating GNOME"
-msgstr "Yüzen GNOME"
-+#: ../savers/pisilogo-floaters.desktop.in.in.h:1
+
+-#: savers/gnomelogo-floaters.desktop.in.in:4
+-msgid "Bubbles the GNOME logo around the screen"
+-msgstr "Ekran üzerinde GNOME logosu baloncukları oluşturur"
++#: savers/pisilogo-floaters.desktop.in.in:3
+msgid "Floating PISI"
+msgstr "Yüzen PISI"
++
++#: savers/pisilogo-floaters.desktop.in.in:4
++msgid "Bubbles the PISI logo around the screen"
++msgstr "Ekran üzerinde PISI logosu baloncukları oluşturur"
- #: ../savers/gnomelogo-floaters.desktop.in.in.h:2
- msgid "Bubbles the GNOME logo around the screen"
+ #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+ #: savers/gnomelogo-floaters.desktop.in.in:12
diff -Nuar a/savers/gnomelogo-floaters.desktop.in b/savers/gnomelogo-floaters.desktop.in
---- a/savers/gnomelogo-floaters.desktop.in 2019-09-21 19:04:46.000000000 +0300
+--- a/savers/gnomelogo-floaters.desktop.in 2020-02-10 15:38:45.000000000 +0300
+++ b/savers/gnomelogo-floaters.desktop.in 1970-01-01 02:00:00.000000000 +0200
-@@ -1,10 +0,0 @@
+@@ -1,12 +0,0 @@
-[Desktop Entry]
--_Name=Floating GNOME
--_Comment=Bubbles the GNOME logo around the screen
--Exec=/usr/libexec/mate-screensaver/floaters /usr/share/pixmaps/gnome-logo-white.svg
--TryExec=/usr/libexec/mate-screensaver/floaters
+-Name=Floating GNOME
+-Comment=Bubbles the GNOME logo around the screen
+-Exec=/usr/local/libexec/mate-screensaver/floaters /usr/local/share/pixmaps/gnome-logo-white.svg
+-TryExec=/usr/local/libexec/mate-screensaver/floaters
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Screensaver;
+-# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+-Keywords=MATE;screensaver;GNOME;logo;bubbles;
-OnlyShowIn=MATE;
diff -Nuar a/savers/gnomelogo-floaters.desktop.in.in b/savers/gnomelogo-floaters.desktop.in.in
---- a/savers/gnomelogo-floaters.desktop.in.in 2019-09-21 19:01:26.000000000 +0300
+--- a/savers/gnomelogo-floaters.desktop.in.in 2020-02-10 15:35:28.000000000 +0300
+++ b/savers/gnomelogo-floaters.desktop.in.in 1970-01-01 02:00:00.000000000 +0200
-@@ -1,10 +0,0 @@
+@@ -1,12 +0,0 @@
-[Desktop Entry]
--_Name=Floating GNOME
--_Comment=Bubbles the GNOME logo around the screen
+-Name=Floating GNOME
+-Comment=Bubbles the GNOME logo around the screen
-Exec=@SAVERDIR@/floaters @FLOATERS_FOOT_GNOME_LOGO_IMAGE@
-TryExec=@SAVERDIR@/floaters
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Screensaver;
+-# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+-Keywords=MATE;screensaver;GNOME;logo;bubbles;
-OnlyShowIn=MATE;
diff -Nuar a/savers/Makefile.am b/savers/Makefile.am
---- a/savers/Makefile.am 2019-09-21 19:01:26.000000000 +0300
-+++ b/savers/Makefile.am 2020-03-18 13:53:46.083607814 +0300
+--- a/savers/Makefile.am 2020-02-10 15:35:28.000000000 +0300
++++ b/savers/Makefile.am 2020-03-23 14:34:38.422968999 +0300
@@ -17,7 +17,7 @@
DESKTOP_IN_IN_FILES = \
cosmos-slideshow.desktop.in.in \
@@ -640,15 +523,15 @@ diff -Nuar a/savers/Makefile.am b/savers/Makefile.am
popsquares.desktop.in.in \
$(NULL)
@@ -26,7 +26,7 @@
- $(edit) $< >$@
+ @$(edit) $< >$@
footlogo-floaters.desktop.in: footlogo-floaters.desktop.in.in Makefile
- $(edit) $< >$@
+ @$(edit) $< >$@
-gnomelogo-floaters.desktop.in: gnomelogo-floaters.desktop.in.in Makefile
-+gnomelogo-floaters.desktop.in: pisilogo-floaters.desktop.in.in Makefile
- $(edit) $< >$@
++pisilogo-floaters.desktop.in: pisilogo-floaters.desktop.in.in Makefile
+ @$(edit) $< >$@
personal-slideshow.desktop.in: personal-slideshow.desktop.in.in Makefile
- $(edit) $< >$@
-@@ -38,14 +38,14 @@
+ @$(edit) $< >$@
+@@ -36,7 +36,7 @@
edit = sed \
-e 's|@SLIDESHOW_COSMOS_DIR[@]|$(SLIDESHOW_COSMOS_DIR)|g' \
-e 's|@FLOATERS_FOOT_LOGO_IMAGE[@]|$(FLOATERS_FOOT_LOGO_IMAGE)|g' \
@@ -656,7 +539,8 @@ diff -Nuar a/savers/Makefile.am b/savers/Makefile.am
+ -e 's|@FLOATERS_FOOT_PISI_LOGO_IMAGE[@]|$(FLOATERS_FOOT_PISI_LOGO_IMAGE)|g' \
-e 's|@SAVERDIR[@]|$(privlibexecdir)|g'
- themesdir = $(datadir)/applications/screensavers
+ %.desktop: %.desktop.in
+@@ -46,7 +46,7 @@
themes_in_files = \
cosmos-slideshow.desktop.in \
footlogo-floaters.desktop.in \
@@ -665,7 +549,7 @@ diff -Nuar a/savers/Makefile.am b/savers/Makefile.am
personal-slideshow.desktop.in \
popsquares.desktop.in \
$(NULL)
-@@ -130,7 +130,7 @@
+@@ -131,7 +131,7 @@
$(BUILT_SOURCES) \
cosmos-slideshow.desktop.in \
footlogo-floaters.desktop.in \
@@ -674,7 +558,7 @@ diff -Nuar a/savers/Makefile.am b/savers/Makefile.am
popsquares.desktop.in \
personal-slideshow.desktop.in \
$(NULL)
-@@ -144,7 +144,7 @@
+@@ -145,7 +145,7 @@
Makefile.in \
cosmos-slideshow.desktop \
footlogo-floaters.desktop \
@@ -684,8 +568,8 @@ diff -Nuar a/savers/Makefile.am b/savers/Makefile.am
popsquares.desktop \
$(NULL)
diff -Nuar a/savers/Makefile.in b/savers/Makefile.in
---- a/savers/Makefile.in 2019-09-21 19:04:31.000000000 +0300
-+++ b/savers/Makefile.in 2020-03-18 13:55:27.300615254 +0300
+--- a/savers/Makefile.in 2020-02-10 15:37:39.000000000 +0300
++++ b/savers/Makefile.in 2020-03-23 14:33:43.240969150 +0300
@@ -283,7 +283,7 @@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
@@ -693,9 +577,9 @@ diff -Nuar a/savers/Makefile.in b/savers/Makefile.in
-FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@
+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@
FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@
+ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-@@ -465,7 +465,7 @@
+@@ -459,7 +459,7 @@
DESKTOP_IN_IN_FILES = \
cosmos-slideshow.desktop.in.in \
footlogo-floaters.desktop.in.in \
@@ -704,7 +588,7 @@ diff -Nuar a/savers/Makefile.in b/savers/Makefile.in
personal-slideshow.desktop.in.in \
popsquares.desktop.in.in \
$(NULL)
-@@ -473,13 +473,13 @@
+@@ -467,13 +467,13 @@
edit = sed \
-e 's|@SLIDESHOW_COSMOS_DIR[@]|$(SLIDESHOW_COSMOS_DIR)|g' \
-e 's|@FLOATERS_FOOT_LOGO_IMAGE[@]|$(FLOATERS_FOOT_LOGO_IMAGE)|g' \
@@ -720,7 +604,7 @@ diff -Nuar a/savers/Makefile.in b/savers/Makefile.in
personal-slideshow.desktop.in \
popsquares.desktop.in \
$(NULL)
-@@ -551,7 +551,7 @@
+@@ -545,7 +545,7 @@
$(BUILT_SOURCES) \
cosmos-slideshow.desktop.in \
footlogo-floaters.desktop.in \
@@ -729,7 +613,7 @@ diff -Nuar a/savers/Makefile.in b/savers/Makefile.in
popsquares.desktop.in \
personal-slideshow.desktop.in \
$(NULL)
-@@ -565,7 +565,7 @@
+@@ -559,7 +559,7 @@
Makefile.in \
cosmos-slideshow.desktop \
footlogo-floaters.desktop \
@@ -738,52 +622,56 @@ diff -Nuar a/savers/Makefile.in b/savers/Makefile.in
personal-slideshow.desktop \
popsquares.desktop \
$(NULL)
-@@ -1026,7 +1026,7 @@
- $(edit) $< >$@
+@@ -1020,7 +1020,7 @@
+ @$(edit) $< >$@
footlogo-floaters.desktop.in: footlogo-floaters.desktop.in.in Makefile
- $(edit) $< >$@
+ @$(edit) $< >$@
-gnomelogo-floaters.desktop.in: gnomelogo-floaters.desktop.in.in Makefile
+pisilogo-floaters.desktop.in: pisilogo-floaters.desktop.in.in Makefile
- $(edit) $< >$@
+ @$(edit) $< >$@
personal-slideshow.desktop.in: personal-slideshow.desktop.in.in Makefile
- $(edit) $< >$@
+ @$(edit) $< >$@
diff -Nuar a/savers/pisilogo-floaters.desktop.in b/savers/pisilogo-floaters.desktop.in
--- a/savers/pisilogo-floaters.desktop.in 1970-01-01 02:00:00.000000000 +0200
-+++ b/savers/pisilogo-floaters.desktop.in 2020-03-18 13:51:26.808597577 +0300
-@@ -0,0 +1,10 @@
++++ b/savers/pisilogo-floaters.desktop.in 2020-03-23 14:47:54.946966812 +0300
+@@ -0,0 +1,12 @@
+[Desktop Entry]
-+_Name=Floating PISI
-+_Comment=Bubbles the PISI logo around the screen
-+Exec=/usr/libexec/mate-screensaver/floaters /usr/share/pixmaps/pisi-logo-white.svg
-+TryExec=/usr/libexec/mate-screensaver/floaters
++Name=Floating PISI
++Comment=Bubbles the PISI logo around the screen
++Exec=/usr/local/libexec/mate-screensaver/floaters /usr/local/share/pixmaps/pisi-logo-white.svg
++TryExec=/usr/local/libexec/mate-screensaver/floaters
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Screensaver;
++# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
++Keywords=MATE;screensaver;GNOME;logo;bubbles;
+OnlyShowIn=MATE;
diff -Nuar a/savers/pisilogo-floaters.desktop.in.in b/savers/pisilogo-floaters.desktop.in.in
--- a/savers/pisilogo-floaters.desktop.in.in 1970-01-01 02:00:00.000000000 +0200
-+++ b/savers/pisilogo-floaters.desktop.in.in 2020-03-18 13:52:03.261600256 +0300
-@@ -0,0 +1,10 @@
++++ b/savers/pisilogo-floaters.desktop.in.in 2020-03-23 12:45:44.889986933 +0300
+@@ -0,0 +1,12 @@
+[Desktop Entry]
-+_Name=Floating PISI
-+_Comment=Bubbles the PISI logo around the screen
++Name=Floating PISI
++Comment=Bubbles the PISI logo around the screen
+Exec=@SAVERDIR@/floaters @FLOATERS_FOOT_PISI_LOGO_IMAGE@
+TryExec=@SAVERDIR@/floaters
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Screensaver;
++# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
++Keywords=MATE;screensaver;GNOME;logo;bubbles;
+OnlyShowIn=MATE;
diff -Nuar a/src/Makefile.in b/src/Makefile.in
---- a/src/Makefile.in 2019-09-21 19:04:31.000000000 +0300
-+++ b/src/Makefile.in 2020-03-18 14:18:48.964718282 +0300
-@@ -353,7 +353,7 @@
+--- a/src/Makefile.in 2020-02-10 15:37:39.000000000 +0300
++++ b/src/Makefile.in 2020-03-23 14:35:02.938968931 +0300
+@@ -359,7 +359,7 @@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-FLOATERS_FOOT_GNOME_LOGO_IMAGE = @FLOATERS_FOOT_GNOME_LOGO_IMAGE@
+FLOATERS_FOOT_PISI_LOGO_IMAGE = @FLOATERS_FOOT_PISI_LOGO_IMAGE@
FLOATERS_FOOT_LOGO_IMAGE = @FLOATERS_FOOT_LOGO_IMAGE@
+ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
diff --git a/desktop/mate/mate-screensaver/pspec.xml b/desktop/mate/mate-screensaver/pspec.xml
index 67da04db01..06e0b94ca7 100644
--- a/desktop/mate/mate-screensaver/pspec.xml
+++ b/desktop/mate/mate-screensaver/pspec.xml
@@ -23,11 +23,11 @@
libXmu-devel
libXtst-devel
libXxf86vm-devel
- libmatekbd-devel
+ libmatekbd-devel
libnotify-devel
- mate-common
- mate-desktop-devel
- mate-menus-devel
+ mate-common
+ mate-desktop-devel
+ mate-menus-devel
mesa-devel
pam-devel
xorg-proto
@@ -36,7 +36,7 @@
-
+ pisi_screen_saver.patch
@@ -84,7 +84,7 @@
- 2020-03-01
+ 2020-03-23
1.24.0
Version bump.
Mustafa Cinasal