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'

etc/lightdm/lightdm-gtk-greeter.conf

@@ -1,5 +1,5 @@
 [greeter]
-background = /usr/share/backgrounds/kali/kali-light.png
+background = /usr/share/backgrounds/kali/kali-light-16x9.png
 theme-name = Kali-Dark
 font-name = Cantarell 11
 icon-theme-name = Flat-Remix-Blue-Dark

etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml

@@ -15,12 +15,12 @@
   <property name="backdrop" type="empty">
     <property name="screen0" type="empty">
       <property name="monitor0" type="empty">
-        <property name="image-path" type="string" value="/usr/share/backgrounds/kali-16x9/kali-logo-16x9.png"/>
+        <property name="image-path" type="string" value="/usr/share/backgrounds/kali-16x9/kali-logo.png"/>
         <property name="image-style" type="int" value="5"/>
         <property name="image-show" type="bool" value="true"/>
       </property>
       <property name="monitor1" type="empty">
-        <property name="image-path" type="string" value="/usr/share/backgrounds/kali-16x9/kali-logo-16x9.png"/>
+        <property name="image-path" type="string" value="/usr/share/backgrounds/kali-16x9/kali-logo.png"/>
         <property name="image-style" type="int" value="5"/>
         <property name="image-show" type="bool" value="true"/>
       </property>

share/backgrounds/kali-16x9/kali-black.png

@@ -0,0 +1 @@
+../kali/kali-black.png

share/backgrounds/kali-16x9/kali-blue-matrix-16x9.png

@@ -1 +0,0 @@
-../kali/kali-blue-matrix-16x9.png

share/backgrounds/kali-16x9/kali-blue-matrix.png

@@ -0,0 +1 @@
+../kali/kali-blue-matrix.png

share/backgrounds/kali-16x9/kali-dark-16x9.png

@@ -1 +0,0 @@
-../kali/kali-dark-16x9.png

share/backgrounds/kali/kali-mesh.xml

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

share/backgrounds/kali/kali-trail.xml

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

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

@@ -59,14 +59,14 @@
   </wallpaper>
   <wallpaper>
     <name>Kali Trail</name>
-    <filename>/usr/share/backgrounds/kali/kali-trail-16x9.png</filename>
+    <filename>/usr/share/backgrounds/kali/kali-trail.xml</filename>
     <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
   </wallpaper>
     <wallpaper>
     <name>Kali Mesh</name>
-    <filename>/usr/share/backgrounds/kali/kali-mesh-16x9.png</filename>
+    <filename>/usr/share/backgrounds/kali/kali-mesh.xml</filename>
     <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>

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

@@ -0,0 +1 @@
+../../../../backgrounds/kali/kali-light-16x10.png

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

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

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

@@ -0,0 +1 @@
+../../../../backgrounds/kali/kali-mesh-4x3.png

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

@@ -0,0 +1 @@
+../../../../backgrounds/kali/kali-mesh-16x10.png

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

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

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

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

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

@@ -0,0 +1 @@
+../../../../backgrounds/kali/kali-strips-16x10.png

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

@@ -0,0 +1 @@
+../../../../backgrounds/kali/kali-trail-4x3.png

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

@@ -0,0 +1 @@
+../../../../backgrounds/kali/kali-trail-16x10.png