[Merge] ~didrocks/ubuntu/+source/gnome-shell:yaru-as-default into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master

[Iain Lane]

Thanks!

Just FYI: I've just pushed 3.29.90 which is going to make this need to be rebased. :-)

I made a suggestion in the diff about possibly avoiding re-running the update-alternatives removal multiple times for considering.

Diff comments:

> diff --git a/debian/gnome-shell-common.prerm b/debian/gnome-shell-common.prerm
> index fb5f103..4c1b435 100644
> --- a/debian/gnome-shell-common.prerm
> +++ b/debian/gnome-shell-common.prerm
> @@ -3,7 +3,10 @@
>  set -e
>  
>  if [ "$1" = "remove" ]; then
> -  update-alternatives --remove gdm3.css /usr/share/gnome-shell/theme/ubuntu.css
> +  update-alternatives --remove gdm3.css /usr/share/gnome-shell/theme/gnome-shell.css
>  fi
>  
> +# Remove older deprecated theme. Can be removed post 20.04
> +update-alternatives --remove gdm3.css /usr/share/gnome-shell/theme/ubuntu.css || true

A suggestion:

This is going to be called on every upgrade and twice when removing (remove and purge) - if we move it into the "remove" block and duplicate the same code into the preinst ([ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl version-which-contained-this-fix AFAIK) then we can make it be called only once.

> +
>  #DEBHELPER#


-- 
https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/350925
Your team Ubuntu Desktop is requested to review the proposed merge of ~didrocks/ubuntu/+source/gnome-shell:yaru-as-default into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.