diff --git a/backgrounds/lines-wallpaper_1280_1024.svg b/backgrounds/lines-wallpaper_1280x1024.svg similarity index 100% rename from backgrounds/lines-wallpaper_1280_1024.svg rename to backgrounds/lines-wallpaper_1280x1024.svg diff --git a/backgrounds/lines-wallpaper_1600_1200.svg b/backgrounds/lines-wallpaper_1600x1200.svg similarity index 100% rename from backgrounds/lines-wallpaper_1600_1200.svg rename to backgrounds/lines-wallpaper_1600x1200.svg diff --git a/backgrounds/lines.xml b/backgrounds/lines.xml new file mode 100644 index 0000000..4b834eb --- /dev/null +++ b/backgrounds/lines.xml @@ -0,0 +1,12 @@ + + + 8640000.0 + + /usr/share/images/desktop-base/lines-wallpaper_1280x1024.svg + /usr/share/images/desktop-base/lines-wallpaper_1600x1200.svg + /usr/share/images/desktop-base/lines-wallpaper_1920x1080.svg + /usr/share/images/desktop-base/lines-wallpaper_1920x1200.svg + /usr/share/images/desktop-base/lines-wallpaper_2560x1080.svg + + + diff --git a/debian/changelog b/debian/changelog index f74fa04..8bcc3cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 03 Dec 2014 10:37:16 +0100 diff --git a/debian/postinst b/debian/postinst index d26dac3..72ce994 100644 --- a/debian/postinst +++ b/debian/postinst @@ -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 diff --git a/debian/prerm b/debian/prerm index 226cc35..5d63000 100644 --- a/debian/prerm +++ b/debian/prerm @@ -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 \