Merge remote-tracking branch 'origin/kali/master' into kali/master

debian/kali-themes.gsettings-override

@@ -24,11 +24,11 @@ monospace-font-name='Fira Code Medium 10'
 # kali-desktop-base is not required)
 [org.gnome.desktop.background]
 picture-options='zoom'
-picture-uri='file:///usr/share/wallpapers/KaliLogo/gnome-background.xml'
+picture-uri='file:///usr/share/backgrounds/kali/kali-logo.xml'
 
 [org.gnome.desktop.screensaver]
 picture-options='zoom'
-picture-uri='file:///usr/share/wallpapers/KaliLight/gnome-background.xml'
+picture-uri='file:///usr/share/backgrounds/kali/kali-light.xml'
 
 [org.gnome.gedit.preferences.editor]
 scheme='Kali-Dark'

debian/update-maintainer-scripts

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-update_script() {
-	local script=$1
-	(
-	sed -n -e '1,/^FILES_TO_DIVERT="/ p' $script
-	cat files-to-divert
-	sed -n -e '/^" # END FILES_TO_DIVERT/,$ p' $script
-	) > $script.new
-	mv $script.new $script
-}
-
-update_script debian/kali-themes.preinst
-update_script debian/kali-themes.postinst
-update_script debian/kali-themes.postrm