gnome-backgrounds r332 - in trunk: . abstract branded nature po tiles translucent

[thos svn gnome org]

Author: thos
Date: Tue Jul 22 16:51:23 2008
New Revision: 332
URL: http://svn.gnome.org/viewvc/gnome-backgrounds?rev=332&view=rev

Log:
2008-07-22  Thomas Wood  <thos gnome org>

	* AUTHORS:
	* Makefile.am:
	* NEWS:
	* abstract/Makefile.am:
	* abstract/gnome-abstract.xml.in.in:
	* branded/Makefile.am:
	* branded/gnome-branded.xml.in.in:
	* configure.in:
	* nature/Makefile.am:
	* nature/gnome-nature.xml.in.in:
	* tiles/Makefile.am:
	* tiles/gnome-tiles.xml.in.in:
	* translucent/Makefile.am:
	* translucent/gnome-translucent.xml.in.in:

	Add new backgrounds from wallpaper contest, update to 2.23.0


Added:
   trunk/abstract/
   trunk/abstract/Flow.png   (contents, props changed)
   trunk/abstract/Glup.png   (contents, props changed)
   trunk/abstract/Makefile.am
   trunk/abstract/Silk.png   (contents, props changed)
   trunk/abstract/Spring.png   (contents, props changed)
   trunk/abstract/Waves.png   (contents, props changed)
   trunk/abstract/gnome-abstract.xml.in.in
Removed:
   trunk/branded/
   trunk/tiles/
   trunk/translucent/
Modified:
   trunk/AUTHORS
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/configure.in
   trunk/nature/Makefile.am
   trunk/nature/gnome-nature.xml.in.in
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip

Modified: trunk/AUTHORS
==============================================================================
--- trunk/AUTHORS	(original)
+++ trunk/AUTHORS	Tue Jul 22 16:51:23 2008
@@ -3,17 +3,23 @@
  - Thomas Wood <thos gnome org>
 
 
-Backgrounds:
+Background Authors:
 
-Branded
- - GNOME-Curves.png   Model by Jakub Steiner <jimmac ximian com>,
-                      Rendered by Ulisse Perusin <uli peru gmail com>,
-                      Retouched by Lapo Calamandrei <lapo it gnome org>
-
-Tiles and Translucent backgrounds by Andreas Nilsson <nisses mail home se> and
-Lapo Calamandrei
+Abstract
+ - Silk.png, Spring.png, Waves.png:  Patryk Zawadzki <patrys pld-linux org>
+ - Flow.png, Gulp.png:  Daniel Galleguillos <dnlgalleguillos gmail com>
 
 Nature
- - FreshFlower.jpg   Jens Ansorg <jens ansorg-web de>
- - OpenFlower.jpg    Garrett LeSage <garrett linuxart com>
- - GreenMeadow.jpg   Timothy Schellhase, retouched by Lapo Calamandrei
+ - Aqua.jpg: Charles Barbin <barbinch free fr>
+ - Blinds.jpg: Lennart Poettering <mztabzr 0pointer de>
+ - Dunes.jpg: Marco Cogoni cogoni gmail com
+ - FreshFlower.jpg: Jens Ansorg <jens ansorg-web de>
+ - Garden.jpg: Charles Barbin <barbinch free fr>
+ - GreenMeadow.jpg: Timothy Schellhase, retouched by Lapo Calamandrei
+ - LadyBird.jpg: Charles Barbin <barbinch free fr>
+ - OpenFlower.jpg: Garrett LeSage <garrett linuxart com>
+ - RainDrops.jpg: "blackcombwhistler07" <blackcombwhistler07 googlemail com>
+ - Storm.jpg: Sergey Nazarov <phearnot renee ru>
+ - TwoWings.jpg: Charles Barbin <barbinch free fr>
+ - Wood.jpg: Jean-FranÃois Fortin Tam <nekohayo gmail com>
+ - YellowFlower.jpg: Charles Barbin <barbinch free fr>

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Jul 22 16:51:23 2008
@@ -1,9 +1,6 @@
-SUBDIRS = branded tiles translucent nature po
+SUBDIRS = abstract nature po
 
 EXTRA_DIST = \
-	intltool-extract.in \
-	intltool-merge.in \
-	intltool-update.in \
 	MAINTAINERS
 
 DISTCLEANFILES = \

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Jul 22 16:51:23 2008
@@ -1,4 +1,10 @@
 ==============
+Version 2.23.0
+==============
+
+* New backgrounds from background contest
+
+==============
 Version 2.22.0
 ==============
 

Added: trunk/abstract/Flow.png
==============================================================================
Binary file. No diff available.

Added: trunk/abstract/Glup.png
==============================================================================
Binary file. No diff available.

