Link desktop-background.xml alternative to Lines by default

This commit is contained in:
Aurélien COUDERC
2014-12-05 23:02:22 +00:00
parent 3fc56eba6a
commit f344f0de47
6 changed files with 34 additions and 9 deletions

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

+12
View File
@@ -0,0 +1,12 @@
<background>
<static>
<duration>8640000.0</duration>
<file>
<size width="1280" height="1024">/usr/share/images/desktop-base/lines-wallpaper_1280x1024.svg</size>
<size width="1600" height="1200">/usr/share/images/desktop-base/lines-wallpaper_1600x1200.svg</size>
<size width="1920" height="1080">/usr/share/images/desktop-base/lines-wallpaper_1920x1080.svg</size>
<size width="1920" height="1200">/usr/share/images/desktop-base/lines-wallpaper_1920x1200.svg</size>
<size width="2560" height="1080">/usr/share/images/desktop-base/lines-wallpaper_2560x1080.svg</size>
</file>
</static>
</background>
+2
View File
@@ -9,6 +9,8 @@ desktop-base (8.0.0~exp2) UNRELEASED; urgency=medium
- Add KDE wallpaper.
* Fix incorrect icon references in desktop files.
(Closes: #607838, #628116, #628146)
* Link desktop-background.xml alternative to Lines by default.
(Closes: #766232)
-- Aurélien COUDERC <zecoucou@free.fr> Wed, 03 Dec 2014 10:37:16 +0100
+11 -6
View File
@@ -19,8 +19,8 @@ if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
desktop-background \
/usr/share/images/desktop-base/$background $priority
done << EOF
lines-wallpaper_1280_1024.svg 65
lines-wallpaper_1600_1200.svg 65
lines-wallpaper_1280x1024.svg 65
lines-wallpaper_1600x1200.svg 65
lines-wallpaper_1920x1080.svg 70
lines-wallpaper_1920x1200.svg 65
lines-wallpaper_2560x1080.svg 65
@@ -39,10 +39,15 @@ EOF
# Set up an alternative for the XML version of the background
# (for GNOME)
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background.xml \
desktop-background.xml \
/usr/share/images/desktop-base/joy.xml 10
while read desktopbackground priority; do
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background.xml \
desktop-background.xml \
/usr/share/images/desktop-base/$desktopbackground $priority
done << EOF
lines.xml 20
joy.xml 10
EOF
# Alternatives for the splash
while read splash priority; do
+9 -3
View File
@@ -6,8 +6,8 @@ set -e
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
# remove background alternatives
for background in \
lines-wallpaper_1280_1024.svg \
lines-wallpaper_1600_1200.svg \
lines-wallpaper_1280x1024.svg \
lines-wallpaper_1600x1200.svg \
lines-wallpaper_1920x1080.svg \
lines-wallpaper_1920x1200.svg \
lines-wallpaper_2560x1080.svg \
@@ -26,7 +26,13 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
; do
update-alternatives --remove desktop-background /usr/share/images/desktop-base/$background
done
update-alternatives --remove desktop-background.xml /usr/share/images/desktop-base/joy.xml
# remove desktop-background.xml alternatives
for desktopbackground in \
lines.xml \
joy.xml \
; do
update-alternatives --remove desktop-background.xml /usr/share/images/desktop-base/$desktopbackground
done
# remove splash alternatives
for splash in \