Bug#1040739: bullseye-pu: package desktop-base/12.0.6+nmu1~deb12u1

2023-07-11 Thread Adam D. Barratt
Control: tags -1 + confirmed

On Sun, 2023-07-09 at 23:49 +0200, Andreas Beckmann wrote:
> When the emeral theme was added to the alternatives, it was forgotten
> to
> add that to the alternatives removal, too.
> 
> [ Impact ]
> Leaving broken alternatives after package removal, probably only
> noticable by QA tooling.
> 

Please go ahead.

Regards,

Adam



Bug#1040739: bullseye-pu: package desktop-base/12.0.6+nmu1~deb12u1

2023-07-09 Thread Andreas Beckmann
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian@packages.debian.org
Usertags: pu

[ Reason ]
When the emeral theme was added to the alternatives, it was forgotten to
add that to the alternatives removal, too.

[ Impact ]
Leaving broken alternatives after package removal, probably only
noticable by QA tooling.

[ Tests ]
local piuparts tests of all bullseye->bookworm upgrades that have
desktop-base installed, using the new package version in the bookworm
upgrade target.

[ Risks ]
low, alternatives addition/removal is using for loops, this patch
just adds some entries to each of the removal loops

[ Checklist ]
  [*] *all* changes are documented in the d/changelog
  [*] I reviewed all changes and I approve them
  [*] attach debdiff against the package in (old)stable
  [ ] the issue is verified as fixed in unstable
  the NMU will come out of DELAYED in 12 hours

[ Changes ]
prerm: remove all emerald alternatives created by the postinst

[ Other info ]
This is a rebuild of the package (soon) from sid with no further
changes.


Andreas
diff -Nru desktop-base-12.0.6/debian/changelog 
desktop-base-12.0.6+nmu1~deb12u1/debian/changelog
--- desktop-base-12.0.6/debian/changelog2023-04-13 21:58:23.0 
+0200
+++ desktop-base-12.0.6+nmu1~deb12u1/debian/changelog   2023-07-09 
23:27:38.0 +0200
@@ -1,3 +1,16 @@
+desktop-base (12.0.6+nmu1~deb12u1) bookworm; urgency=medium
+
+  * Rebuild for bookworm.
+
+ -- Andreas Beckmann   Sun, 09 Jul 2023 23:27:38 +0200
+
+desktop-base (12.0.6+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * prerm: Remove the emerald alternatives, too.  (Closes: #1035431)
+
+ -- Andreas Beckmann   Fri, 30 Jun 2023 12:36:56 +0200
+
 desktop-base (12.0.6) unstable; urgency=medium
 
   * Fix LUKS password not being shown in multi-screen setup with mixed aspect
diff -Nru desktop-base-12.0.6/debian/prerm 
desktop-base-12.0.6+nmu1~deb12u1/debian/prerm
--- desktop-base-12.0.6/debian/prerm2022-10-02 21:24:41.0 +0200
+++ desktop-base-12.0.6+nmu1~deb12u1/debian/prerm   2023-06-30 
12:36:11.0 +0200
@@ -16,6 +16,7 @@
 desktop-background \
 
/usr/share/desktop-base/$theme-theme/wallpaper/contents/images/$filename
 done << EOF
+emerald 1920x1080.svg
 homeworld 1920x1080.svg
 futureprototype 1920x1080.svg
 moonlight 1920x1080.svg
@@ -58,6 +59,7 @@
 desktop-background.xml \
 /usr/share/desktop-base/$theme-theme/wallpaper/gnome-background.xml
 done << EOF
+emerald
 homeworld
 futureprototype
 moonlight
@@ -79,6 +81,7 @@
 desktop-lockscreen.xml \
 
/usr/share/desktop-base/$theme-theme/lockscreen/gnome-background.xml
 done << EOF
+emerald
 homeworld
 futureprototype
 moonlight
@@ -99,6 +102,7 @@
 desktop-plasma5-wallpaper \
 /usr/share/desktop-base/$theme-theme/wallpaper
 done << EOF
+emerald
 homeworld
 futureprototype
 moonlight
@@ -121,6 +125,7 @@
 desktop-login-background \
 /usr/share/desktop-base/$theme-theme/login/$background
 done << EOF
+emerald background.svg
 homeworld background.svg
 futureprototype background.svg
 moonlight background.svg
@@ -141,6 +146,8 @@
 desktop-grub \
 /usr/share/desktop-base/$theme-theme/grub/grub-$ratio.png
 done << EOF
+emerald 4x3
+emerald 16x9
 homeworld 4x3
 homeworld 16x9
 futureprototype 4x3
@@ -182,6 +189,7 @@
 desktop-theme \
 /usr/share/desktop-base/$theme-theme
 done << EOF
+emerald
 futureprototype
 moonlight
 softwaves