Bug#858643: Bug#864911: stretch-pu: package desktop-base/9.0.3+deb9u1
control: retitle -1 stretch-pu: package desktop-base/9.0.2+deb9u1
Le 17/06/2017 à 11:03, Aurélien COUDERC a écrit :
> Le 17/06/2017 à 09:35, Adam D. Barratt a écrit :
>> Control: tags -1 + moreinfo
>>
>> On Sat, 2017-06-17 at 00:53 +0200, Aurélien COUDERC wrote:
>>> 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.
>> What you actually appear to have attached for the smaller diff is one
>> that builds on top of 9.0.3 - i.e. the version in unstable - rather than
>> 9.0.2, which is in stretch. Could we have a diff for a package with the
>> smaller change that's built on top of stretch, please? :-)
>>
>> Regards,
>>
>> Adam
>>
> Sure, here you go.
Dear release team.
I’ve added a second bugfix that I’d like to release for stable desktop-base.
Here’s the updated changelog :
desktop-base (9.0.2+deb9u1) stretch; urgency=medium
* Ensure postinst doesn’t fails on upgrade even when an incomplete theme pack
is active. (Closes: #858643)
* Fix XML syntax errors in gnome wallpaper description files making Joy
wallpapers unavailable by default. (Closes: #862228)
-- Aurélien COUDERC <zecoucou@free.fr> Sun, 20 Aug 2017 20:03:02 +0200
The first could probably be qualified RC as attempting a reinstall will fail at
postinst if debian-edu-artwork-spacefun is installed on the system.
Both fixes have been in testing for weeks now.
The full diff is attached.
This would be my first pu so explicit advice is welcome to get it right
(distribution to target, queue…).
Cheers,
--Aurélien
diff -ur '--exclude=.svn' desktop-base_9.0.2/debian/changelog desktop-base_9.0.2+deb9u1/debian/changelog
--- desktop-base_9.0.2/debian/changelog 2017-08-20 19:50:11.179609603 +0200
+++ desktop-base_9.0.2+deb9u1/debian/changelog 2017-08-20 20:03:12.962459842 +0200
@@ -1,3 +1,12 @@
+desktop-base (9.0.2+deb9u1) stretch; urgency=medium
+
+ * Ensure postinst doesnâ??t fails on upgrade even when an incomplete theme pack
+ is active. (Closes: #858643)
+ * Fix XML syntax errors in gnome wallpaper description files making Joy
+ wallpapers unavailable by default. (Closes: #862228)
+
+ -- Aurélien COUDERC <zecoucou@free.fr> Sun, 20 Aug 2017 20:03:02 +0200
+
desktop-base (9.0.2) unstable; urgency=medium
[ Aurélien COUDERC ]
diff -ur '--exclude=.svn' desktop-base_9.0.2/debian/postinst desktop-base_9.0.2+deb9u1/debian/postinst
--- desktop-base_9.0.2/debian/postinst 2017-08-20 19:50:11.179609603 +0200
+++ desktop-base_9.0.2+deb9u1/debian/postinst 2017-08-09 22:20:11.357657845 +0200
@@ -32,10 +32,12 @@
EOF
# Use active theme as highest priority for background
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-background \
- desktop-background \
- /usr/share/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg 70
+ active_background=/usr/share/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg
+ if [ -e ${active_background} ]; then
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-background \
+ desktop-background ${active_background} 70
+ fi
# Alternatives for the background in theme packages
while read theme filename priority; do
update-alternatives --install \
@@ -76,10 +78,12 @@
# Set up an alternative for the XML version of the background
# (for GNOME)
# Highest priority for active theme
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-background.xml \
- desktop-background.xml \
- /usr/share/desktop-base/active-theme/wallpaper/gnome-background.xml 50
+ active_background_xml=/usr/share/desktop-base/active-theme/wallpaper/gnome-background.xml
+ if [ -e ${active_background_xml} ]; then
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-background.xml \
+ desktop-background.xml ${active_background_xml} 50
+ fi
# Alternatives for theme packages
while read theme priority; do
update-alternatives --install \
@@ -97,10 +101,12 @@
# Set up an alternative for the XML version of the lock screen
# (for GNOME)
# Highest priority for active theme
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-lockscreen.xml \
- desktop-lockscreen.xml \
- /usr/share/desktop-base/active-theme/lockscreen/gnome-background.xml 50
+ active_lockscreen=/usr/share/desktop-base/active-theme/lockscreen/gnome-background.xml
+ if [ -e ${active_lockscreen} ]; then
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-lockscreen.xml \
+ desktop-lockscreen.xml ${active_lockscreen} 50
+ fi
# Alternatives for theme packages
while read theme priority; do
update-alternatives --install \
@@ -116,10 +122,12 @@
# Set up an alternative for the wallpaper for Plasma 5/KDE
# Highest priority for active theme
- update-alternatives --install \
- /usr/share/wallpapers/DebianTheme \
- desktop-plasma5-wallpaper \
- /usr/share/desktop-base/active-theme/wallpaper 50
+ active_plasma_wallpaper=/usr/share/desktop-base/active-theme/wallpaper
+ if [ -e ${active_plasma_wallpaper} ]; then
+ update-alternatives --install \
+ /usr/share/wallpapers/DebianTheme \
+ desktop-plasma5-wallpaper ${active_plasma_wallpaper} 50
+ fi
# Alternatives for theme packages
while read theme priority; do
update-alternatives --install \
@@ -136,9 +144,11 @@
# Login theme
# Highest priority for active theme
- update-alternatives --install /usr/share/images/desktop-base/login-background.svg \
- desktop-login-background \
- /usr/share/desktop-base/active-theme/login/background.svg 50
+ active_login_background=/usr/share/desktop-base/active-theme/login/background.svg
+ if [ -e ${active_login_background} ]; then
+ update-alternatives --install /usr/share/images/desktop-base/login-background.svg \
+ desktop-login-background ${active_login_background} 50
+ fi
# Alternatives for theme packages
while read theme background priority; do
update-alternatives --install /usr/share/images/desktop-base/login-background.svg \
@@ -163,20 +173,23 @@
grub_first_ratio="4x3"
grub_second_ratio="16x9"
fi
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-grub.png \
- desktop-grub \
- /usr/share/desktop-base/active-theme/grub/grub-${grub_first_ratio}.png 50 \
- --slave /usr/share/desktop-base/grub_background.sh \
- desktop-grub.sh \
- /usr/share/desktop-base/active-theme/grub/grub_background.sh
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-grub.png \
- desktop-grub \
- /usr/share/desktop-base/active-theme/grub/grub-${grub_second_ratio}.png 45 \
- --slave /usr/share/desktop-base/grub_background.sh \
- desktop-grub.sh \
- /usr/share/desktop-base/active-theme/grub/grub_background.sh
+ active_grub_background=/usr/share/desktop-base/active-theme/grub/grub_background.sh
+ active_grub_first_ratio=/usr/share/desktop-base/active-theme/grub/grub-${grub_first_ratio}.png
+ if [ -e ${active_grub_first_ratio} ] && [ -e ${active_grub_background} ]; then
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-grub.png \
+ desktop-grub ${active_grub_first_ratio} 50 \
+ --slave /usr/share/desktop-base/grub_background.sh \
+ desktop-grub.sh ${active_grub_background}
+ fi
+ active_grub_second_ratio=/usr/share/desktop-base/active-theme/grub/grub-${grub_second_ratio}.png
+ if [ -e ${active_grub_second_ratio} ] && [ -e ${active_grub_background} ]; then
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-grub.png \
+ desktop-grub ${active_grub_second_ratio} 45 \
+ --slave /usr/share/desktop-base/grub_background.sh \
+ desktop-grub.sh ${active_grub_background}
+ fi
# Alternatives for theme packages
while read theme ratio priority; do
update-alternatives --install /usr/share/images/desktop-base/desktop-grub.png \
diff -ur '--exclude=.svn' desktop-base_9.0.2/joy-inksplat-theme/gnome-wp-list.xml desktop-base_9.0.2+deb9u1/joy-inksplat-theme/gnome-wp-list.xml
--- desktop-base_9.0.2/joy-inksplat-theme/gnome-wp-list.xml 2017-08-20 19:50:11.503573130 +0200
+++ desktop-base_9.0.2+deb9u1/joy-inksplat-theme/gnome-wp-list.xml 2017-08-07 23:07:18.936998563 +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 -ur '--exclude=.svn' desktop-base_9.0.2/joy-theme/gnome-wp-list.xml desktop-base_9.0.2+deb9u1/joy-theme/gnome-wp-list.xml
--- desktop-base_9.0.2/joy-theme/gnome-wp-list.xml 2017-08-20 19:50:11.179609603 +0200
+++ desktop-base_9.0.2+deb9u1/joy-theme/gnome-wp-list.xml 2017-08-07 23:07:16.692939984 +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>
Reply to: