[Xfce4-commits] [apps/xfce4-screensaver] 406/425: Drop Comsos theme

noreply at xfce.org noreply at xfce.org
Mon Oct 15 01:54:13 CEST 2018 

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 729c34e6694c99ba595a9e045348bb59235e3839
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Fri Oct 12 19:58:46 2018 -0400

    Drop Comsos theme
---
 .gitignore                              |   2 -
 configure.ac                            |   5 --
 data/images/Makefile.am                 |   1 -
 data/images/cosmos/CREDITS              |  29 ----------
 data/images/cosmos/Makefile.am          |  54 -------------------
 data/images/cosmos/background-1.xml.in  |  92 --------------------------------
 data/images/cosmos/blue-marble-west.jpg | Bin 456110 -> 0 bytes
 data/images/cosmos/cloud.jpg            | Bin 1314514 -> 0 bytes
 data/images/cosmos/comet.jpg            | Bin 141297 -> 0 bytes
 data/images/cosmos/cosmos.xml.in.in     |  11 ----
 data/images/cosmos/earth-horizon.jpg    | Bin 210180 -> 0 bytes
 data/images/cosmos/galaxy-ngc3370.jpg   | Bin 460107 -> 0 bytes
 data/images/cosmos/helix-nebula.jpg     | Bin 138039 -> 0 bytes
 data/images/cosmos/jupiter.jpg          | Bin 44528 -> 0 bytes
 data/images/cosmos/sombrero.jpg         | Bin 552723 -> 0 bytes
 data/images/cosmos/whirlpool.jpg        | Bin 1059826 -> 0 bytes
 po/POTFILES.in                          |   2 -
 po/POTFILES.skip                        |   2 -
 savers/Makefile.am                      |   7 ---
 savers/cosmos-slideshow.desktop.in.in   |  10 ----
 20 files changed, 215 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4da35a9..bffc2e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,8 +35,6 @@ missing
 POTFILES
 
 # Paths
