[neon/forks/ubuntu-release-upgrader/Neon/ubuntu/focal_archive] /: drop gnome-software-plugin-snap forced obsoletion as it didn't work out well.

[Brian Murray]

Git commit cc15ee5e15a0b1ec20aec50d6b8dd7c03c3b90c7 by Brian Murray.
Committed on 06/10/2020 at 23:58.
Pushed by sitter into branch 'Neon/ubuntu/focal_archive'.

drop gnome-software-plugin-snap forced obsoletion as it didn't work out well.

M  +1    -1    data/DistUpgrade.cfg.bionic
M  +0    -4    debian/changelog

https://invent.kde.org/neon/forks/ubuntu-release-upgrader/commit/cc15ee5e15a0b1ec20aec50d6b8dd7c03c3b90c7

diff --git a/data/DistUpgrade.cfg.bionic b/data/DistUpgrade.cfg.bionic
index aa45625d..452c7216 100644
--- a/data/DistUpgrade.cfg.bionic
+++ b/data/DistUpgrade.cfg.bionic
@@ -48,7 +48,7 @@ EnableApport=yes
 KeyDependencies=lightdm, unity, ubuntu-artwork, ubuntu-sounds
 # those pkgs will be marked remove right after the distUpgrade in the cache
 PostUpgradeRemove=gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
-ForcedObsoletes=desktop-effects, gnome-app-install, policykit-gnome, gnome-mount, gnome-software-plugin-snap
+ForcedObsoletes=desktop-effects, gnome-app-install, policykit-gnome, gnome-mount
 
 [kubuntu-desktop]
 KeyDependencies=plasma-desktop, kubuntu-settings-desktop
diff --git a/debian/changelog b/debian/changelog
index 7375b3c1..64f87e58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
 ubuntu-release-upgrader (1:20.04.27) focal; urgency=medium
 
-  * data/DistUpgrade.cfg.bionic: Add gnome-software-plugin-snap to
-    ForcedObsoletes for ubuntu-desktop and ubuntukylin-desktop only. This
-    allows multiple packages to be offered for removal after the upgrade
-    completes. (LP: #1894919) 
 
  -- Brian Murray <brian at ubuntu.com>  Wed, 09 Sep 2020 11:27:27 -0700