[gnome-backgrounds] Rename "nature" directory to "backgrounds"



commit 3a2edf931df6ba48dea0608ac454a494f4a9031a
Author: Thomas Wood <thos gnome org>
Date:   Mon Apr 4 17:29:03 2011 +0100

    Rename "nature" directory to "backgrounds"

 Makefile.am                                        |    2 +-
 autogen.sh                                         |    2 +-
 {nature => backgrounds}/Aqua.jpg                   |  Bin 200353 -> 200353 bytes
 {nature => backgrounds}/Blinds.jpg                 |  Bin 1157513 -> 1157513 bytes
 {nature => backgrounds}/BlueMarbleWest.jpg         |  Bin 456110 -> 456110 bytes
 {nature => backgrounds}/FootFall.png               |  Bin 762649 -> 762649 bytes
 {nature => backgrounds}/FreshFlower.jpg            |  Bin 80905 -> 80905 bytes
 {nature => backgrounds}/Garden.jpg                 |  Bin 264831 -> 264831 bytes
 {nature => backgrounds}/GreenMeadow.jpg            |  Bin 183377 -> 183377 bytes
 {nature => backgrounds}/Makefile.am                |   12 ++++++------
 {nature => backgrounds}/Spaceflare-nova.jpg        |  Bin 297020 -> 297020 bytes
 {nature => backgrounds}/Spaceflare-supernova.jpg   |  Bin 277861 -> 277861 bytes
 {nature => backgrounds}/Spaceflare.jpg             |  Bin 278252 -> 278252 bytes
 {nature => backgrounds}/SundownDunes.jpg           |  Bin 2000833 -> 2000833 bytes
 {nature => backgrounds}/Terraform-blue.jpg         |  Bin 424750 -> 424750 bytes
 {nature => backgrounds}/Terraform-green.jpg        |  Bin 466292 -> 466292 bytes
 {nature => backgrounds}/Terraform-orange.jpg       |  Bin 493641 -> 493641 bytes
 {nature => backgrounds}/TwoWings.jpg               |  Bin 881400 -> 881400 bytes
 {nature => backgrounds}/Wood.jpg                   |  Bin 525520 -> 525520 bytes
 {nature => backgrounds}/YellowFlower.jpg           |  Bin 267440 -> 267440 bytes
 .../gnome-backgrounds.xml.in.in                    |    0
 configure.ac                                       |    2 +-
 po/POTFILES.in                                     |    2 +-
 po/POTFILES.skip                                   |    2 +-
 24 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 14b11cb..e4c6151 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = nature po
+SUBDIRS = backgrounds po
 
 dist-hook:
 	@if test -d "$(srcdir)/.git"; \
diff --git a/autogen.sh b/autogen.sh
index 8b17e1b..cade580 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="gnome-backgrounds"
 
 (test -f $srcdir/configure.ac \
-  && test -d $srcdir/nature ) || {
+  && test -d $srcdir/backgrounds ) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
diff --git a/nature/Aqua.jpg b/backgrounds/Aqua.jpg
similarity index 100%
rename from nature/Aqua.jpg
rename to backgrounds/Aqua.jpg
diff --git a/nature/Blinds.jpg b/backgrounds/Blinds.jpg
similarity index 100%
rename from nature/Blinds.jpg
rename to backgrounds/Blinds.jpg
diff --git a/nature/BlueMarbleWest.jpg b/backgrounds/BlueMarbleWest.jpg
similarity index 100%
rename from nature/BlueMarbleWest.jpg
rename to backgrounds/BlueMarbleWest.jpg
diff --git a/nature/FootFall.png b/backgrounds/FootFall.png
similarity index 100%
rename from nature/FootFall.png
rename to backgrounds/FootFall.png
diff --git a/nature/FreshFlower.jpg b/backgrounds/FreshFlower.jpg
similarity index 100%
rename from nature/FreshFlower.jpg
rename to backgrounds/FreshFlower.jpg
diff --git a/nature/Garden.jpg b/backgrounds/Garden.jpg
similarity index 100%
rename from nature/Garden.jpg
rename to backgrounds/Garden.jpg
diff --git a/nature/GreenMeadow.jpg b/backgrounds/GreenMeadow.jpg
similarity index 100%
rename from nature/GreenMeadow.jpg
rename to backgrounds/GreenMeadow.jpg
diff --git a/nature/Makefile.am b/backgrounds/Makefile.am
similarity index 66%
rename from nature/Makefile.am
rename to backgrounds/Makefile.am
index f1a7950..38baf60 100644
--- a/nature/Makefile.am
+++ b/backgrounds/Makefile.am
@@ -1,4 +1,4 @@
-backgrounddir = $(datadir)/backgrounds/gnome/nature
+backgrounddir = $(datadir)/backgrounds/gnome
 
 background_DATA =\
 	FootFall.png \
