Merge all background pictures in Backgrounds sub-directory

* Provide 3 common ratio (16x9, 16x10, 4x3) for the 2 main images.
* Avoid duplication by creating symlinks for all the screen sizes needed by
  KDE. We link to the picture with the closest ratio.
* Make all background pictures available to gnome-background-properties.
* Make the 2 main background pictures available to KDE.

Backgrounds/kali-logo.xml

@@ -0,0 +1,16 @@
+<background>
+  <static>
+    <duration>8640000.0</duration>
+    <file>
+      <size width="1024" height="768">/usr/share/backgrounds/kali/kali-logo-4x3.png</size>
+      <size width="1280" height="720">/usr/share/backgrounds/kali/kali-logo-16x9.png</size>
+      <size width="1280" height="800">/usr/share/backgrounds/kali/kali-logo-16x10.png</size>
+      <size width="1600" height="1200">/usr/share/backgrounds/kali/kali-logo-4x3.png</size>
+      <size width="1920" height="1080">/usr/share/backgrounds/kali/kali-logo-16x9.png</size>
+      <size width="1920" height="1200">/usr/share/backgrounds/kali/kali-logo-16x10.png</size>
+      <size width="2560" height="1440">/usr/share/backgrounds/kali/kali-logo-16x9.png</size>
+      <size width="2560" height="1600">/usr/share/backgrounds/kali/kali-logo-16x10.png</size>
+      <size width="3840" height="2160">/usr/share/backgrounds/kali/kali-logo-16x9.png</size>
+    </file>
+  </static>
+</background>

Backgrounds/kali-rings.xml

@@ -0,0 +1,16 @@
+<background>
+  <static>
+    <duration>8640000.0</duration>
+    <file>
+      <size width="1024" height="768">/usr/share/backgrounds/kali/kali-rings-4x3.png</size>
+      <size width="1280" height="720">/usr/share/backgrounds/kali/kali-rings-16x9.png</size>
+      <size width="1280" height="800">/usr/share/backgrounds/kali/kali-rings-16x10.png</size>
+      <size width="1600" height="1200">/usr/share/backgrounds/kali/kali-rings-4x3.png</size>
+      <size width="1920" height="1080">/usr/share/backgrounds/kali/kali-rings-16x9.png</size>
+      <size width="1920" height="1200">/usr/share/backgrounds/kali/kali-rings-16x10.png</size>
+      <size width="2560" height="1440">/usr/share/backgrounds/kali/kali-rings-16x9.png</size>
+      <size width="2560" height="1600">/usr/share/backgrounds/kali/kali-rings-16x10.png</size>
+      <size width="3840" height="2160">/usr/share/backgrounds/kali/kali-rings-16x9.png</size>
+    </file>
+  </static>
+</background>

Gnome-Backgrounds/kali-2017.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-<wallpapers>
-  <wallpaper>
-    <!-- don't include words such as "wallpaper" (avoids translations) -->
-    <name>Kali</name>
-    <filename>/usr/share/desktop-base/kali-theme/wallpaper/gnome-background.xml</filename>
-    <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
-    <!-- don't include words such as "wallpaper" (avoids translations) -->
-    <name>Kali Lock Screen</name>
-    <filename>/usr/share/desktop-base/kali-theme/lockscreen/gnome-background.xml</filename>
-    <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-</wallpapers>

LockScreen/kali-2019/gnome-background.xml

@@ -1,18 +0,0 @@
-<background>
-  <static>
-    <duration>8640000.0</duration>
-    <file>
-      <size width="1024" height="768">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1024x768.png</size>
-      <size width="1280" height="720">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x720.png</size>
-      <size width="1280" height="800">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x800.png</size>
-      <size width="1280" height="1024">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x1024.png</size>
-      <size width="1600" height="1200">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1600x1200.png</size>
-      <size width="1920" height="1080">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1920x1080.png</size>
-      <size width="1920" height="1200">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1920x1200.png</size>
-      <size width="2560" height="1080">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1080.png</size>
-      <size width="2560" height="1440">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1440.png</size>
-      <size width="2560" height="1600">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1600.png</size>
-      <size width="3840" height="2160">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/3840x2160.png</size>
-    </file>
-  </static>
-</background>

LockScreen/kali-2019/metadata.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Kali Lockscreen
-Name[fr]=Écran de verrouillage pour Kali
-X-KDE-PluginInfo-Name=kaliLockScreen
-X-KDE-PluginInfo-Author=Kali Devel Team
-X-KDE-PluginInfo-Email=devel@kali.org

