[gnome-backgrounds] Fix name and install locations for cosmos

[William Jon McCann <mccann src gnome org>]

commit 53533c77064f9fe7340a7c9044de55316fbe053e
Author: William Jon McCann <jmccann redhat com>
Date:   Sun Mar 6 00:42:57 2011 -0500

    Fix name and install locations for cosmos

 cosmos/Makefile.am                                 |   17 +++++++++--------
 .../{cosmos.xml.in.in => gnome-cosmos.xml.in.in}   |    2 +-
 po/POTFILES.in                                     |    1 +
 po/POTFILES.skip                                   |    1 +
 4 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/cosmos/Makefile.am b/cosmos/Makefile.am
index 210d185..a82aa92 100644
--- a/cosmos/Makefile.am
+++ b/cosmos/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+backgrounddir = $(datadir)/pixmaps/backgrounds/gnome/cosmos
+
 BACKGROUNDS = \
 	blue-marble-west.jpg	\
 	cloud.jpg 		\
@@ -12,39 +14,38 @@ BACKGROUNDS = \
 	whirlpool.jpg		\
 	$(NULL)
 
-imagesdir   = $(SLIDESHOW_COSMOS_DIR)
-images_DATA =			\
+background_DATA =		\
 	$(BACKGROUNDS)		\
 	background-1.xml	\
 	$(NULL)
 
-cosmos.xml.in: cosmos.xml.in.in Makefile
+gnome-cosmos.xml.in: gnome-cosmos.xml.in.in Makefile
 	$(edit) $< >$@
 
 background-1.xml: background-1.xml.in Makefile
 	$(edit) $< >$@
 
-metadata_in_files = cosmos.xml.in
+metadata_in_files = gnome-cosmos.xml.in
 metadatadir = $(datadir)/gnome-background-properties
 metadata_DATA = $(metadata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 edit = sed \
-	-e 's|@IMAGESDIR[ ]|$(imagesdir)|g'
+	-e 's|@BACKGROUNDDIR[ ]|$(backgrounddir)|g'
 
 EXTRA_DIST =			\
 	CREDITS 		\
 	$(BACKGROUNDS)		\
 	background-1.xml.in	\
-	cosmos.xml.in.in	\
+	gnome-cosmos.xml.in.in	\
 	$(NULL)
 
 CLEANFILES = \
-	cosmos.xml.in			\
+	gnome-cosmos.xml.in		\
 	$(NULL)
 
 DISTCLEANFILES = \
-	cosmos.xml			\
+	gnome-cosmos.xml		\
 	background-1.xml		\
 	$(NULL)
 
diff --git a/cosmos/cosmos.xml.in.in b/cosmos/gnome-cosmos.xml.in.in
similarity index 87%
rename from cosmos/cosmos.xml.in.in
rename to cosmos/gnome-cosmos.xml.in.in
index 952f8b9..c632d05 100644
--- a/cosmos/cosmos.xml.in.in
+++ b/cosmos/gnome-cosmos.xml.in.in
@@ -5,7 +5,7 @@
     <!-- 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>
+    <filename>@BACKGROUNDDIR@/background-1.xml</filename>
     <options>zoom</options>
   </wallpaper>
 </wallpapers>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5cdbee0..f48ad14 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1,3 @@
 abstract/gnome-abstract.xml.in.in
+cosmos/gnome-cosmos.xml.in.in
 nature/gnome-nature.xml.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index c37d5af..e4464ed 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,4 @@
 abstract/gnome-abstract.xml.in
+cosmos/gnome-cosmos.xml.in
 nature/gnome-nature.xml.in