Updating branch refs/heads/master
to 35a3e216a45a31d141663e48295449d47749452e (commit)
from 440b5f5caf1ccc40554a2e525c340cae76d9c252 (commit)
commit 35a3e216a45a31d141663e48295449d47749452e
Author: Nick Schermer <[email protected]>
Date: Thu Dec 27 00:16:56 2012 +0100
Rename scheme files to .theme for intltool.
colorschemes/Makefile.am | 21 ++++++++-----------
...-on-white.scheme.in => black-on-white.theme.in} | 0
...ark-pastels.scheme.in => dark-pastels.theme.in} | 0
...-on-black.scheme.in => green-on-black.theme.in} | 0
...ized-dark.scheme.in => solarized-dark.theme.in} | 0
colorschemes/{tango.scheme.in => tango.theme.in} | 0
...-on-black.scheme.in => white-on-black.theme.in} | 0
colorschemes/{xterm.scheme.in => xterm.theme.in} | 0
po/POTFILES.in | 14 ++++++------
9 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/colorschemes/Makefile.am b/colorschemes/Makefile.am
index eec3ea6..ef6cb96 100644
--- a/colorschemes/Makefile.am
+++ b/colorschemes/Makefile.am
@@ -1,20 +1,17 @@
presets_in_files = \
- black-on-white.scheme.in \
- dark-pastels.scheme.in \
- green-on-black.scheme.in \
- solarized-dark.scheme.in \
- tango.scheme.in \
- white-on-black.scheme.in \
- xterm.scheme.in
+ black-on-white.theme.in \
+ dark-pastels.theme.in \
+ green-on-black.theme.in \
+ solarized-dark.theme.in \
+ tango.theme.in \
+ white-on-black.theme.in \
+ xterm.theme.in
presetsdir = $(datadir)/xfce4/terminal/colorschemes
-presets_DATA = $(presets_in_files:.scheme.in=.scheme)
-
-%.scheme: %.scheme.in
- $(AM_V_GEN) $(MKDIR_P) $(dir $@); LC_ALL=C $(INTLTOOL_MERGE) -d -u -c \
- $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+presets_DATA = $(presets_in_files:.theme.in=.theme)
+@INTLTOOL_THEME_RULE@
EXTRA_DIST = $(presets_in_files)
diff --git a/colorschemes/black-on-white.scheme.in
b/colorschemes/black-on-white.theme.in
similarity index 100%
rename from colorschemes/black-on-white.scheme.in
rename to colorschemes/black-on-white.theme.in
diff --git a/colorschemes/dark-pastels.scheme.in
b/colorschemes/dark-pastels.theme.in
similarity index 100%
rename from colorschemes/dark-pastels.scheme.in
rename to colorschemes/dark-pastels.theme.in
diff --git a/colorschemes/green-on-black.scheme.in
b/colorschemes/green-on-black.theme.in
similarity index 100%
rename from colorschemes/green-on-black.scheme.in
rename to colorschemes/green-on-black.theme.in
diff --git a/colorschemes/solarized-dark.scheme.in
b/colorschemes/solarized-dark.theme.in
similarity index 100%
rename from colorschemes/solarized-dark.scheme.in
rename to colorschemes/solarized-dark.theme.in
diff --git a/colorschemes/tango.scheme.in b/colorschemes/tango.theme.in
similarity index 100%
rename from colorschemes/tango.scheme.in
rename to colorschemes/tango.theme.in
diff --git a/colorschemes/white-on-black.scheme.in
b/colorschemes/white-on-black.theme.in
similarity index 100%
rename from colorschemes/white-on-black.scheme.in
rename to colorschemes/white-on-black.theme.in
diff --git a/colorschemes/xterm.scheme.in b/colorschemes/xterm.theme.in
similarity index 100%
rename from colorschemes/xterm.scheme.in
rename to colorschemes/xterm.theme.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a34a2e6..3e11c35 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,10 @@
-colorschemes/black-on-white.scheme.in
-colorschemes/dark-pastels.scheme.in
-colorschemes/green-on-black.scheme.in
-colorschemes/solarized-dark.scheme.in
-colorschemes/tango.scheme.in
-colorschemes/white-on-black.scheme.in
-colorschemes/xterm.scheme.in
+colorschemes/black-on-white.theme.in
+colorschemes/dark-pastels.theme.in
+colorschemes/green-on-black.theme.in
+colorschemes/solarized-dark.theme.in
+colorschemes/tango.theme.in
+colorschemes/white-on-black.theme.in
+colorschemes/xterm.theme.in
terminal/main.c
terminal/terminal-app.c
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
