most themes: update index.theme files + a cleanup in TraditionalOK

20 files changed, 38 insertions, 142 deletions

diff --git a/desktop-themes/BlackMATE/Makefile.am b/desktop-themes/BlackMATE/Makefile.am
index 3f287260..829ccdcb 100644
--- a/desktop-themes/BlackMATE/Makefile.am
+++ b/desktop-themes/BlackMATE/Makefile.am
@@ -2,10 +2,12 @@ THEME_NAME=	BlackMATE
  
 themedir = $(datadir)/themes/$(THEME_NAME)
 
-theme_DATA = index.theme \
-			README
+theme_DATA = \
+	COPYING \
+	index.theme \
+	README
 
-EXTRA_DIST = $(theme_DATA) index.theme.in COPYING
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS =		\
 	gtk-2.0		\
diff --git a/desktop-themes/Blue-Submarine/Makefile.am b/desktop-themes/Blue-Submarine/Makefile.am
index 99e477f7..1a40b07c 100644
--- a/desktop-themes/Blue-Submarine/Makefile.am
+++ b/desktop-themes/Blue-Submarine/Makefile.am
@@ -4,7 +4,7 @@ themedir = $(datadir)/themes/$(THEME_NAME)
 
 theme_DATA = index.theme
 
-EXTRA_DIST = $(theme_DATA)
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS =		\
 	cinnamon	\
@@ -13,11 +13,9 @@ SUBDIRS =		\
 	gtk-3.0		\
 	metacity-1
 
-DIST_SUBDIRS =	\
-	cinnamon	\
-	emerald     \
-	gtk-2.0		\
-	gtk-3.0		\
-	metacity-1
-
 CLEANFILES = index.theme
+
+index.theme: index.theme.in
+	$(AM_V_GEN)sed \
+		-e s!\@BACKGROUND_DIR\@!$(datadir)/backgrounds/mate/desktop! \
+		< $< > $@
diff --git a/desktop-themes/Blue-Submarine/index.theme b/desktop-themes/Blue-Submarine/index.theme.in
index 957b40b6..957b40b6 100644
--- a/desktop-themes/Blue-Submarine/index.theme
+++ b/desktop-themes/Blue-Submarine/index.theme.in
diff --git a/desktop-themes/BlueMenta/index.theme.in b/desktop-themes/BlueMenta/index.theme.in
index 0b475bf0..c68cbe0a 100644
--- a/desktop-themes/BlueMenta/index.theme.in
+++ b/desktop-themes/BlueMenta/index.theme.in
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=X-GNOME-Metatheme
 Name=BlueMenta
+Comment=A clean light theme with blue elements
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
diff --git a/desktop-themes/Green-Submarine/Makefile.am b/desktop-themes/Green-Submarine/Makefile.am
index 5ad8022d..7b50e544 100644
--- a/desktop-themes/Green-Submarine/Makefile.am
+++ b/desktop-themes/Green-Submarine/Makefile.am
@@ -4,7 +4,7 @@ themedir = $(datadir)/themes/$(THEME_NAME)
 
 theme_DATA = index.theme
 
-EXTRA_DIST = $(theme_DATA)
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS =		\
 	cinnamon	\
@@ -13,11 +13,9 @@ SUBDIRS =		\
 	gtk-3.0		\
 	metacity-1
 
-DIST_SUBDIRS =	\
-	cinnamon	\
-	emerald     \
-	gtk-2.0		\
-	gtk-3.0		\
-	metacity-1
-
 CLEANFILES = index.theme
+
+index.theme: index.theme.in
+	$(AM_V_GEN)sed \
+		-e s!\@BACKGROUND_DIR\@!$(datadir)/backgrounds/mate/desktop! \
+		< $< > $@
diff --git a/desktop-themes/Green-Submarine/index.theme b/desktop-themes/Green-Submarine/index.theme.in
index 3273ed2f..3273ed2f 100644
--- a/desktop-themes/Green-Submarine/index.theme
+++ b/desktop-themes/Green-Submarine/index.theme.in
diff --git a/desktop-themes/GreenLaguna/Makefile.am b/desktop-themes/GreenLaguna/Makefile.am
index f42816c6..360f2959 100644
--- a/desktop-themes/GreenLaguna/Makefile.am
+++ b/desktop-themes/GreenLaguna/Makefile.am
@@ -2,10 +2,12 @@ THEME_NAME=GreenLaguna
  
 themedir = $(datadir)/themes/$(THEME_NAME)
 
-theme_DATA = index.theme \
-			README
+theme_DATA = \
+	COPYING \
+	index.theme \
+	README
 
