aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2016-10-11 20:41:17 +0300
committerJani Välimaa <wally@mageia.org>2016-10-11 20:41:17 +0300
commite2fd3adc15d76020c16fad2f4941a374cf3c64f7 (patch)
treedf72e5ddfbf9dbb9bd1f7cf587d0075922698e7c
parented9d444bf7dece6a2e406c4b78ec8baeec536955 (diff)
parentc0a27a78afb0e9964a700ef8a8611d97ac540979 (diff)
downloadconfig-e2fd3adc15d76020c16fad2f4941a374cf3c64f7.tar
config-e2fd3adc15d76020c16fad2f4941a374cf3c64f7.tar.gz
config-e2fd3adc15d76020c16fad2f4941a374cf3c64f7.tar.bz2
config-e2fd3adc15d76020c16fad2f4941a374cf3c64f7.tar.xz
config-e2fd3adc15d76020c16fad2f4941a374cf3c64f7.zip
Merge branch 'master' of ssh://git.mageia.org/software/desktop/xfce/config
-rw-r--r--Makefile2
-rw-r--r--NEWS3
-rw-r--r--data/xfce4/terminal/terminalrc2
-rw-r--r--data/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml6
4 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index fd8e65a..0fd7209 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ NAME = mageia-xfce-config
XFCEVERSION = 4.12
MGAVERSION = 6
-RELEASE = 1
+RELEASE = 2
VERSION = $(XFCEVERSION)0.$(MGAVERSION).$(RELEASE)
diff --git a/NEWS b/NEWS
index 6df6ba2..57f76c4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
- Use TraditionalOk theme from mate-themes instead of Adwaita
- Replace pnmixer with xfce4-pulseaudio-plugin
+Version 4.120.6.2 - 2016-09-18
+- Default background symlink changed from .jpg to .png
+
Version 4.120.6.1 - 2016-08-07
- Update app menu icon (mga#18579)
- Create a new xfconf settings property for LockCommand (used in xflock4)
diff --git a/data/xfce4/terminal/terminalrc b/data/xfce4/terminal/terminalrc
index 353c6f5..48554c5 100644
--- a/data/xfce4/terminal/terminalrc
+++ b/data/xfce4/terminal/terminalrc
@@ -1,5 +1,5 @@
[Configuration]
-BackgroundImageFile=/usr/share/mga/backgrounds/default.jpg
+BackgroundImageFile=/usr/share/mga/backgrounds/default.png
BackgroundImageStyle=TERMINAL_BACKGROUND_STYLE_STRETCHED
BackgroundDarkness=0,350000
BindingBackspace=TERMINAL_ERASE_BINDING_ASCII_DELETE
diff --git a/data/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/data/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index d86f043..37e427c 100644
--- a/data/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/data/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -4,9 +4,9 @@
<property name="backdrop" type="empty">
<property name="screen0" type="empty">
<property name="monitor0" type="empty">
- <property name="image-path" type="string" value="/usr/share/backgrounds/xfce/mageia.jpg"/>
- <property name="last-image" type="string" value="/usr/share/backgrounds/xfce/mageia.jpg"/>
- <property name="last-single-image" type="string" value="/usr/share/backgrounds/xfce/mageia.jpg"/>
+ <property name="image-path" type="string" value="/usr/share/backgrounds/xfce/mageia.png"/>
+ <property name="last-image" type="string" value="/usr/share/backgrounds/xfce/mageia.png"/>
+ <property name="last-single-image" type="string" value="/usr/share/backgrounds/xfce/mageia.png"/>
<property name="image-show" type="empty"/>
<property name="brightness" type="int" value="0"/>
<property name="saturation" type="double" value="1.000000"/>