diff options
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | abstract/Makefile.am | 3 | ||||
| -rw-r--r-- | abstract/mate-abstract.xml.in.in | 7 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | desktop/GreenTraditional.jpg | bin | 0 -> 32071 bytes | |||
| -rw-r--r-- | desktop/Makefile.am | 24 | ||||
| -rw-r--r-- | desktop/Stripes.jpg (renamed from abstract/stripes.jpg) | bin | 246770 -> 246770 bytes | |||
| -rw-r--r-- | desktop/mate-desktop.xml.in.in | 14 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/POTFILES.skip | 1 |
11 files changed, 48 insertions, 11 deletions
@@ -8,6 +8,10 @@ Abstract Copyright © 2008 Daniel Galleguillos <[email protected]> Copyright © 2008 Hylke Bons <[email protected]> +Desktop + - GreenTraditional.jpg + Copyright © 2012 l0r4n0n <[email protected]> + Nature - Aqua.jpg: Copyright © 2008 Charles Barbin <[email protected]> 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/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 Binary files differnew file mode 100644 index 0000000..57666a9 --- /dev/null +++ b/desktop/GreenTraditional.jpg 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/abstract/stripes.jpg b/desktop/Stripes.jpg Binary files differindex c227804..c227804 100644 --- a/abstract/stripes.jpg +++ b/desktop/Stripes.jpg 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 |
