From 69e5ce34b07be63545cdae8817af973dc9d9f2a8 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Wed, 9 Mar 2016 17:34:50 +0100 Subject: most themes: update index.theme files + a cleanup in TraditionalOK --- desktop-themes/BlackMATE/Makefile.am | 8 ++- desktop-themes/Blue-Submarine/Makefile.am | 14 ++-- desktop-themes/Blue-Submarine/index.theme | 11 --- desktop-themes/Blue-Submarine/index.theme.in | 11 +++ desktop-themes/BlueMenta/index.theme.in | 1 + desktop-themes/Green-Submarine/Makefile.am | 14 ++-- desktop-themes/Green-Submarine/index.theme | 11 --- desktop-themes/Green-Submarine/index.theme.in | 11 +++ desktop-themes/GreenLaguna/Makefile.am | 8 ++- desktop-themes/GreenLaguna/index.theme.in | 14 ++-- desktop-themes/Menta/index.theme.in | 2 +- desktop-themes/TraditionalGreen/Makefile.am | 6 +- desktop-themes/TraditionalGreen/index.theme.in | 4 -- desktop-themes/TraditionalOk/Makefile.am | 8 +-- desktop-themes/TraditionalOk/doc/Makefile.am | 10 --- desktop-themes/TraditionalOk/doc/exemple1.png | Bin 67154 -> 0 bytes desktop-themes/TraditionalOk/doc/exemple2.png | Bin 34428 -> 0 bytes desktop-themes/TraditionalOk/doc/exemple3.png | Bin 93254 -> 0 bytes desktop-themes/TraditionalOk/index.theme.in | 6 +- .../TraditionalOk/wallpapers/Makefile.am | 9 --- .../TraditionalOk/wallpapers/clearlooks-phenix.png | Bin 23102 -> 0 bytes .../TraditionalOk/wallpapers/clearlooks-phenix.svg | 76 --------------------- 22 files changed, 60 insertions(+), 164 deletions(-) delete mode 100644 desktop-themes/Blue-Submarine/index.theme create mode 100644 desktop-themes/Blue-Submarine/index.theme.in delete mode 100644 desktop-themes/Green-Submarine/index.theme create mode 100644 desktop-themes/Green-Submarine/index.theme.in delete mode 100644 desktop-themes/TraditionalOk/doc/Makefile.am delete mode 100644 desktop-themes/TraditionalOk/doc/exemple1.png delete mode 100644 desktop-themes/TraditionalOk/doc/exemple2.png delete mode 100644 desktop-themes/TraditionalOk/doc/exemple3.png delete mode 100644 desktop-themes/TraditionalOk/wallpapers/Makefile.am delete mode 100644 desktop-themes/TraditionalOk/wallpapers/clearlooks-phenix.png delete mode 100644 desktop-themes/TraditionalOk/wallpapers/clearlooks-phenix.svg 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 deleted file mode 100644 index 957b40b6..00000000 --- a/desktop-themes/Blue-Submarine/index.theme +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=X-GNOME-Metatheme -Name=Blue-Submarine -Comment=A medium blue theme with dark menus and panel -Encoding=UTF-8 - -[X-GNOME-Metatheme] -GtkTheme=Blue-Submarine -MetacityTheme=Blue-Submarine -IconTheme=mate -CursorTheme=mate diff --git a/desktop-themes/Blue-Submarine/index.theme.in b/desktop-themes/Blue-Submarine/index.theme.in new file mode 100644 index 00000000..957b40b6 --- /dev/null +++ b/desktop-themes/Blue-Submarine/index.theme.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=X-GNOME-Metatheme +Name=Blue-Submarine +Comment=A medium blue theme with dark menus and panel +Encoding=UTF-8 + +[X-GNOME-Metatheme] +GtkTheme=Blue-Submarine +MetacityTheme=Blue-Submarine +IconTheme=mate +CursorTheme=mate 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 deleted file mode 100644 index 3273ed2f..00000000 --- a/desktop-themes/Green-Submarine/index.theme +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=X-GNOME-Metatheme -Name=Green-Submarine -Comment=A medium green green varient of Menta with dark menus and panel -Encoding=UTF-8 - -[X-GNOME-Metatheme] -GtkTheme=Green-Submarine -MetacityTheme=Green-Submarine -IconTheme=mate -CursorTheme=mate diff --git a/desktop-themes/Green-Submarine/index.theme.in b/desktop-themes/Green-Submarine/index.theme.in new file mode 100644 index 00000000..3273ed2f --- /dev/null +++ b/desktop-themes/Green-Submarine/index.theme.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=X-GNOME-Metatheme +Name=Green-Submarine +Comment=A medium green green varient of Menta with dark menus and panel +Encoding=UTF-8 + +[X-GNOME-Metatheme] +GtkTheme=Green-Submarine +MetacityTheme=Green-Submarine +IconTheme=mate +CursorTheme=mate 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 Binary files a/desktop-themes/TraditionalOk/doc/exemple1.png and /dev/null differ diff --git a/desktop-themes/TraditionalOk/doc/exemple2.png b/desktop-themes/TraditionalOk/doc/exemple2.png deleted file mode 100644 index 01b848c3..00000000 Binary files a/desktop-themes/TraditionalOk/doc/exemple2.png and /dev/null differ diff --git a/desktop-themes/TraditionalOk/doc/exemple3.png b/desktop-themes/TraditionalOk/doc/exemple3.png deleted file mode 100644 index 55025d0d..00000000 Binary files a/desktop-themes/TraditionalOk/doc/exemple3.png and /dev/null differ 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 Binary files a/desktop-themes/TraditionalOk/wallpapers/clearlooks-phenix.png and /dev/null differ 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 @@ - - - - - - - - - - - image/svg+xml - - - - - - - - - - -- cgit v1.2.1