LockScreen/kali/gnome-background.xml

@@ -1,18 +0,0 @@
-<background>
-  <static>
-    <duration>8640000.0</duration>
-    <file>
-      <size width="1024" height="768">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1024x768.png</size>
-      <size width="1280" height="720">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x720.png</size>
-      <size width="1280" height="800">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x800.png</size>
-      <size width="1280" height="1024">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x1024.png</size>
-      <size width="1600" height="1200">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1600x1200.png</size>
-      <size width="1920" height="1080">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1920x1080.png</size>
-      <size width="1920" height="1200">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1920x1200.png</size>
-      <size width="2560" height="1080">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1080.png</size>
-      <size width="2560" height="1440">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1440.png</size>
-      <size width="2560" height="1600">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1600.png</size>
-      <size width="3840" height="2160">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/3840x2160.png</size>
-    </file>
-  </static>
-</background>

LockScreen/kali/metadata.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Kali Lockscreen
-Name[fr]=Écran de verrouillage pour Kali
-X-KDE-PluginInfo-Name=kaliLockScreen
-X-KDE-PluginInfo-Author=Kali Devel Team
-X-KDE-PluginInfo-Email=devel@kali.org

Makefile

@@ -1,4 +1,4 @@
-SUBDIRS=Grub-Background/kali emblems kali-logos
+SUBDIRS=emblems kali-logos
 
 build:
 	$(foreach SUBDIR,$(SUBDIRS),$(MAKE) -C $(SUBDIR) build &&) true
@@ -6,7 +6,7 @@ build:
 	# kali-desktop-base in the file structure expected by desktop-base
 	rm -rf desktop-base
 	mkdir -p desktop-base/kali-theme/grub