-EXTRA_DIST = $(theme_DATA) index.theme.in COPYING
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS =		\
 	gtk-2.0		\
diff --git a/desktop-themes/GreenLaguna/index.theme.in b/desktop-themes/GreenLaguna/index.theme.in
index 9a860972..accafcfa 100644
--- a/desktop-themes/GreenLaguna/index.theme.in
+++ b/desktop-themes/GreenLaguna/index.theme.in
@@ -1,16 +1,12 @@
-[X-GNOME-Metatheme]
-Name=GreenLaguna
+[Desktop Entry]
 Type=X-GNOME-Metatheme
-Comment=A clean green theme
+Name=GreenLaguna
+Comment=A clean light green theme
 Encoding=UTF-8
+
+[X-GNOME-Metatheme]
 GtkTheme=GreenLaguna
 MetacityTheme=GreenLaguna
 IconTheme=menta
 CursorTheme=mate
 CursorSize=24
-
-[Desktop Entry]
-Type=X-GNOME-Metatheme
-Name=GreenLaguna
-Comment=A clean green theme
-Encoding=UTF-8
diff --git a/desktop-themes/Menta/index.theme.in b/desktop-themes/Menta/index.theme.in
index bceb6ed7..02cefbe0 100644
--- a/desktop-themes/Menta/index.theme.in
+++ b/desktop-themes/Menta/index.theme.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=X-GNOME-Metatheme
 Name=Menta
-Comment=A mint theme based on Zukitwo, improved
+Comment=A clean light theme with green elements
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
diff --git a/desktop-themes/TraditionalGreen/Makefile.am b/desktop-themes/TraditionalGreen/Makefile.am
index d0e88192..6694dc5e 100644
--- a/desktop-themes/TraditionalGreen/Makefile.am
+++ b/desktop-themes/TraditionalGreen/Makefile.am
@@ -2,9 +2,11 @@ THEME_NAME=TraditionalGreen
  
 themedir = $(datadir)/themes/$(THEME_NAME)
 
-theme_DATA = index.theme
+theme_DATA = \
+	COPYING \
+	index.theme
 
-EXTRA_DIST = $(theme_DATA) index.theme.in COPYING
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS =		\
 	gtk-2.0		\
diff --git a/desktop-themes/TraditionalGreen/index.theme.in b/desktop-themes/TraditionalGreen/index.theme.in
index b687643a..6768e617 100644
--- a/desktop-themes/TraditionalGreen/index.theme.in
+++ b/desktop-themes/TraditionalGreen/index.theme.in
@@ -5,10 +5,6 @@ Comment=Green port of Clearlooks-Phenex
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
-_Name=TraditionalGreen
-Type=X-GNOME-Metatheme
-_Comment=Green port of Clearlooks-Phenex
-Encoding=UTF-8
 GtkTheme=TraditionalGreen
 MetacityTheme=TraditionalGreen
 IconTheme=menta
diff --git a/desktop-themes/TraditionalOk/Makefile.am b/desktop-themes/TraditionalOk/Makefile.am
index 3e4189c9..d07c1ee1 100644
--- a/desktop-themes/TraditionalOk/Makefile.am
+++ b/desktop-themes/TraditionalOk/Makefile.am
@@ -2,17 +2,17 @@ THEME_NAME=TraditionalOk
  
 themedir = $(datadir)/themes/$(THEME_NAME)
 
-theme_DATA = index.theme
+theme_DATA = \
+	COPYING \
+	index.theme
 
-EXTRA_DIST = $(theme_DATA) index.theme.in COPYING
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS =		\
-	doc			\
 	gtk-2.0		\
 	gtk-3.0		\
 	metacity-1	\
 	openbox-3	\
-	wallpapers	\
 	xfwm4
 
 CLEANFILES = index.theme
diff --git a/desktop-themes/TraditionalOk/doc/Makefile.am b/desktop-themes/TraditionalOk/doc/Makefile.am
deleted file mode 100644
index 9c0ddc43..00000000
--- a/desktop-themes/TraditionalOk/doc/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-THEME_NAME=TraditionalOk
-
-themedir = $(datadir)/themes/$(THEME_NAME)/doc
-
-theme_DATA = \
-	exemple1.png \
-	exemple2.png \
-	exemple3.png
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/TraditionalOk/doc/exemple1.png b/desktop-themes/TraditionalOk/doc/exemple1.png
deleted file mode 100644
index c1c3b84a..00000000
--- a/desktop-themes/TraditionalOk/doc/exemple1.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOk/doc/exemple2.png b/desktop-themes/TraditionalOk/doc/exemple2.png
deleted file mode 100644
index 01b848c3..00000000
--- a/desktop-themes/TraditionalOk/doc/exemple2.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOk/doc/exemple3.png b/desktop-themes/TraditionalOk/doc/exemple3.png
deleted file mode 100644
index 55025d0d..00000000
--- a/desktop-themes/TraditionalOk/doc/exemple3.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOk/index.theme.in b/desktop-themes/TraditionalOk/index.theme.in
index d608d9a2..036073a6 100644
--- a/desktop-themes/TraditionalOk/index.theme.in
+++ b/desktop-themes/TraditionalOk/index.theme.in
@@ -1,14 +1,10 @@
 [Desktop Entry]
 Type=X-GNOME-Metatheme
 Name=TraditionalOk