@@ -19,20 +19,20 @@ background_DATA =\
 	Wood.jpg \
 	YellowFlower.jpg
 
-metadata_in_files = gnome-nature.xml.in
+metadata_in_files = gnome-backgrounds.xml.in
 metadatadir = $(datadir)/gnome-background-properties
 metadata_DATA = $(metadata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
-noinst_DATA = gnome-nature.xml.in
-CLEANFILES = gnome-nature.xml gnome-nature.xml.in
+noinst_DATA = gnome-backgrounds.xml.in
+CLEANFILES = gnome-backgrounds.xml gnome-backgrounds.xml.in
 
-EXTRA_DIST = $(background_DATA) gnome-nature.xml.in.in
+EXTRA_DIST = $(background_DATA) gnome-backgrounds.xml.in.in
 
 edit = sed \
 	-e 's|@BACKGROUNDDIR[ ]|$(backgrounddir)|g'
 
-gnome-nature.xml.in: gnome-nature.xml.in.in Makefile
+gnome-backgrounds.xml.in: gnome-backgrounds.xml.in.in Makefile
 	$(edit) $< >$@
 
 MAINTAINERCLEANFILES = \
diff --git a/nature/Spaceflare-nova.jpg b/backgrounds/Spaceflare-nova.jpg
similarity index 100%
rename from nature/Spaceflare-nova.jpg
rename to backgrounds/Spaceflare-nova.jpg
diff --git a/nature/Spaceflare-supernova.jpg b/backgrounds/Spaceflare-supernova.jpg
similarity index 100%
rename from nature/Spaceflare-supernova.jpg
rename to backgrounds/Spaceflare-supernova.jpg
diff --git a/nature/Spaceflare.jpg b/backgrounds/Spaceflare.jpg
similarity index 100%
rename from nature/Spaceflare.jpg
rename to backgrounds/Spaceflare.jpg
diff --git a/nature/SundownDunes.jpg b/backgrounds/SundownDunes.jpg
similarity index 100%
rename from nature/SundownDunes.jpg
rename to backgrounds/SundownDunes.jpg
diff --git a/nature/Terraform-blue.jpg b/backgrounds/Terraform-blue.jpg
similarity index 100%
rename from nature/Terraform-blue.jpg
rename to backgrounds/Terraform-blue.jpg
diff --git a/nature/Terraform-green.jpg b/backgrounds/Terraform-green.jpg
similarity index 100%
rename from nature/Terraform-green.jpg
rename to backgrounds/Terraform-green.jpg
diff --git a/nature/Terraform-orange.jpg b/backgrounds/Terraform-orange.jpg
similarity index 100%
rename from nature/Terraform-orange.jpg
rename to backgrounds/Terraform-orange.jpg
diff --git a/nature/TwoWings.jpg b/backgrounds/TwoWings.jpg
similarity index 100%
rename from nature/TwoWings.jpg
rename to backgrounds/TwoWings.jpg
diff --git a/nature/Wood.jpg b/backgrounds/Wood.jpg
similarity index 100%
rename from nature/Wood.jpg
rename to backgrounds/Wood.jpg
diff --git a/nature/YellowFlower.jpg b/backgrounds/YellowFlower.jpg
similarity index 100%
rename from nature/YellowFlower.jpg
rename to backgrounds/YellowFlower.jpg
diff --git a/nature/gnome-nature.xml.in.in b/backgrounds/gnome-backgrounds.xml.in.in
similarity index 100%
rename from nature/gnome-nature.xml.in.in
rename to backgrounds/gnome-backgrounds.xml.in.in
diff --git a/configure.ac b/configure.ac
index 04b227e..568ef96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AM_GLIB_GNU_GETTEXT()
 
 AC_CONFIG_FILES([
 Makefile
-nature/Makefile
+backgrounds/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f4fd87d..b398247 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1 +1 @@
-nature/gnome-nature.xml.in.in
+backgrounds/gnome-backgrounds.xml.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index c7bcc83..c567bf2 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1,2 @@
-nature/gnome-nature.xml.in
+backgrounds/gnome-backgrounds.xml.in
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]