From 9481728e58904d94188e1fa435f7b63d1b35a2a5 Mon Sep 17 00:00:00 2001
From: Sophie Brun <sophie@offensive-security.com>
Date: Fri, 1 Nov 2019 11:11:56 +0100
Subject: [PATCH] Change name to kali-themes and kali-themes-common

---
 debian/control                                            | 8 ++++----
 ...li-theme-common.install => kali-themes-common.install} | 2 +-
 ....gsettings-override => kali-themes.gsettings-override} | 0
 debian/{kali-theme.install => kali-themes.install}        | 0
 debian/{kali-theme.postinst => kali-themes.postinst}      | 2 +-
 debian/{kali-theme.postrm => kali-themes.postrm}          | 2 +-
 debian/{kali-theme.preinst => kali-themes.preinst}        | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename debian/{kali-theme-common.install => kali-themes-common.install} (86%)
 rename debian/{kali-theme.gsettings-override => kali-themes.gsettings-override} (100%)
 rename debian/{kali-theme.install => kali-themes.install} (100%)
 rename debian/{kali-theme.postinst => kali-themes.postinst} (84%)
 rename debian/{kali-theme.postrm => kali-themes.postrm} (86%)
 rename debian/{kali-theme.preinst => kali-themes.preinst} (90%)

diff --git a/debian/control b/debian/control
index dd2d989a..2bd9e453 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 4.4.1
 Vcs-Git: https://gitlab.com/kalilinux/packages/kali-themes.git
 Vcs-Browser: https://gitlab.com/kalilinux/packages/kali-themes
 
-Package: kali-theme-common
+Package: kali-themes-common
 Architecture: all
 Depends: ${misc:Depends}, gtk2-engines-murrine
 Conflicts: gnome-theme-kali
@@ -26,7 +26,7 @@ Description: Kali Themes (data files)
 
 Package: kali-desktop-base
 Architecture: all
-Depends: kali-theme-common (= ${source:Version}),
+Depends: kali-themes-common (= ${source:Version}),
  desktop-base (>= 10.0.3),
  ${misc:Depends}
 Description: Kali version of Debian's desktop-base package
@@ -34,7 +34,7 @@ Description: Kali version of Debian's desktop-base package
  by Debian's desktop-base to provide consistent Kali branding through
  the whole distribution.
 
-Package: kali-theme
+Package: kali-themes
 Architecture: all
 Depends: kali-desktop-base (= ${source:Version}),
  ${misc:Depends}
@@ -44,6 +44,6 @@ Description: Configure all desktops to use the Kali theme
  Installing this package should configure most desktops to use the Kali theme
  by default.
  .
- The actual artwork files are provided by kali-theme-common but this package
+ The actual artwork files are provided by kali-themes-common but this package
  provides configuration files and other settings for each desktop so that
  they use the Kali theme by default.
diff --git a/debian/kali-theme-common.install b/debian/kali-themes-common.install
similarity index 86%
rename from debian/kali-theme-common.install
rename to debian/kali-themes-common.install
index d361ef9b..902abaa9 100644
--- a/debian/kali-theme-common.install
+++ b/debian/kali-themes-common.install
@@ -9,4 +9,4 @@ usr/share/icons/
 usr/share/plymouth/
 usr/share/gnome-background-properties/
 usr/share/wallpapers/
-xfce/xsettings.xml usr/share/kali-theme-common/
+xfce/xsettings.xml usr/share/kali-themes-common/
diff --git a/debian/kali-theme.gsettings-override b/debian/kali-themes.gsettings-override
similarity index 100%
rename from debian/kali-theme.gsettings-override
rename to debian/kali-themes.gsettings-override
diff --git a/debian/kali-theme.install b/debian/kali-themes.install
similarity index 100%
rename from debian/kali-theme.install
rename to debian/kali-themes.install
diff --git a/debian/kali-theme.postinst b/debian/kali-themes.postinst
similarity index 84%
rename from debian/kali-theme.postinst
rename to debian/kali-themes.postinst
index 355f1811..c21b3c5a 100644
--- a/debian/kali-theme.postinst
+++ b/debian/kali-themes.postinst
@@ -5,7 +5,7 @@ set -e
 if [ "$1" = "configure" ]; then
     for file in /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
     do
-        orig_file="/usr/share/kali-theme-common/$(basename $file)"
+        orig_file="/usr/share/kali-themes-common/$(basename $file)"
         if [ ! -e $file ] && [ -e $orig_file ]; then
             echo "Installing $orig_file as $file"
             mkdir -p $(dirname $file)
diff --git a/debian/kali-theme.postrm b/debian/kali-themes.postrm
similarity index 86%
rename from debian/kali-theme.postrm
rename to debian/kali-themes.postrm
index 3702ae28..94c52a03 100644
--- a/debian/kali-theme.postrm
+++ b/debian/kali-themes.postrm
@@ -5,7 +5,7 @@ set -e
 case "$1" in
     remove)
         rm -f /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
-	dpkg-divert --rename --package kali-theme \
+	dpkg-divert --rename --package kali-themes \
 	            --divert /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml.original \
 		    --remove /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
     ;;
diff --git a/debian/kali-theme.preinst b/debian/kali-themes.preinst
similarity index 90%
rename from debian/kali-theme.preinst
rename to debian/kali-themes.preinst
index ab0d28cd..7990a6bd 100644
--- a/debian/kali-theme.preinst
+++ b/debian/kali-themes.preinst
@@ -12,7 +12,7 @@ case "$1" in
 		--divert $DIVERT_FILE.original \
                 --remove $DIVERT_FILE
 	fi
-	dpkg-divert --rename --package kali-theme \
+	dpkg-divert --rename --package kali-themes \
 		    --divert $DIVERT_FILE.original \
 		    --add $DIVERT_FILE
     ;;