From 22b3ce5f67fce7ed81f5a2c6f9a63575a2794c0f Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 24 Sep 2011 13:37:36 +0200
Subject: [PATCH] Fix background installation and other fixes

---
 Makefile                                      |  18 ++++++++++--------
 VERSION                                       |   2 +-
 src/Openmamba Green/index.theme               |   8 --------
 src/gnome-openmamba-green.xml                 |  12 ++++++++++++
 ...ground-default.jpg => openmamba-green.jpg} | Bin
 .../gtk-2.0/gtkrc                             |   0
 src/openmamba-green/index.theme               |   9 +++++++++
 .../metacity-1/metacity-theme-1.xml           |   0
 8 files changed, 32 insertions(+), 17 deletions(-)
 delete mode 100644 src/Openmamba Green/index.theme
 create mode 100644 src/gnome-openmamba-green.xml
 rename src/{background-default.jpg => openmamba-green.jpg} (100%)
 rename src/{Openmamba Green => openmamba-green}/gtk-2.0/gtkrc (100%)
 create mode 100644 src/openmamba-green/index.theme
 rename src/{Openmamba Green => openmamba-green}/metacity-1/metacity-theme-1.xml (100%)

diff --git a/Makefile b/Makefile
index 0dfa253..205e14d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PACKAGE=Gnome-Theme-Green
+PACKAGE=gnome-theme-openmamba
 
 distdir = $(PACKAGE)-$(VERSION)
 dist_archive = $(distdir).tar.bz2
@@ -18,14 +18,16 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
 
 install-dirs:
-	@$(INSTALL_DIR) $(DESTDIR)$(datadir)/themes/Openmamba\ Green/metacity-1
-	@$(INSTALL_DIR) $(DESTDIR)$(datadir)/themes/Openmamba\ Green/gtk-2.0
-	@$(INSTALL_DIR) $(DESTDIR)$(datadir)/pixmaps/backgrounds/gnome
+	@$(INSTALL_DIR) $(DESTDIR)$(datadir)/themes/openmamba-green/metacity-1
+	@$(INSTALL_DIR) $(DESTDIR)$(datadir)/themes/openmamba-green/gtk-2.0
+	@$(INSTALL_DIR) $(DESTDIR)$(datadir)/pixmaps/backgrounds/gnome/openmamba-green
+	@$(INSTALL_DIR) $(DESTDIR)$(datadir)/gnome-background-properties
 install: install-dirs 
-	$(INSTALL_DATA) src/Openmamba\ Green/metacity-1/* $(DESTDIR)$(datadir)/themes/Openmamba\ Green/metacity-1
-	$(INSTALL_DATA) src/Openmamba\ Green/gtk-2.0/* $(DESTDIR)$(datadir)/themes/Openmamba\ Green/gtk-2.0
-	$(INSTALL_DATA) src/Openmamba\ Green/index.theme $(DESTDIR)$(datadir)/themes/Openmamba\ Green/
-	$(INSTALL_DATA) src/background-default.jpg $(DESTDIR)$(datadir)/pixmaps/backgrounds/gnome/background-default.jpg
+	$(INSTALL_DATA) src/openmamba-green/metacity-1/* $(DESTDIR)$(datadir)/themes/openmamba-green/metacity-1
+	$(INSTALL_DATA) src/openmamba-green/gtk-2.0/* $(DESTDIR)$(datadir)/themes/openmamba-green/gtk-2.0
+	$(INSTALL_DATA) src/openmamba-green/index.theme $(DESTDIR)$(datadir)/themes/openmamba-green/
+	$(INSTALL_DATA) src/openmamba-green.jpg $(DESTDIR)$(datadir)/pixmaps/backgrounds/gnome/openmamba-green/openmamba-green.jpg
+	$(INSTALL_DATA) src/gnome-openmamba-green.xml $(DESTDIR)$(datadir)/gnome-background-properties/gnome-openmamba-green.xml
 
 clean: 
 	rm -f $(dist_archive)
diff --git a/VERSION b/VERSION
index 2e94ead..930c224 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.1
+VERSION=0.2
diff --git a/src/Openmamba Green/index.theme b/src/Openmamba Green/index.theme
deleted file mode 100644
index 1972ef4..0000000
--- a/src/Openmamba Green/index.theme	
+++ /dev/null
@@ -1,8 +0,0 @@
-[X-GNOME-Metatheme]
-Name=Openmamba Green
-Type=X-GNOME-Metatheme
-Comment=Clone di Clearlooks
-Encoding=UTF-8
-GtkTheme=Openmamba-Green
-MetacityTheme=Openmamba-Green
-IconTheme=gnome
diff --git a/src/gnome-openmamba-green.xml b/src/gnome-openmamba-green.xml
new file mode 100644
index 0000000..37b3922
--- /dev/null
+++ b/src/gnome-openmamba-green.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+	<wallpaper deleted="false">
+		<name>openmamba Green Background</name>
+		<name xml:lang="it">Sfondo openmamba Green</name>
+		<filename>/usr/share/pixmaps/backgrounds/gnome/openmamba-green/openmamba-green.jpg</filename>
+		<options>zoom</options>
+		<shade_type>solid</shade_type>
+		<pcolor>#66ba00</pcolor>
+	</wallpaper>
+</wallpapers>
\ No newline at end of file
diff --git a/src/background-default.jpg b/src/openmamba-green.jpg
similarity index 100%
rename from src/background-default.jpg
rename to src/openmamba-green.jpg
diff --git a/src/Openmamba Green/gtk-2.0/gtkrc b/src/openmamba-green/gtk-2.0/gtkrc
similarity index 100%
rename from src/Openmamba Green/gtk-2.0/gtkrc
rename to src/openmamba-green/gtk-2.0/gtkrc
diff --git a/src/openmamba-green/index.theme b/src/openmamba-green/index.theme
new file mode 100644
index 0000000..7b82275
--- /dev/null
+++ b/src/openmamba-green/index.theme
@@ -0,0 +1,9 @@
+[X-GNOME-Metatheme]
+Name=openmamba Green
+Type=X-GNOME-Metatheme
+Comment=openmamba Green theme
+Comment[it]=Tema openmamba Green
+Encoding=UTF-8
+GtkTheme=openmamba-green
+MetacityTheme=openmamba-green
+IconTheme=gnome
diff --git a/src/Openmamba Green/metacity-1/metacity-theme-1.xml b/src/openmamba-green/metacity-1/metacity-theme-1.xml
similarity index 100%
rename from src/Openmamba Green/metacity-1/metacity-theme-1.xml
rename to src/openmamba-green/metacity-1/metacity-theme-1.xml