-data/images/cosmos/*.xml
-data/images/cosmos/cosmos.xml.in
 data/org.xfce.ScreenSaver.service
 data/xfce4-screensaver.directory
 data/xfce4-screensaver.pc
diff --git a/configure.ac b/configure.ac
index 48dc6d0..074cbda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1094,10 +1094,6 @@ AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
 # Saver engine stuff
-SLIDESHOW_COSMOS_DIR="${EXPANDED_DATADIR}/backgrounds/cosmos"
-
-AC_SUBST(SLIDESHOW_COSMOS_DIR)
-
 FLOATERS_XFCE_IMAGE="${EXPANDED_DATADIR}/pixmaps/xfce-logo-white.svg"
 AC_SUBST(FLOATERS_XFCE_IMAGE)
 
@@ -1131,7 +1127,6 @@ data/xfce4-screensavers.menu
 data/xfce4-screensaver.pc
 data/org.xfce.ScreenSaver.service
 data/images/Makefile
-data/images/cosmos/Makefile
 savers/Makefile
 doc/Makefile
 doc/xfce4-screensaver.xml
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index 06da7a4..ddb1fd9 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -1,7 +1,6 @@
 NULL =
 
 SUBDIRS =			\
-	cosmos			\
 	$(NULL)
 
 imagedir   = $(datadir)/pixmaps
diff --git a/data/images/cosmos/CREDITS b/data/images/cosmos/CREDITS
deleted file mode 100644
index 6ecc9ab..0000000
--- a/data/images/cosmos/CREDITS
+++ /dev/null
@@ -1,29 +0,0 @@
-All of these images are in the public domain courtesy of NASA.
-
-blue-marble-west.jpg:
-http://visibleearth.nasa.gov/view_rec.php?id=2429
-
-cloud.jpg:
-www.spacetelescope.org/images/html/heic0601a.html
-
-comet.jpg:
-http://hubblesite.org/newscenter/newsdesk/archive/releases/2004/52/
-
-earth-horizon.jpg:
-http://spaceflight.nasa.gov/gallery/images/station/crew-7/html/iss007e16249.html
-
-galaxy-ngc3370.jpg:
-http://hubblesite.org/newscenter/newsdesk/archive/releases/2003/24/
-
-helix-nebula.jpg:
-http://hubblesite.org/newscenter/newsdesk/archive/releases/2003/11/
-
-jupiter.jpg:
-http://hubblesite.org/newscenter/newsdesk/archive/releases/1999/29/
-
-sombrereo.jpg:
-http://hubblesite.org/newscenter/newsdesk/archive/releases/2003/28/
-
-whirlpool.jpg:
-http://hubblesite.org/newscenter/newsdesk/archive/releases/2005/12/image/a
-
diff --git a/data/images/cosmos/Makefile.am b/data/images/cosmos/Makefile.am
deleted file mode 100644
index 6f1167b..0000000
--- a/data/images/cosmos/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-NULL =
-
-BACKGROUNDS = \
-	blue-marble-west.jpg	\
-	cloud.jpg 		\
-	comet.jpg 		\
-	earth-horizon.jpg	\
-	galaxy-ngc3370.jpg	\
-	helix-nebula.jpg	\
-	jupiter.jpg		\
-	sombrero.jpg		\
-	whirlpool.jpg		\
-	$(NULL)
-
-imagesdir   = $(SLIDESHOW_COSMOS_DIR)
-images_DATA =			\
-	$(BACKGROUNDS)		\
-	background-1.xml	\
-	$(NULL)
-
-cosmos.xml.in: cosmos.xml.in.in Makefile
-	$(edit) $< >$@
-
-background-1.xml: background-1.xml.in Makefile
-	$(edit) $< >$@
-
-metadata_in_files = cosmos.xml.in
-metadatadir = $(datadir)/xfce-background-properties
-metadata_DATA = $(metadata_in_files:.xml.in=.xml)
- at INTLTOOL_XML_RULE@
-
-edit = sed \
-	-e 's|@IMAGESDIR[@]|$(imagesdir)|g'
-
-EXTRA_DIST =			\
-	CREDITS 		\
-	$(BACKGROUNDS)		\
-	background-1.xml.in	\
-	cosmos.xml.in.in	\
-	$(NULL)
-
-CLEANFILES = \
-	cosmos.xml.in			\
-	$(NULL)
-
-DISTCLEANFILES = \
-	cosmos.xml			\
-	background-1.xml		\
-	$(NULL)
-
-MAINTAINERCLEANFILES =                  \
-	*~				\
-	Makefile.in			\
-	$(NULL)
diff --git a/data/images/cosmos/background-1.xml.in b/data/images/cosmos/background-1.xml.in
deleted file mode 100644
index 698b4b5..0000000
--- a/data/images/cosmos/background-1.xml.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<background>
-  <starttime>
-    <year>2009</year>
-    <month>08</month>
-    <day>04</day>
-    <hour>00</hour>
-    <minute>00</minute>
-    <second>00</second>
-  </starttime>
-<!-- This animation will start at midnight. -->
-  <static>
-    <duration>1795.0</duration>
-    <file>@IMAGESDIR@/cloud.jpg</file>
-  </static>
-  <transition>
-    <duration>5.0</duration>
-    <from>@IMAGESDIR@/cloud.jpg</from>
-    <to>@IMAGESDIR@/comet.jpg</to>
-  </transition>
-  <static>
-    <duration>1795.0</duration>
-    <file>@IMAGESDIR@/comet.jpg</file>
-  </static>
-  <transition>
-    <duration>5.0</duration>
-    <from>@IMAGESDIR@/comet.jpg</from>
-    <to>@IMAGESDIR@/earth-horizon.jpg</to>
-  </transition>
-  <static>
-    <duration>1795.0</duration>
-    <file>@IMAGESDIR@/earth-horizon.jpg</file>
-  </static>
-  <transition>
-    <duration>5.0</duration>
-    <from>@IMAGESDIR@/earth-horizon.jpg</from>
-    <to>@IMAGESDIR@/blue-marble-west.jpg</to>
-  </transition>
-  <static>
-    <duration>1795.0</duration>
-    <file>@IMAGESDIR@/blue-marble-west.jpg</file>
-  </static>
-  <transition>
-    <duration>5.0</duration>
-    <from>@IMAGESDIR@/blue-marble-west.jpg</from>
-    <to>@IMAGESDIR@/galaxy-ngc3370.jpg</to>
-  </transition>
-  <static>
-    <duration>1795.0</duration>
-    <file>@IMAGESDIR@/galaxy-ngc3370.jpg</file>
-  </static>
-  <transition>
-    <duration>5.0</duration>
-    <from>@IMAGESDIR@/galaxy-ngc3370.jpg</from>
-    <to>@IMAGESDIR@/helix-nebula.jpg</to>
-  </transition>
-  <static>
-    <duration>1795.0</duration>
-    <file>@IMAGESDIR@/helix-nebula.jpg</file>
-  </static>
-  <transition>
-    <duration>5.0</duration>
-    <from>@IMAGESDIR@/helix-nebula.jpg</from>
-    <to>@IMAGESDIR@/jupiter.jpg</to>
-  </transition>
-  <static>
-    <duration>1795.0</duration>
-    <file>@IMAGESDIR@/jupiter.jpg</file>
-  </static>
-  <transition>
-    <duration>5.0</duration>
-    <from>@IMAGESDIR@/jupiter.jpg</from>
-    <to>@IMAGESDIR@/sombrero.jpg</to>
-  </transition>
-  <static>
-    <duration>1795.0</duration>
-    <file>@IMAGESDIR@/sombrero.jpg</file>
-  </static>
-  <transition>
-    <duration>5.0</duration>
-    <from>@IMAGESDIR@/sombrero.jpg</from>
-    <to>@IMAGESDIR@/whirlpool.jpg</to>
-  </transition>
-  <static>
-    <duration>1795.0</duration>
-    <file>@IMAGESDIR@/whirlpool.jpg</file>
-  </static>
-  <transition>
-    <duration>5.0</duration>
-    <from>@IMAGESDIR@/whirlpool.jpg</from>
-    <to>@IMAGESDIR@/cloud.jpg</to>
-  </transition>
-</background>
diff --git a/data/images/cosmos/blue-marble-west.jpg b/data/images/cosmos/blue-marble-west.jpg
deleted file mode 100644
index 7cd8be1..0000000
Binary files a/data/images/cosmos/blue-marble-west.jpg and /dev/null differ
diff --git a/data/images/cosmos/cloud.jpg b/data/images/cosmos/cloud.jpg
deleted file mode 100644
index 1cb328c..0000000
Binary files a/data/images/cosmos/cloud.jpg and /dev/null differ
diff --git a/data/images/cosmos/comet.jpg b/data/images/cosmos/comet.jpg
deleted file mode 100644
index 5de37cf..0000000
Binary files a/data/images/cosmos/comet.jpg and /dev/null differ
diff --git a/data/images/cosmos/cosmos.xml.in.in b/data/images/cosmos/cosmos.xml.in.in
deleted file mode 100644
index 5deffe4..0000000
--- a/data/images/cosmos/cosmos.xml.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wallpapers SYSTEM "xfce-wp-list.dtd">
-<wallpapers>
-  <wallpaper deleted="false">
-    <!-- Translators: This is the name of a desktop background image that shows outer space images.
-         You might want to translate it into the equivalent words of your language  -->
-    <_name>Cosmos</_name>
-    <filename>@IMAGESDIR@/background-1.xml</filename>
-    <options>zoom</options>
-  </wallpaper>
-</wallpapers>
diff --git a/data/images/cosmos/earth-horizon.jpg b/data/images/cosmos/earth-horizon.jpg
deleted file mode 100644
index 1abefd2..0000000
Binary files a/data/images/cosmos/earth-horizon.jpg and /dev/null differ
diff --git a/data/images/cosmos/galaxy-ngc3370.jpg b/data/images/cosmos/galaxy-ngc3370.jpg
deleted file mode 100644
index 46113b2..0000000
Binary files a/data/images/cosmos/galaxy-ngc3370.jpg and /dev/null differ
diff --git a/data/images/cosmos/helix-nebula.jpg b/data/images/cosmos/helix-nebula.jpg
deleted file mode 100644
index 19f02b2..0000000
Binary files a/data/images/cosmos/helix-nebula.jpg and /dev/null differ
diff --git a/data/images/cosmos/jupiter.jpg b/data/images/cosmos/jupiter.jpg
deleted file mode 100644
index 396af35..0000000
Binary files a/data/images/cosmos/jupiter.jpg and /dev/null differ
diff --git a/data/images/cosmos/sombrero.jpg b/data/images/cosmos/sombrero.jpg
deleted file mode 100644
index 6d7d2ff..0000000
Binary files a/data/images/cosmos/sombrero.jpg and /dev/null differ
diff --git a/data/images/cosmos/whirlpool.jpg b/data/images/cosmos/whirlpool.jpg
deleted file mode 100644
index e4e7588..0000000
Binary files a/data/images/cosmos/whirlpool.jpg and /dev/null differ
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5724272..352b90c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,9 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/images/cosmos/cosmos.xml.in.in
 [type: gettext/glade]data/lock-dialog-default.ui
 data/xfce4-screensaver-preferences.desktop.in
 [type: gettext/glade]data/xfce4-screensaver-preferences.ui
 data/xfce4-screensaver.directory.in
-savers/cosmos-slideshow.desktop.in.in
 savers/floaters.c
 savers/xfce-floaters.desktop.in.in
 savers/personal-slideshow.desktop.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index b59e400..19bc6a6 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,3 @@
-data/images/cosmos/cosmos.xml.in
-savers/cosmos-slideshow.desktop.in
 savers/xfce-floaters.desktop.in
 savers/personal-slideshow.desktop.in
 savers/popsquares.desktop.in
diff --git a/savers/Makefile.am b/savers/Makefile.am
index 272292b..d8b31b6 100644
--- a/savers/Makefile.am
+++ b/savers/Makefile.am
@@ -15,14 +15,11 @@ AM_CPPFLAGS =							\
 	$(NULL)
 
 DESKTOP_IN_IN_FILES = 			 \
-	cosmos-slideshow.desktop.in.in 	 \
 	xfce-floaters.desktop.in.in	 \
 	personal-slideshow.desktop.in.in \
 	popsquares.desktop.in.in	 \
 	$(NULL)
 
-cosmos-slideshow.desktop.in: cosmos-slideshow.desktop.in.in Makefile
-	$(edit) $< >$@
 xfce-floaters.desktop.in: xfce-floaters.desktop.in.in Makefile
 	$(edit) $< >$@
 personal-slideshow.desktop.in: personal-slideshow.desktop.in.in Makefile
@@ -33,13 +30,11 @@ popsquares.desktop.in: popsquares.desktop.in.in Makefile
 @INTLTOOL_DESKTOP_RULE@
 
 edit = sed \
-	-e 's|@SLIDESHOW_COSMOS_DIR[@]|$(SLIDESHOW_COSMOS_DIR)|g' \
 	-e 's|@FLOATERS_XFCE_IMAGE[@]|$(FLOATERS_XFCE_IMAGE)|g' \
 	-e 's|@SAVERDIR[@]|$(privlibexecdir)|g'
 
 themesdir = $(datadir)/applications/screensavers
 themes_in_files = 			\
-	cosmos-slideshow.desktop.in	\
 	xfce-floaters.desktop.in    \
 	personal-slideshow.desktop.in	\
 	popsquares.desktop.in		\
@@ -123,7 +118,6 @@ EXTRA_DIST =				\
 
 CLEANFILES = 				\
 	$(BUILT_SOURCES)		\
-	cosmos-slideshow.desktop.in	\
 	xfce-floaters.desktop.in	\
 	popsquares.desktop.in		\
 	personal-slideshow.desktop.in	\
@@ -136,7 +130,6 @@ DISTCLEANFILES = 			\
 MAINTAINERCLEANFILES =			\
 	*~				\
 	Makefile.in			\
-	cosmos-slideshow.desktop	\
 	xfce-floaters.desktop	\
 	personal-slideshow.desktop	\
 	popsquares.desktop		\
diff --git a/savers/cosmos-slideshow.desktop.in.in b/savers/cosmos-slideshow.desktop.in.in
deleted file mode 100644
index 2ac4aaf..0000000
--- a/savers/cosmos-slideshow.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=Cosmos
-_Comment=Display a slideshow of pictures of the cosmos
-Exec=@SAVERDIR@/slideshow --location=@SLIDESHOW_COSMOS_DIR@
-TryExec=@SAVERDIR@/slideshow
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Screensaver;
-OnlyShowIn=XFCE;

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

More information about the Xfce4-commits mailing list