[gnome-backgrounds] Remove cosmos except for blue marble

[William Jon McCann <mccann src gnome org>]

commit 41c743054269a4aa20aab2862258f4bc9e41b698
Author: William Jon McCann <jmccann redhat com>
Date:   Mon Mar 21 23:22:28 2011 -0400

    Remove cosmos except for blue marble
    
    Move blue marble into nature.

 Makefile.am                                        |    2 +-
 configure.ac                                       |    1 -
 cosmos/.gitignore                                  |    4 -
 cosmos/CREDITS                                     |   29 -------
 cosmos/Makefile.am                                 |   54 -------------
 cosmos/background-1.xml.in                         |   83 --------------------
 cosmos/cloud.jpg                                   |  Bin 1379759 -> 0 bytes
 cosmos/earth-horizon.jpg                           |  Bin 210180 -> 0 bytes
 cosmos/galaxy-ngc3370.jpg                          |  Bin 460107 -> 0 bytes
 cosmos/gnome-cosmos.xml.in.in                      |   11 ---
 cosmos/helix-nebula.jpg                            |  Bin 138039 -> 0 bytes
 cosmos/jupiter.jpg                                 |  Bin 44528 -> 0 bytes
 cosmos/sombrero.jpg                                |  Bin 552723 -> 0 bytes
 cosmos/whirlpool.jpg                               |  Bin 659143 -> 0 bytes
 .../BlueMarbleWest.jpg                             |  Bin 456110 -> 456110 bytes
 nature/Makefile.am                                 |    1 +
 nature/gnome-nature.xml.in.in                      |    5 +
 po/POTFILES.in                                     |    1 -
 po/POTFILES.skip                                   |    1 -
 19 files changed, 7 insertions(+), 185 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4dce68b..14b11cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = cosmos nature po
+SUBDIRS = nature po
 
 dist-hook:
 	@if test -d "$(srcdir)/.git"; \
diff --git a/configure.ac b/configure.ac
index 93b2432..ef5d89d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,6 @@ AM_GLIB_GNU_GETTEXT()
 
 AC_CONFIG_FILES([
 Makefile
-cosmos/Makefile
 nature/Makefile
 po/Makefile.in
 ])
diff --git a/cosmos/blue-marble-west.jpg b/nature/BlueMarbleWest.jpg
similarity index 100%
rename from cosmos/blue-marble-west.jpg
rename to nature/BlueMarbleWest.jpg
diff --git a/nature/Makefile.am b/nature/Makefile.am
index 983483c..f1a7950 100644
--- a/nature/Makefile.am
+++ b/nature/Makefile.am
@@ -2,6 +2,7 @@ backgrounddir = $(datadir)/backgrounds/gnome/nature
 
 background_DATA =\
 	FootFall.png \
+	BlueMarbleWest.jpg \
 	Terraform-blue.jpg \
 	Terraform-green.jpg \
 	Terraform-orange.jpg \
diff --git a/nature/gnome-nature.xml.in.in b/nature/gnome-nature.xml.in.in
index b67a910..89d38fa 100644
--- a/nature/gnome-nature.xml.in.in
+++ b/nature/gnome-nature.xml.in.in
@@ -2,6 +2,11 @@
 <!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
 <wallpapers>
 	<wallpaper deleted="false">
+		<_name>Blue Marble</_name>
+		<filename>@BACKGROUNDDIR@/BlueMarbleWest.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
 		<_name>Foot Fall</_name>
 		<filename>@BACKGROUNDDIR@/FootFall.png</filename>
 		<options>zoom</options>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 025bdbe..f4fd87d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1 @@
-cosmos/gnome-cosmos.xml.in.in
 nature/gnome-nature.xml.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 6648197..c7bcc83 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,2 @@
-cosmos/gnome-cosmos.xml.in
 nature/gnome-nature.xml.in