-	cp Grub-Background/kali/*.png Grub-Background/kali/*.sh desktop-base/kali-theme/grub/
+	cp Grub-Background/kali-2019/*.png Grub-Background/kali-2019/*.sh desktop-base/kali-theme/grub/
 	cp -a LockScreen/kali desktop-base/kali-theme/lockscreen
 	cp -a Wallpapers/kali desktop-base/kali-theme/wallpaper
 	cp -a LoginScreen/kali desktop-base/kali-theme/login
@@ -20,10 +20,5 @@ install:
 	# We use debhelper to install most files, but some subdirectories
 	# install files by themselves
 	$(foreach SUBDIR,$(SUBDIRS),$(MAKE) -C $(SUBDIR) install &&) true
-	# And we need a few supplementary symlinks for good integration
-	# KDE looks into /usr/share/wallpapers
-	install -d $(DESTDIR)/usr/share/wallpapers
-	cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/kali-theme/wallpaper Kali
-	cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/kali-theme/lockscreen KaliLockScreen
 
 include Makefile.inc

TODO

@@ -0,0 +1,2 @@
+- Add the missing files in kali-logos (compare to
+  /usr/share/desktop-base/debian-logos/).

Wallpapers/kali-2019/gnome-background.xml

@@ -1,17 +0,0 @@
-<background>
-  <static>
-    <duration>8640000.0</duration>
-    <file>
-      <size width="1024" height="768">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1024x768.png</size>
-      <size width="1280" height="720">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x720.png</size>
-      <size width="1280" height="800">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x800.png</size>
-      <size width="1280" height="1024">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x1024.png</size>
-      <size width="1600" height="1200">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1600x1200.png</size>
-      <size width="1920" height="1080">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1920x1080.png</size>
-      <size width="1920" height="1200">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1920x1200.png</size>
-      <size width="2560" height="1440">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/2560x1440.png</size>
-      <size width="2560" height="1600">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/2560x1600.png</size>
-      <size width="3840" height="2160">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/3840x2160.png</size>
-    </file>
-  </static>
-</background>

Wallpapers/kali/gnome-background.xml

@@ -1,17 +0,0 @@
-<background>
-  <static>
-    <duration>8640000.0</duration>
-    <file>
-      <size width="1024" height="768">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1024x768.png</size>
-      <size width="1280" height="720">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x720.png</size>
-      <size width="1280" height="800">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x800.png</size>
-      <size width="1280" height="1024">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x1024.png</size>
-      <size width="1600" height="1200">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1600x1200.png</size>
-      <size width="1920" height="1080">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1920x1080.png</size>
-      <size width="1920" height="1200">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1920x1200.png</size>
-      <size width="2560" height="1440">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/2560x1440.png</size>
-      <size width="2560" height="1600">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/2560x1600.png</size>
-      <size width="3840" height="2160">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/3840x2160.png</size>
-    </file>
-  </static>
-</background>

debian/kali-themes-common.install

@@ -1,13 +1,12 @@
 Backgrounds/* usr/share/backgrounds/
 Color-Schemes/* usr/share/
+share/* usr/share/
 Icon-Theme/* usr/share/icons/
 Window-Theme/* usr/share/themes/
 Grub-Theme/* boot/grub/themes/
 Plymouth-Theme/* usr/share/plymouth/themes/
-Gnome-Backgrounds/* usr/share/gnome-background-properties/
 desktop-base/* usr/share/desktop-base/
+kali-logos/* usr/images/kali-logos/
 xfce/xsettings.xml usr/share/kali-themes-common/
 # Those are created by "make install"
-usr/share/desktop-base/kali-logos/
 usr/share/icons/
-usr/share/wallpapers/

share/gnome-background-properties/kali-backgrounds.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper>
+    <name>Kali Logo</name>
+    <filename>/usr/share/backgrounds/kali/kali-logo.xml</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper>
+    <name>Kali Rings</name>
+    <filename>/usr/share/backgrounds/kali/kali-rings.xml</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper>
+    <name>Kali Black</name>
+    <filename>/usr/share/backgrounds/kali/kali-black.png</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper>
+    <name>Kali Blue Matrix</name>
+    <filename>/usr/share/backgrounds/kali/kali-blue-matrix.png</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper>
+    <name>Kali Grid</name>
+    <filename>/usr/share/backgrounds/kali/kali-grid.png</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper>
+    <name>Kali Small Logo</name>
+    <filename>/usr/share/backgrounds/kali/kali-small-logo.png</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+</wallpapers>

share/wallpapers/KaliLogo/contents/images/1024x768.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-4x3.png

share/wallpapers/KaliLogo/contents/images/1280x1024.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-4x3.png

share/wallpapers/KaliLogo/contents/images/1280x720.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x9.png

share/wallpapers/KaliLogo/contents/images/1280x800.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x10.png

share/wallpapers/KaliLogo/contents/images/1600x1200.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-4x3.png

share/wallpapers/KaliLogo/contents/images/1920x1080.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x9.png

share/wallpapers/KaliLogo/contents/images/1920x1200.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x10.png

share/wallpapers/KaliLogo/contents/images/2560x1080.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x9.png

share/wallpapers/KaliLogo/contents/images/2560x1440.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x9.png

share/wallpapers/KaliLogo/contents/images/2560x1600.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x10.png

share/wallpapers/KaliLogo/contents/images/3840x2160.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x9.png

share/wallpapers/KaliLogo/metadata.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=Kali
+Name=Kali Logo
 
-X-KDE-PluginInfo-Name=kali
+X-KDE-PluginInfo-Name=KaliLogo
 X-KDE-PluginInfo-Author=Kali Devel Team
 X-KDE-PluginInfo-Email=devel@kali.org
 #X-KDE-PluginInfo-License=GPL-2

share/wallpapers/KaliRings/contents/images/1024x768.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-4x3.png

share/wallpapers/KaliRings/contents/images/1280x1024.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-4x3.png

share/wallpapers/KaliRings/contents/images/1280x720.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x9.png

share/wallpapers/KaliRings/contents/images/1280x800.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x10.png

share/wallpapers/KaliRings/contents/images/1600x1200.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-4x3.png

share/wallpapers/KaliRings/contents/images/1920x1080.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x9.png

share/wallpapers/KaliRings/contents/images/1920x1200.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x10.png

share/wallpapers/KaliRings/contents/images/2560x1080.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x9.png

share/wallpapers/KaliRings/contents/images/2560x1440.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x9.png

share/wallpapers/KaliRings/contents/images/2560x1600.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x10.png

share/wallpapers/KaliRings/contents/images/3840x2160.png

@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x9.png

share/wallpapers/KaliRings/metadata.desktop

@@ -1,7 +1,5 @@
 [Desktop Entry]
-Name=Kali
+Name=Kali Rings
-
+X-KDE-PluginInfo-Name=KaliRings
-X-KDE-PluginInfo-Name=kali
 X-KDE-PluginInfo-Author=Kali Devel Team
 X-KDE-PluginInfo-Email=devel@kali.org
-#X-KDE-PluginInfo-License=GPL-2