From 69f985d14dbd54d9d3551b88677498086a22ca3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Tue, 24 Mar 2020 16:30:29 +0100 Subject: [PATCH] Revert "Fix desktop-base maintainer scripts" This reverts commit 380c35c31dc66492c23d5376bb00b652d24783cc. --- debian/kali-desktop-base.postinst | 21 ------------------- debian/kali-desktop-base.prerm | 8 +++---- ...ainer-scripts => update-maintainer-scripts | 0 3 files changed, 4 insertions(+), 25 deletions(-) rename debian/update-maintainer-scripts => update-maintainer-scripts (100%) diff --git a/debian/kali-desktop-base.postinst b/debian/kali-desktop-base.postinst index 94abe576..87a9d2d6 100644 --- a/debian/kali-desktop-base.postinst +++ b/debian/kali-desktop-base.postinst @@ -154,27 +154,6 @@ EOF update-alternatives --remove \ desktop-grub \ /usr/share/desktop-base/kali-theme/grub/grub-16x9.png - - elif dpkg --compare-versions "$2" lt-nl "2020.2.1"; then - # Remove desktop background alternatives - update-alternatives --remove \ - desktop-background \ - /usr/share/backgrounds/kali/kali-logo-16x9.png - - # Remove XML version of the background alternatives - update-alternatives --remove \ - desktop-background.xml \ - /usr/share/backgrounds/kali/kali-logo.xml - - # Remove login background alternatives - update-alternatives --remove \ - desktop-login-background \ - /usr/share/backgrounds/kali/kali-light.svg - - # Remove XML version of the login background alternatives - update-alternatives --remove \ - desktop-lockscreen.xml \ - /usr/share/backgrounds/kali/kali-light.xml fi fi diff --git a/debian/kali-desktop-base.prerm b/debian/kali-desktop-base.prerm index 118cd523..c3e2e28a 100644 --- a/debian/kali-desktop-base.prerm +++ b/debian/kali-desktop-base.prerm @@ -10,17 +10,17 @@ if [ "$1" = "remove" ]; then # Remove background alternatives for theme packages update-alternatives --remove \ desktop-background \ - /usr/share/wallpapers/KaliLogo/contents/images/kali-logo-16x9.png + /usr/share/backgrounds/kali/kali-logo-16x9.png # Remove desktop-background.xml alternatives update-alternatives --remove \ desktop-background.xml \ - /usr/share/wallpapers/KaliLogo/gnome-background.xml + /usr/share/backgrounds/kali/kali-logo.xml # Remove desktop-lockscreen.xml alternatives update-alternatives --remove \ desktop-lockscreen.xml \ - /usr/share/wallpapers/KaliLight/gnome-background.xml + /usr/share/backgrounds/kali/kali-light.xml # Remove Plasma 5/KDE wallpaper alternatives update-alternatives --remove \ @@ -30,7 +30,7 @@ if [ "$1" = "remove" ]; then # Remove login theme alternatives update-alternatives --remove \ desktop-login-background \ - /usr/share/wallpapers/KaliLight/contents/kali-light.svg + /usr/share/backgrounds/kali/kali-light.svg # Remove GRUB alternatives update-alternatives --remove \ diff --git a/debian/update-maintainer-scripts b/update-maintainer-scripts similarity index 100% rename from debian/update-maintainer-scripts rename to update-maintainer-scripts