Added: trunk/abstract/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/abstract/Makefile.am	Tue Jul 22 16:51:23 2008
@@ -0,0 +1,26 @@
+backgrounddir = $(datadir)/pixmaps/backgrounds/gnome/abstract
+
+background_DATA = \
+	Flow.png \
+	Glup.png \
+	Silk.png \
+	Spring.png \
+	Waves.png
+
+
+metadata_in_files = gnome-abstract.xml.in
+metadatadir = $(datadir)/gnome-background-properties
+metadata_DATA = $(metadata_in_files:.xml.in=.xml)
+ INTLTOOL_XML_RULE@
+
+noinst_DATA = gnome-abstract.xml.in
+CLEANFILES = gnome-abstract.xml gnome-abstract.xml.in
+
+EXTRA_DIST = $(background_DATA) gnome-abstract.xml.in.in
+
+gnome-abstract.xml.in: gnome-abstract.xml.in.in Makefile
+	sed -e 's^\ datadir\@^$(datadir)^g' < $(srcdir)/gnome-abstract.xml.in.in > gnome-abstract.xml.in.tmp \
+	&& mv gnome-abstract.xml.in.tmp gnome-abstract.xml.in
+
+MAINTAINERCLEANFILES = \
+	Makefile.in

Added: trunk/abstract/Silk.png
==============================================================================
Binary file. No diff available.

Added: trunk/abstract/Spring.png
==============================================================================
Binary file. No diff available.

Added: trunk/abstract/Waves.png
==============================================================================
Binary file. No diff available.

Added: trunk/abstract/gnome-abstract.xml.in.in
==============================================================================
--- (empty file)
+++ trunk/abstract/gnome-abstract.xml.in.in	Tue Jul 22 16:51:23 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+	<wallpaper deleted="false">
+		<_name>Flow</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Flow.png</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Gulp</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Gulp.png</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Silk</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Silk.png</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Spring</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Spring.png</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Waves</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Waves.png</filename>
+		<options>zoom</options>
+	</wallpaper>
+</wallpapers>

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jul 22 16:51:23 2008
@@ -1,4 +1,4 @@
-AC_INIT([gnome-backgrounds], [2.22.0])
+AC_INIT([gnome-backgrounds], [2.23.0])
 AM_INIT_AUTOMAKE
 AM_INIT_AUTOMAKE([1.9])
 
@@ -15,10 +15,7 @@
 
 AC_OUTPUT([
 Makefile
-po/Makefile.in
-branded/Makefile
+abstract/Makefile
 nature/Makefile
-tiles/Makefile
-translucent/Makefile
-po/Makefile
+po/Makefile.in
 ])

Modified: trunk/nature/Makefile.am
==============================================================================
--- trunk/nature/Makefile.am	(original)
+++ trunk/nature/Makefile.am	Tue Jul 22 16:51:23 2008
@@ -1,9 +1,18 @@
 backgrounddir = $(datadir)/pixmaps/backgrounds/gnome/nature
 
 background_DATA =\
+	Aqua.jpg \
+	Blinds.jpg \
+	Dune.jpg \
 	FreshFlower.jpg \
-	OpenFlower.jpg \
-	GreenMeadow.jpg
+	Garden.jpg \
+	GreenMeadow.jpg \
+	LadyBird.jpg \
+	RainDrops.jpg \
+	Storm.jpg \
+	TwoWings.jpg \
+	Wood.jpg \
+	YellowFlower.jpg
 
 metadata_in_files = gnome-nature.xml.in
 metadatadir = $(datadir)/gnome-background-properties

Modified: trunk/nature/gnome-nature.xml.in.in
==============================================================================
--- trunk/nature/gnome-nature.xml.in.in	(original)
+++ trunk/nature/gnome-nature.xml.in.in	Tue Jul 22 16:51:23 2008
@@ -9,17 +9,60 @@
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<!-- Translators: This is the name of a desktop background image that shows a yellow flower.
-		You might want to translate it into the equivalent words of your language  -->
-		<_name>Open Flower</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/OpenFlower.jpg</filename>
-		<options>zoom</options>
-	</wallpaper>
-	<wallpaper deleted="false">
 		<!-- Translators: This is the name of a desktop background image that shows a green meadow.
 		  You might want to translate it into the equivalent words of your language  -->
 		<_name>Green Meadow</_name>
 		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/GreenMeadow.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Aqua</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Aqua.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Dune</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Dune.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Storm</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Dune.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Two Wings</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/TwoWings.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Lady Bird</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/LadyBird.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Blinds</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Blinds.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Rain Drops</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/RainDrops.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Yellow Flower</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Garden</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Garden.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Wood</_name>
+		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Wood.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
 </wallpapers>

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue Jul 22 16:51:23 2008
@@ -1,4 +1,2 @@
-branded/gnome-branded.xml.in.in
-tiles/gnome-tiles.xml.in.in
-translucent/gnome-translucent.xml.in.in
+abstract/gnome-abstract.xml.in.in
 nature/gnome-nature.xml.in.in

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Tue Jul 22 16:51:23 2008
@@ -1,5 +1,3 @@
-branded/gnome-branded.xml.in
+abstract/gnome-abstract.xml.in
 nature/gnome-nature.xml.in
-tiles/gnome-tiles.xml.in
-translucent/gnome-translucent.xml.in