-Comment=GTK3 port of Clearlooks
+Comment=Port of Clearlooks-Phenex
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
-_Name=TraditionalOk
-Type=X-GNOME-Metatheme
-_Comment=Unattractive Usability
-Encoding=UTF-8
 GtkTheme=TraditionalOk
 MetacityTheme=TraditionalOk
 IconTheme=mate
diff --git a/desktop-themes/TraditionalOk/wallpapers/Makefile.am b/desktop-themes/TraditionalOk/wallpapers/Makefile.am
deleted file mode 100644
index b2e0602a..00000000
--- a/desktop-themes/TraditionalOk/wallpapers/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-THEME_NAME=TraditionalOk
-
-themedir = $(datadir)/themes/$(THEME_NAME)/wallpapers
-
-theme_DATA = \
-	clearlooks-phenix.png \
-	clearlooks-phenix.svg
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/TraditionalOk/wallpapers/clearlooks-phenix.png b/desktop-themes/TraditionalOk/wallpapers/clearlooks-phenix.png
deleted file mode 100644
index 6799aa9d..00000000
--- a/desktop-themes/TraditionalOk/wallpapers/clearlooks-phenix.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOk/wallpapers/clearlooks-phenix.svg b/desktop-themes/TraditionalOk/wallpapers/clearlooks-phenix.svg
deleted file mode 100644
index 7f231e80..00000000
--- a/desktop-themes/TraditionalOk/wallpapers/clearlooks-phenix.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1600.0000pt"
-   height="1200.0000pt"
-   id="svg1"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/aaron"
-   sodipodi:docname="swirls_perso2.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 750 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="2000 : 750 : 1"
-       inkscape:persp3d-origin="1000 : 500 : 1"
-       id="perspective57" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#4b79cc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0000000"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7925"
-     inkscape:cx="1089.5985"
-     inkscape:cy="600"
-     inkscape:current-layer="svg1"
-     inkscape:window-width="1280"
-     inkscape:window-height="894"
-     inkscape:window-x="0"
-     inkscape:window-y="52"
-     showgrid="false" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     style="fill:#ffffff;fill-opacity:0.12549020;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25098041;opacity:1.0000000;color:#000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:block;"
-     d="M 300.56250 1014.6250 C 175.42090 1014.9473 71.231387 1030.7777 -0.0000000 1045.8125 L 0.0000000 1500.0000 L 1680.9062 1500.0000 C 1507.2127 1417.1118 1048.1490 1200.0107 793.37500 1099.3750 C 614.74724 1034.3119 444.08946 1014.2553 300.56250 1014.6250 z "
-     id="path1133" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1" />
-  <path
-     style="fill:#000000;fill-opacity:0.12549020;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
-     d="M 2000.0000 271.50000 C 1772.2953 313.56298 1419.7081 387.13414 942.21875 485.40625 C 564.03603 563.24007 202.65075 454.45754 -0.0000000 393.09375 L 0.0000000 777.75000 C 432.08187 828.82999 759.43439 744.58373 970.81250 675.09375 C 1305.8380 564.95503 1745.4944 336.76441 2000.0000 317.46875 L 2000.0000 271.50000 z "
-     id="path1118" />
-  <path
-     style="fill:#ffffff;fill-opacity:0.12549020;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25098041;"
-     d="M 844.56250 0.0000000 C 995.09961 65.709582 1281.9626 220.58175 1487.3750 514.18750 C 1674.7084 781.95212 1878.5992 932.93236 2000.0000 1006.6562 L 2000.0000 0.0000000 L 844.56250 0.0000000 z "
-     id="path1132" />
-  <path
-     style="fill:#000000;fill-opacity:0.12549020;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:1.0000000;color:#000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:block;"
-     d="M 2000.0000 1056.9688 C 1926.1506 1148.4155 1713.8076 1361.8095 1256.1250 1500.0000 L 2000.0000 1500.0000 L 2000.0000 1056.9688 z "
-     id="path1134" />
-</svg>