Bug#858643: Bug#864911: stretch-pu: package desktop-base/9.0.3+deb9u1

[Aurélien COUDERC]

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   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   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 \
-

Processed: Re: Bug#864911: stretch-pu: package desktop-base/9.0.3+deb9u1

[Debian Bug Tracking System]

Processing control commands:

> retitle -1 stretch-pu: package desktop-base/9.0.2+deb9u1
Bug #858643 {Done: Aurélien COUDERC } [desktop-base] 
desktop-base: File not found in the post-inst script
Changed Bug title to 'stretch-pu: package desktop-base/9.0.2+deb9u1' from 
'desktop-base: File not found in the post-inst script'.

-- 
858643: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858643
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems