Bug#864911: stretch-pu: package desktop-base/9.0.3+deb9u1
Control: tags -1 + pending On Tue, 2017-08-22 at 21:24 +0100, Adam D. Barratt wrote: > Control: tags -1 + confirmed > > [fixed recipients to include the bug rather than debian-release@] > > On Sun, 2017-08-20 at 20:18 +0200, Aurélien COUDERC wrote: > > 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. > > Please go ahead. Uploaded and flagged for acceptance. Regards, Adam
Bug#864911: stretch-pu: package desktop-base/9.0.3+deb9u1
Control: tags -1 + confirmed [fixed recipients to include the bug rather than debian-release@] On Sun, 2017-08-20 at 20:18 +0200, Aurélien COUDERC wrote: > 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. Please go ahead. > This would be my first pu so explicit advice is welcome to get it right > (distribution to target, queue…). The distribution is fine as is. Build the package in a stretch chroot and upload to ftp-master as usual. Regards, Adam
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 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 \
-/usr/share/images/desktop-base/desktop-lockscreen.xml \
-
Bug#864911: stretch-pu: package desktop-base/9.0.3+deb9u1
Le 25/06/2017 à 23:59, Cyril Brulebois a écrit : > Hi, > > Aurélien COUDERC (2017-06-17): >> Sure, here you go. > > (FWIW your mail client announced your attachment as us-ascii.) > > Anyway, the diff looks good to me, but we still need to see a fix reach > unstable before ACKing your upload to stretch, so not going to -moreinfo > +confirmed this bug report yet. Hi KiBi and team, the fix is now in testing in desktop-base 9.0.4. But I have a second bug I’d like to fix for stretch, where postinst can fail in some conditions. #858643 desktop-base: File not found in the post-inst script It can be triggered in stable by installing debian-edu-artwork-spacefun and apt-reinstalling desktop-base. Unlikely but bothering. This second bug is also fixed in desktop-base 9.0.5 in currently sitting in unstable. So should I make a second bugfix package 9.0.2+deb9u2 or can I reuse 9.0.2+debu1 as it wasn’t uploaded yet ? I’ll provide the debdiff depending on the preferable option. Cheers, --Aurélien signature.asc Description: OpenPGP digital signature
Bug#864911: stretch-pu: package desktop-base/9.0.3+deb9u1
Hi, Aurélien COUDERC (2017-06-17): > Sure, here you go. (FWIW your mail client announced your attachment as us-ascii.) Anyway, the diff looks good to me, but we still need to see a fix reach unstable before ACKing your upload to stretch, so not going to -moreinfo +confirmed this bug report yet. KiBi. signature.asc Description: Digital signature
Bug#864911: stretch-pu: package desktop-base/9.0.3+deb9u1
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. Cheers ! --Aurélien diff -Nru desktop-base-9.0.2/debian/changelog desktop-base-9.0.2+deb9u1/debian/changelog --- desktop-base-9.0.2/debian/changelog 2017-01-24 23:32:47.0 +0100 +++ desktop-base-9.0.2+deb9u1/debian/changelog 2017-06-16 23:43:04.0 +0200 @@ -1,3 +1,10 @@ +desktop-base (9.0.2+deb9u1) stretch; urgency=medium + + * Fix XML syntax errors in gnome wallpaper description files making Joy +wallpapers unavailable by default. (Closes: #862228) + + -- Aurélien COUDERC Fri, 16 Jun 2017 23:43:04 +0200 + desktop-base (9.0.2) unstable; urgency=medium [ Aurélien COUDERC ] diff -Nru 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-01-24 23:32:47.0 +0100 +++ desktop-base-9.0.2+deb9u1/joy-inksplat-theme/gnome-wp-list.xml 2017-06-16 23:43:04.0 +0200 @@ -3,7 +3,6 @@ - Joy Inksplat /usr/share/desktop-base/joy-inksplat-theme/wallpaper/gnome-background.xml zoom diff -Nru 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-01-24 23:32:47.0 +0100 +++ desktop-base-9.0.2+deb9u1/joy-theme/gnome-wp-list.xml 2017-06-16 23:43:04.0 +0200 @@ -3,7 +3,6 @@ - Joy /usr/share/desktop-base/joy-theme/wallpaper/gnome-background.xml zoom
Bug#864911: stretch-pu: package desktop-base/9.0.3+deb9u1
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
Bug#864911: stretch-pu: package desktop-base/9.0.3+deb9u1
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.0 +0100
+++ desktop-base-9.0.3/debian/changelog 2017-01-30 22:21:40.0 +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 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.0 +0100
+++ desktop-base-9.0.3/debian/preinst 2017-01-30 22:21:40.0 +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 \
-
