diff options
| author | Stefano Karapetsas <[email protected]> | 2013-03-26 15:32:04 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-03-26 15:32:04 -0700 |
| commit | fec3877fcf84d0a7ecb331ea4afbcb10c6053fa9 (patch) | |
| tree | e9f11e41462fec312dd487ab5de01f308a1581e1 | |
| parent | 567797e7a96de13bc812f87cf6f90e665babbd2a (diff) | |
| parent | f988463b45bdf7078827dc984f8613850d71ae84 (diff) | |
| download | mate-backgrounds-fec3877fcf84d0a7ecb331ea4afbcb10c6053fa9.tar.bz2 mate-backgrounds-fec3877fcf84d0a7ecb331ea4afbcb10c6053fa9.tar.xz | |
Merge pull request #10 from NiceandGently/master
change backgrounds installation path
| -rw-r--r-- | abstract/Makefile.am | 2 | ||||
| -rw-r--r-- | abstract/mate-abstract.xml.in.in | 12 | ||||
| -rw-r--r-- | desktop/Makefile.am | 2 | ||||
| -rw-r--r-- | desktop/mate-desktop.xml.in.in | 4 | ||||
| -rw-r--r-- | nature/Makefile.am | 2 | ||||
| -rw-r--r-- | nature/mate-nature.xml.in.in | 24 |
6 files changed, 23 insertions, 23 deletions
diff --git a/abstract/Makefile.am b/abstract/Makefile.am index 4f4a3a5..6bd6896 100644 --- a/abstract/Makefile.am +++ b/abstract/Makefile.am @@ -1,4 +1,4 @@ -backgrounddir = $(datadir)/pixmaps/backgrounds/mate/abstract +backgrounddir = $(datadir)/backgrounds/mate/abstract background_DATA = \ Arc-Colors-Transparent-Wallpaper.png \ diff --git a/abstract/mate-abstract.xml.in.in b/abstract/mate-abstract.xml.in.in index daeb9e6..7beebff 100644 --- a/abstract/mate-abstract.xml.in.in +++ b/abstract/mate-abstract.xml.in.in @@ -4,7 +4,7 @@ <wallpaper deleted="false"> <!-- From http://code.google.com/p/gnome-colors/ --> <_name>Arc</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/abstract/Arc-Colors-Transparent-Wallpaper.png</filename> + <filename>@datadir@/backgrounds/mate/abstract/Arc-Colors-Transparent-Wallpaper.png</filename> <options>zoom</options> <shade_type>vertical-gradient</shade_type> <pcolor>#27587E</pcolor> @@ -13,7 +13,7 @@ </wallpaper> <wallpaper deleted="false"> <_name>Flow</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/abstract/Flow.png</filename> + <filename>@datadir@/backgrounds/mate/abstract/Flow.png</filename> <options>zoom</options> <shade_type>horizontal-gradient</shade_type> <pcolor>#27587E</pcolor> @@ -22,7 +22,7 @@ </wallpaper> <wallpaper deleted="false"> <_name>Gulp</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/abstract/Gulp.png</filename> + <filename>@datadir@/backgrounds/mate/abstract/Gulp.png</filename> <shade_type>horizontal-gradient</shade_type> <pcolor>#627F5A</pcolor> <scolor>#27587E</scolor> @@ -30,7 +30,7 @@ </wallpaper> <wallpaper deleted="false"> <_name>Silk</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/abstract/Silk.png</filename> + <filename>@datadir@/backgrounds/mate/abstract/Silk.png</filename> <shade_type>horizontal-gradient</shade_type> <pcolor>#27587E</pcolor> <scolor>#627F5A</scolor> @@ -38,7 +38,7 @@ </wallpaper> <wallpaper deleted="false"> <_name>Spring</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/abstract/Spring.png</filename> + <filename>@datadir@/backgrounds/mate/abstract/Spring.png</filename> <shade_type>vertical-gradient</shade_type> <pcolor>#27587E</pcolor> <scolor>#627F5A</scolor> @@ -46,7 +46,7 @@ </wallpaper> <wallpaper deleted="false"> <_name>Waves</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/abstract/Waves.png</filename> + <filename>@datadir@/backgrounds/mate/abstract/Waves.png</filename> <shade_type>horizontal-gradient</shade_type> <pcolor>#27587E</pcolor> <scolor>#627F5A</scolor> diff --git a/desktop/Makefile.am b/desktop/Makefile.am index 6d51870..0eabbc7 100644 --- a/desktop/Makefile.am +++ b/desktop/Makefile.am @@ -1,4 +1,4 @@ -backgrounddir = $(datadir)/pixmaps/backgrounds/mate/desktop +backgrounddir = $(datadir)/backgrounds/mate/desktop background_DATA =\ GreenTraditional.jpg \ diff --git a/desktop/mate-desktop.xml.in.in b/desktop/mate-desktop.xml.in.in index 0132e97..1c24515 100644 --- a/desktop/mate-desktop.xml.in.in +++ b/desktop/mate-desktop.xml.in.in @@ -11,12 +11,12 @@ </wallpaper> <wallpaper deleted="false"> <_name>Green Traditional</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/desktop/GreenTraditional.jpg</filename> + <filename>@datadir@/backgrounds/mate/desktop/GreenTraditional.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <_name>Stripes</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/desktop/Stripes.png</filename> + <filename>@datadir@/backgrounds/mate/desktop/Stripes.png</filename> <options>zoom</options> <shade_type>vertical-gradient</shade_type> <pcolor>#5891BC</pcolor> diff --git a/nature/Makefile.am b/nature/Makefile.am index f93a6a3..fc5a6a6 100644 --- a/nature/Makefile.am +++ b/nature/Makefile.am @@ -1,4 +1,4 @@ -backgrounddir = $(datadir)/pixmaps/backgrounds/mate/nature +backgrounddir = $(datadir)/backgrounds/mate/nature background_DATA =\ Aqua.jpg \ diff --git a/nature/mate-nature.xml.in.in b/nature/mate-nature.xml.in.in index 49bf9d6..20149f5 100644 --- a/nature/mate-nature.xml.in.in +++ b/nature/mate-nature.xml.in.in @@ -5,64 +5,64 @@ <!-- Translators: This is the name of a desktop background image that shows an orange/red flower. You might want to translate it into the equivalent words of your language --> <_name>Fresh Flower</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/FreshFlower.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/FreshFlower.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <!-- Translators: This is the name of a desktop background image that shows a green meadow. You might want to translate it into the equivalent words of your language --> <_name>Green Meadow</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/GreenMeadow.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/GreenMeadow.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <_name>Aqua</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/Aqua.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/Aqua.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <_name>Dune</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/Dune.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/Dune.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <_name>Storm</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/Storm.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/Storm.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <_name>Two Wings</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/TwoWings.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/TwoWings.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <_name>Lady Bird</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/LadyBird.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/LadyBird.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <_name>Blinds</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/Blinds.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/Blinds.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <_name>Rain Drops</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/RainDrops.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/RainDrops.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <_name>Yellow Flower</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/YellowFlower.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/YellowFlower.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <_name>Garden</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/Garden.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/Garden.jpg</filename> <options>zoom</options> </wallpaper> <wallpaper deleted="false"> <_name>Wood</_name> - <filename>@datadir@/pixmaps/backgrounds/mate/nature/Wood.jpg</filename> + <filename>@datadir@/backgrounds/mate/nature/Wood.jpg</filename> <options>zoom</options> </wallpaper> </wallpapers> |