Merge ~xubuntu-dev/ubuntu-seeds/+git/xubuntu:seed-catchup into ~xubuntu-dev/ubuntu-seeds/+git/xubuntu:noble

[Sean Davis]

Refresh Xubuntu seeds based on shared Ubuntu seed

diff --git a/blacklist b/blacklist
index 3c90e77..e2fea0e 100644
--- a/blacklist
+++ b/blacklist
@@ -1,7 +1,9 @@
 # blacklist: misc
 # Packages which are pulled in incidentally (typically by build-dependencies)
 # and could be trivially replaced with something that we ship
-# If you add to this list explain why a package is blacklisted.
+
+# various build-depends, pulls in lua, consider standarizing html->text
+#elinks
 
 # blacklist: security
 #
@@ -16,6 +18,8 @@ apache
 
 ## Packages which haven't shown up yet; make sure they don't sneak in
 
+# mdz, 2004-06-14: many, many bugs and unmaintained (both debian and upstream)
+metamail
 # mdz, 2004-06-14: lots of DoS and other badness, CAN-2003-0946, CAN-2004-0270,
 # debian#209084
 clamav
@@ -32,5 +36,4 @@ unity-control-center
 unity-greeter
 
 # blacklist other libreoffice themes until lp #1483914 is sorted
-libreoffice-style-human
 libreoffice-style-tango
 \ No newline at end of file
diff --git a/desktop b/desktop
index 9c0f11d..3547aa4 100644
--- a/desktop
+++ b/desktop
@@ -20,7 +20,6 @@ Task-Seeds: desktop-common desktop-minimal
 
 Basic network services and Windows integration.
 
- * (network-manager-pptp)
  * (network-manager-pptp-gnome)
 
 == GUI infrastructure ==
@@ -35,20 +34,15 @@ Basic network services and Windows integration.
  * (appstream)                  # required by snap:snap-store for appstream cache
  * (apt-config-icons-hidpi)     # required by snap:snap-store for apt icons
  * (baobab)
- * (desktop-file-utils)
  * (gnome-disk-utility)
  * (gnome-font-viewer)
- * (gnome-system-tools)
- * (gvfs-backends)              # otherwise no network tab
  * (gvfs-fuse)                  # let non-GNOME apps see GVFS via fuse
  * language-selector-gnome      # MichaelVogt
  * (rhythmbox)
- * (system-config-printer)
  * (transmission-gtk)           # simple GNOME frontend for bittorrent downloads
  * update-manager
  * (update-notifier)
  * (whoopsie)                   # http://wiki.ubuntu.com/ErrorTracker
- * (xul-ext-ubufox)             # ubuntu firefox tweaks - AlexanderSack
  * zenity
 
 === Xfce core ===
@@ -84,12 +78,14 @@ Basic network services and Windows integration.
  * (blueman)
  * (catfish)
  * (gimp)
+ * (gnome-system-tools)
  * (hexchat)
  * (lightdm-gtk-greeter-settings)
  * (menulibre)                      # menu editor
  * (mousepad)
  * (mugshot)                        # user config
  * (simple-scan)
+ * (system-config-printer)
  * (thunderbird) [!s390x]
 
 === LibreOffice ===
diff --git a/desktop-minimal b/desktop-minimal
index 7081d47..aa3b235 100644
--- a/desktop-minimal
+++ b/desktop-minimal
@@ -30,11 +30,8 @@ Basic network services and Windows integration.
 == Desktop Xfce Apps ==
 
 === Common with Ubuntu ===
- * (gucharmap)                      # SebastienBacher
  * initramfs-tools                  # LP: #2054341
  * (libpam-gnome-keyring)
- * lightdm                          # Proposed GDM replacement for Oneiric, see https://blueprints.launchpad.net/ubuntu/+spec/desktop-o-lightdm
- * (pinentry-gtk2)                  # for gnome-keyring, LP: #1473952
  * (software-properties-gtk)        # default GUI sources.list editor / extra drivers
  * xdg-utils                        # useful utilities
  * xdg-user-dirs
@@ -59,6 +56,7 @@ Basic network services and Windows integration.
  * (xfce4-whiskermenu-plugin)
 
 === Other Desktop GUI Apps ===
+ * (gucharmap)                      # SebastienBacher
  * (pavucontrol)                    # mixer
  * (synaptic)
 
@@ -84,11 +82,13 @@ Basic network services and Windows integration.
  * (xserver-xorg-input-all)         # Metapackage for input methods
 
 == Other ==
+ * (dbus-x11)                       # LP: 2009145, Temporary to fix xdg settings
  * (libfuse2)                       # LP: 1965636, Required for AppImage support
+ * lightdm
  * lightdm-gtk-greeter
+ * (mate-polkit)                    # policykit-1-gnome is no longer supported
+ * (pinentry-gtk2)                  # for gnome-keyring, LP: #1473952
  * (xcape)
  * (xfce4-screensaver)
- * (dbus-x11)                       # LP: 2009145, Temporary to fix xdg settings
- * (mate-polkit)                    # policykit-1-gnome is no longer supported
  * xubuntu-desktop-minimal          # metapackage for everything here
  * xubuntu-default-settings
diff --git a/live b/live
index f231be1..0e594b3 100644
--- a/live
+++ b/live
@@ -23,7 +23,6 @@ Task-Seeds: live-common
  * language-pack-gnome-${Languages}
 
 # subset of English language support which we want by default:
- * firefox-locale-en
  * hunspell-en-us
  * wamerican
 
diff --git a/ship-live b/ship-live
index 334718f..4a52249 100644
--- a/ship-live
+++ b/ship-live
@@ -9,20 +9,14 @@ packages.
 == Hardware & Network Access ==
 
  * b43-fwcutter
- * bcmwl-kernel-source              # since we no longer have LRM
- * bpalogin
  * libatm1                          # suggested by ppp for PPP-over-ATM
- * mouseemu                         # needed on Macs with single-button mice
  * pptp-linux                       # client for Microsoft-compatible VPN's, needed for some ISPs
  * setserial                        # needed by folks with nonstandard serial ports
  * sl-modem-daemon                  # needed for some Winmodems (see OutoftheboxWinmodem)
- * wvdial                           # network-manager should replace this functionality ASAP
 
 == Installer ==
 
  * grub-efi-arm64 [arm64]
- * lupin-support [amd64 i386]       # installer-for-windows
- * oem-config-gtk
 
 == Blacklist ==