[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Rename screensavers to fix conflicts with mate-screensaver

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 06b76e06949d257be5ab006d667057beec6c2294
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sat Nov 17 06:41:17 2018 -0500

    Rename screensavers to fix conflicts with mate-screensaver
---
 savers/Makefile.am                                   | 20 ++++++++++----------
 ...p.in.in => xfce-personal-slideshow.desktop.in.in} |  0
 ...s.desktop.in.in => xfce-popsquares.desktop.in.in} |  0
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/savers/Makefile.am b/savers/Makefile.am
index d8b31b6..294bb17 100644
--- a/savers/Makefile.am
+++ b/savers/Makefile.am
@@ -16,15 +16,15 @@ AM_CPPFLAGS =							\
 
 DESKTOP_IN_IN_FILES = 			 \
 	xfce-floaters.desktop.in.in	 \
-	personal-slideshow.desktop.in.in \
-	popsquares.desktop.in.in	 \
+	xfce-personal-slideshow.desktop.in.in \
+	xfce-popsquares.desktop.in.in	 \
 	$(NULL)
 
 xfce-floaters.desktop.in: xfce-floaters.desktop.in.in Makefile
 	$(edit) $< >$@
-personal-slideshow.desktop.in: personal-slideshow.desktop.in.in Makefile
+xfce-personal-slideshow.desktop.in: xfce-personal-slideshow.desktop.in.in Makefile
 	$(edit) $< >$@
-popsquares.desktop.in: popsquares.desktop.in.in Makefile
+xfce-popsquares.desktop.in: xfce-popsquares.desktop.in.in Makefile
 	$(edit) $< >$@
 
 @INTLTOOL_DESKTOP_RULE@
@@ -36,8 +36,8 @@ edit = sed \
 themesdir = $(datadir)/applications/screensavers
 themes_in_files = 			\
 	xfce-floaters.desktop.in    \
-	personal-slideshow.desktop.in	\
-	popsquares.desktop.in		\
+	xfce-personal-slideshow.desktop.in	\
+	xfce-popsquares.desktop.in		\
 	$(NULL)
 themes_DATA = $(themes_in_files:.desktop.in=.desktop)
 
@@ -119,8 +119,8 @@ EXTRA_DIST =				\
 CLEANFILES = 				\
 	$(BUILT_SOURCES)		\
 	xfce-floaters.desktop.in	\
-	popsquares.desktop.in		\
-	personal-slideshow.desktop.in	\
+	xfce-popsquares.desktop.in		\
+	xfce-personal-slideshow.desktop.in	\
 	$(NULL)
 
 DISTCLEANFILES = 			\
@@ -131,6 +131,6 @@ MAINTAINERCLEANFILES =			\
 	*~				\
 	Makefile.in			\
 	xfce-floaters.desktop	\
-	personal-slideshow.desktop	\
-	popsquares.desktop		\
+	xfce-personal-slideshow.desktop	\
+	xfce-popsquares.desktop		\
 	$(NULL)
diff --git a/savers/personal-slideshow.desktop.in.in b/savers/xfce-personal-slideshow.desktop.in.in
similarity index 100%
rename from savers/personal-slideshow.desktop.in.in
rename to savers/xfce-personal-slideshow.desktop.in.in
diff --git a/savers/popsquares.desktop.in.in b/savers/xfce-popsquares.desktop.in.in
similarity index 100%
rename from savers/popsquares.desktop.in.in
rename to savers/xfce-popsquares.desktop.in.in

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.