Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu
Dear release team,
I’d like to push a fix for desktop-base bug #862228 that makes some wallpapers
unavailable by default due to a syntax error in their XML descriptor.
This fix is made of 2 trivial oneliners.
I’m proposing a patch based on desktop-base 9.0.3 that was sitting in unstable
since March 23rd without any other new bug being raised.
The diff from stretch’s 9.0.2 to 9.0.3 is a bit bigger and cleans some not-so-
nice scripting in maintainer scripts in the hope of making them more
understandable and maintenable.
As I understand you may not want these additional changes, I’m attaching the
two debdiffs separately.
If the bigger diff isn’t suitable I’ll prepare an upload with the fix to
#862228 alone.
Thank you,
--Aurélien
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (500, 'testing'), (150, 'unstable'), (100, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr
(charmap=UTF-8)
diff -Nru desktop-base-9.0.2/debian/changelog
desktop-base-9.0.3/debian/changelog
--- desktop-base-9.0.2/debian/changelog 2017-01-24 23:32:47.000000000 +0100
+++ desktop-base-9.0.3/debian/changelog 2017-01-30 22:21:40.000000000 +0100
@@ -1,3 +1,18 @@
+desktop-base (9.0.3) unstable; urgency=medium
+
+ * Fix a few problems in maintainer scripts, thanks Raphaël Hertzog for the
+ detailed review.
+ No change in behaviour but it will make the scripts more readable and
+ maintainable.
+ - preinst: reorganize if conditions for package version detection in a
+ readable order.
+ - prerm: remove references to non existing $priority variable in loops.
+ - prerm: no need to remove secondary alternatives just before removing
+ a main alternative. Secondary are removed in the process anyway.
+ (Closes: #853224)
+
+ -- Aurélien COUDERC <zecou...@free.fr> Mon, 30 Jan 2017 22:21:40 +0100
+
desktop-base (9.0.2) unstable; urgency=medium
[ Aurélien COUDERC ]
diff -Nru desktop-base-9.0.2/debian/preinst desktop-base-9.0.3/debian/preinst
--- desktop-base-9.0.2/debian/preinst 2017-01-24 23:32:47.000000000 +0100
+++ desktop-base-9.0.3/debian/preinst 2017-01-30 22:21:40.000000000 +0100
@@ -6,6 +6,39 @@
if [ "${1}" = "upgrade" ]; then
if dpkg --compare-versions ${2} le "9.0.0~exp1"; then
+ # Remove alternative for desktop splash we don’t ship anymore
+ update-alternatives --remove-all desktop-splash
+
+ # Remove alternatives for themes we now ship elsewhere as a theme pack
+ ## Wallpaper
+ for background in \
+ lines-wallpaper_1280x1024.svg \
+ lines-wallpaper_1600x1200.svg \
+ lines-wallpaper_1920x1200.svg \
+ lines-wallpaper_2560x1080.svg \
+ lines-wallpaper_1920x1080.svg \
+ ; do
+ update-alternatives --remove desktop-background
/usr/share/images/desktop-base/$background
+ done
+ update-alternatives --remove \
+ desktop-background.xml \
+ /usr/share/images/desktop-base/lines.xml
+ ## Login background
+ update-alternatives --remove desktop-login-background \
+ /usr/share/desktop-base/lines-theme/login-background.svg
+ update-alternatives --remove desktop-login-background \
+ /usr/share/desktop-base/lines-theme/login-background-with-logo.svg
+
+ ## Grub background
+ while read background; do
+ update-alternatives --remove \
+ desktop-grub \
+ /usr/share/images/desktop-base/$background
+ done << EOF
+lines-grub.png
+lines-grub-1920x1080.png
+EOF
+
# Remove alternatives for moreblue wallpapers we don’t ship anymore
while read background; do
update-alternatives --remove \
@@ -50,69 +83,32 @@
spacefun-grub.png
spacefun-grub-widescreen.png
EOF
- if dpkg --compare-versions ${2} ge "9.0.0~exp1"; then
- echo "ge 9.0.0~exp1"
- # Remove alternatives shipped in 9.0.0~exp1 but now integrated
- # into the theme pack system.
- # Joy old theme structure
+ fi
+
+ if dpkg --compare-versions ${2} eq "9.0.0~exp1"; then
+ # Remove alternatives shipped in 9.0.0~exp1 but now integrated
+ # into the theme pack system.
+ # Joy old theme structure
+ update-alternatives --remove \
+ desktop-login-background \
+ /usr/share/desktop-base/joy-theme/login-background.svg
+ # Remove login theme alternatives for theme packages
+ # because we’re dropping the secondary link for SDDM preview
+ while read theme background; do
update-alternatives --remove \
desktop-login-background \
- /usr/share/desktop-base/joy-theme/login-background.svg
- # Remove login theme alternatives for theme packages
- # because we’re dropping the secondary link for SDDM preview
- while read theme background; do
- update-alternatives --remove \
- desktop-login-background \
- /usr/share/desktop-base/$theme-theme/login/$background
- done << EOF
+ /usr/share/desktop-base/$theme-theme/login/$background
+ done << EOF
softwaves background.svg
lines background.svg
lines background-nologo.svg
joy background.svg
spacefun background.svg
EOF
- # *Last* remove *highest priority* alternative for active theme
- update-alternatives --remove \
- desktop-login-background \
- /usr/share/desktop-base/active-theme/login/background.svg
- fi
-
- fi
-
- if dpkg --compare-versions ${2} lt "9.0.0~"; then
- # Remove alternative for desktop splash we don’t ship anymore
- update-alternatives --remove-all desktop-splash
-
- # Remove alternatives for themes we now ship elsewhere as a theme pack
- ## Wallpaper
- for background in \
- lines-wallpaper_1280x1024.svg \
- lines-wallpaper_1600x1200.svg \
- lines-wallpaper_1920x1200.svg \
- lines-wallpaper_2560x1080.svg \
- lines-wallpaper_1920x1080.svg \
- ; do
- update-alternatives --remove desktop-background
/usr/share/images/desktop-base/$background
- done
+ # *Last* remove *highest priority* alternative for active theme
update-alternatives --remove \
- desktop-background.xml \
- /usr/share/images/desktop-base/lines.xml
- ## Login background
- update-alternatives --remove desktop-login-background \
- /usr/share/desktop-base/lines-theme/login-background.svg
- update-alternatives --remove desktop-login-background \
- /usr/share/desktop-base/lines-theme/login-background-with-logo.svg
-
- ## Grub background
- while read background; do
- update-alternatives --remove \
- desktop-grub \
- /usr/share/images/desktop-base/$background
- done << EOF
-lines-grub.png
-lines-grub-1920x1080.png
-EOF
+ desktop-login-background \
+ /usr/share/desktop-base/active-theme/login/background.svg
fi
-
fi
diff -Nru desktop-base-9.0.2/debian/prerm desktop-base-9.0.3/debian/prerm
--- desktop-base-9.0.2/debian/prerm 2017-01-24 23:32:47.000000000 +0100
+++ desktop-base-9.0.3/debian/prerm 2017-01-30 22:21:40.000000000 +0100
@@ -9,7 +9,7 @@
while read theme filename; do
update-alternatives --remove \
desktop-background \
-
/usr/share/desktop-base/$theme-theme/wallpaper/contents/images/$filename
$priority
+
/usr/share/desktop-base/$theme-theme/wallpaper/contents/images/$filename
done << EOF
softwaves 1024x768.svg
softwaves 1280x720.svg
@@ -48,7 +48,7 @@
while read theme; do
update-alternatives --remove \
desktop-background.xml \
-
/usr/share/desktop-base/$theme-theme/wallpaper/gnome-background.xml $priority
+ /usr/share/desktop-base/$theme-theme/wallpaper/gnome-background.xml
done << EOF
softwaves
lines
@@ -66,7 +66,7 @@
while read theme; do
update-alternatives --remove \
desktop-lockscreen.xml \
-
/usr/share/desktop-base/$theme-theme/lockscreen/gnome-background.xml $priority
+
/usr/share/desktop-base/$theme-theme/lockscreen/gnome-background.xml
done << EOF
softwaves
lines
@@ -115,24 +115,9 @@
desktop-login-background \
/usr/share/desktop-base/active-theme/login/background.svg
- # Remove GRUB alternatives
- # Remove alternative for the GRUB background/colors config
- while read theme priority; do
- update-alternatives --remove \
- desktop-grub.sh \
- /usr/share/desktop-base/$theme-theme/grub/grub_background.sh
- done << EOF
-softwaves
-lines
-joy
-spacefun
-EOF
- # Remove background alternatives
+ # Remove GRUB background alternatives
while read theme ratio; do
update-alternatives --remove \
- desktop-grub.sh \
- /usr/share/desktop-base/$theme-theme/grub/grub_background.sh
- update-alternatives --remove \
desktop-grub \
/usr/share/desktop-base/$theme-theme/grub/grub-$ratio.png
done << EOF
diff -Nru desktop-base-9.0.3/debian/changelog
desktop-base-9.0.3+deb9u1/debian/changelog
--- desktop-base-9.0.3/debian/changelog 2017-01-30 22:21:40.000000000 +0100
+++ desktop-base-9.0.3+deb9u1/debian/changelog 2017-06-16 23:43:04.000000000
+0200
@@ -1,3 +1,10 @@
+desktop-base (9.0.3+deb9u1) stretch; urgency=medium
+
+ * Fix XML syntax errors in gnome wallpaper description files making Joy
+ wallpapers unavailable by default. (Closes: #862228)
+
+ -- Aurélien COUDERC <zecou...@free.fr> Fri, 16 Jun 2017 23:43:04 +0200
+
desktop-base (9.0.3) unstable; urgency=medium
* Fix a few problems in maintainer scripts, thanks Raphaël Hertzog for the
diff -Nru desktop-base-9.0.3/joy-inksplat-theme/gnome-wp-list.xml
desktop-base-9.0.3+deb9u1/joy-inksplat-theme/gnome-wp-list.xml
--- desktop-base-9.0.3/joy-inksplat-theme/gnome-wp-list.xml 2017-01-30
22:21:40.000000000 +0100
+++ desktop-base-9.0.3+deb9u1/joy-inksplat-theme/gnome-wp-list.xml
2017-06-16 23:41:23.000000000 +0200
@@ -3,7 +3,6 @@
<wallpapers>
<wallpaper>
<!-- don't include words such as "wallpaper" (avoids translations) -->
- <wallpaper>
<name>Joy Inksplat</name>
<filename>/usr/share/desktop-base/joy-inksplat-theme/wallpaper/gnome-background.xml</filename>
<options>zoom</options>
diff -Nru desktop-base-9.0.3/joy-theme/gnome-wp-list.xml
desktop-base-9.0.3+deb9u1/joy-theme/gnome-wp-list.xml
--- desktop-base-9.0.3/joy-theme/gnome-wp-list.xml 2017-01-30
22:21:40.000000000 +0100
+++ desktop-base-9.0.3+deb9u1/joy-theme/gnome-wp-list.xml 2017-06-16
23:43:04.000000000 +0200
@@ -3,7 +3,6 @@
<wallpapers>
<wallpaper>
<!-- don't include words such as "wallpaper" (avoids translations) -->
- <wallpaper>
<name>Joy</name>
<filename>/usr/share/desktop-base/joy-theme/wallpaper/gnome-background.xml</filename>
<options>zoom</options>
