From 58e3da44fa30630f0122df25d194ab012024e80f Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Thu, 29 Mar 2012 13:09:54 +0200
Subject: add GreenTraditional background for MATE, move Stripes wallpaper to
 desktop folder

---
 AUTHORS                          |   4 ++++
 Makefile.am                      |   2 +-
 abstract/Makefile.am             |   3 +--
 abstract/mate-abstract.xml.in.in |   7 -------
 abstract/stripes.jpg             | Bin 246770 -> 0 bytes
 configure.in                     |   3 ++-
 desktop/GreenTraditional.jpg     | Bin 0 -> 32071 bytes
 desktop/Makefile.am              |  24 ++++++++++++++++++++++++
 desktop/Stripes.jpg              | Bin 0 -> 246770 bytes
 desktop/mate-desktop.xml.in.in   |  14 ++++++++++++++
 po/POTFILES.in                   |   1 +
 po/POTFILES.skip                 |   1 +
 12 files changed, 48 insertions(+), 11 deletions(-)
 delete mode 100644 abstract/stripes.jpg
 create mode 100644 desktop/GreenTraditional.jpg
 create mode 100644 desktop/Makefile.am
 create mode 100644 desktop/Stripes.jpg
 create mode 100644 desktop/mate-desktop.xml.in.in

diff --git a/AUTHORS b/AUTHORS
index 55ae403..d621784 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,10 @@ Abstract
     Copyright © 2008 Daniel Galleguillos <dnlgalleguillos@gmail.com>
     Copyright © 2008 Hylke Bons <hylkebons@gmail.com>
 
+Desktop
+ - GreenTraditional.jpg
+    Copyright © 2012 l0r4n0n <info@stefan-geissler.net>
+
 Nature
  - Aqua.jpg:
     Copyright © 2008 Charles Barbin <barbinch@free.fr>
diff --git a/Makefile.am b/Makefile.am
index 9b62b69..6eba55f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = abstract nature po
+SUBDIRS = abstract desktop nature po
 
 dist-hook:
 	@if test -d "$(srcdir)/.git"; \
diff --git a/abstract/Makefile.am b/abstract/Makefile.am
index 4fd9678..4f4a3a5 100644
--- a/abstract/Makefile.am
+++ b/abstract/Makefile.am
@@ -6,8 +6,7 @@ background_DATA = \
 	Gulp.png \
 	Silk.png \
 	Spring.png \
-	Waves.png \
-	stripes.jpg
+	Waves.png
 
 
 metadata_in_files = mate-abstract.xml.in
diff --git a/abstract/mate-abstract.xml.in.in b/abstract/mate-abstract.xml.in.in
index 4689f9a..b46cb09 100644
--- a/abstract/mate-abstract.xml.in.in
+++ b/abstract/mate-abstract.xml.in.in
@@ -47,11 +47,4 @@
 		<pcolor>#1166AA</pcolor>
 		<options>zoom</options>
 	</wallpaper>
-	<wallpaper deleted="false">
-		<_name>Stripes</_name>
-		<filename>@datadir@/pixmaps/backgrounds/mate/abstract/stripes.jpg</filename>
-		<shade_type>solid</shade_type>
-		<pcolor>#234C88</pcolor>
-		<options>zoom</options>
-	</wallpaper>
 </wallpapers>
diff --git a/abstract/stripes.jpg b/abstract/stripes.jpg
deleted file mode 100644
index c227804..0000000
Binary files a/abstract/stripes.jpg and /dev/null differ
diff --git a/configure.in b/configure.in
index a93f1b9..ed740c2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT([mate-backgrounds],
-	[1.2.0],
+	[1.2.1],
 	[http://www.mate-desktop.org])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_INIT_AUTOMAKE
@@ -19,6 +19,7 @@ AM_MAINTAINER_MODE
 AC_OUTPUT([
 Makefile
 abstract/Makefile
+desktop/Makefile
 nature/Makefile
 po/Makefile.in
 ])
diff --git a/desktop/GreenTraditional.jpg b/desktop/GreenTraditional.jpg
new file mode 100644
index 0000000..57666a9
Binary files /dev/null and b/desktop/GreenTraditional.jpg differ
diff --git a/desktop/Makefile.am b/desktop/Makefile.am
new file mode 100644
index 0000000..902069c
--- /dev/null
+++ b/desktop/Makefile.am
@@ -0,0 +1,24 @@
+backgrounddir = $(datadir)/pixmaps/backgrounds/mate/desktop
+
+background_DATA =\
+	GreenTraditional.jpg \
+	Stripes.jpg
+
+metadata_in_files = mate-desktop.xml.in
+metadatadir = $(datadir)/mate-background-properties
+metadata_DATA = $(metadata_in_files:.xml.in=.xml)
+@INTLTOOL_XML_RULE@
+
+noinst_DATA = mate-desktop.xml.in
+CLEANFILES = mate-desktop.xml mate-desktop.xml.in
+
+EXTRA_DIST = $(background_DATA) mate-desktop.xml.in.in
+
+mate-desktop.xml.in: mate-desktop.xml.in.in Makefile
+	$(AM_V_GEN)sed -e 's^\@datadir\@^$(datadir)^g' < $(srcdir)/mate-desktop.xml.in.in > mate-desktop.xml.in.tmp \
+	&& mv mate-desktop.xml.in.tmp mate-desktop.xml.in
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
+-include $(top_srcdir)/git.mk
diff --git a/desktop/Stripes.jpg b/desktop/Stripes.jpg
new file mode 100644
index 0000000..c227804
Binary files /dev/null and b/desktop/Stripes.jpg differ
diff --git a/desktop/mate-desktop.xml.in.in b/desktop/mate-desktop.xml.in.in
new file mode 100644
index 0000000..6f03f0d
--- /dev/null
+++ b/desktop/mate-desktop.xml.in.in
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "mate-wp-list.dtd">
+<wallpapers>
+	<wallpaper deleted="false">
+		<_name>Green Traditional</_name>
+		<filename>@datadir@/pixmaps/backgrounds/mate/desktop/GreenTraditional.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+	<wallpaper deleted="false">
+		<_name>Stripes</_name>
+		<filename>@datadir@/pixmaps/backgrounds/mate/desktop/Stripes.jpg</filename>
+		<options>zoom</options>
+	</wallpaper>
+</wallpapers>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cc1d965..fba64ec 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1,3 @@
 abstract/mate-abstract.xml.in.in
+desktop/mate-desktop.xml.in.in
 nature/mate-nature.xml.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 6aacf9e..0413481 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,4 @@
 abstract/mate-abstract.xml.in
+desktop/mate-desktop.xml.in
 nature/mate-nature.xml.in
 
-- 
cgit v1.2.1