fixup xflock, xkb patches for bullseye

remove dtrx since there is no bullseye package yet

filesystem/resources/InstallResources/xfce-config/xflock-xsecurelock.patch

@@ -2,11 +2,13 @@ diff --git a/usr/bin/xflock4 b/usr/bin/xflock4
 index d55cbf7..b7b28c6
 --- a/usr/bin/xflock4
 +++ b/usr/bin/xflock4
-@@ -26,6 +26,7 @@ export PATH
+@@ -27,8 +27,9 @@ export PATH
  
  # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
  for lock_cmd in \
 +    "env XSECURELOCK_PASSWORD_PROMPT=asterisks xsecurelock"\
+     "$LOCK_CMD" \
+     "xfce4-screensaver-command --lock" \
      "xscreensaver-command -lock" \
      "light-locker-command --lock" \
      "gnome-screensaver-command --lock" \

filesystem/resources/InstallResources/xkb/rules/base.xml.patch

@@ -71,22 +71,6 @@
      </model>
      <model>
        <configItem>
-@@ -1342,7 +1398,6 @@
-     <layout>
-       <configItem>
-         <name>us</name>
--        
-         <shortDescription>en</shortDescription>
-         <description>English (US)</description>
-         <languageList>
-@@ -1353,7 +1408,6 @@
-         <variant>
-           <configItem>
-             <name>chr</name>
--            
-             <shortDescription>chr</shortDescription>
-             <description>Cherokee</description>
-             <languageList>
 @@ -1363,6 +1417,12 @@
          </variant>
          <variant>

filesystem/resources/InstallResources/xkb/rules/evdev.xml.patch

@@ -71,22 +71,6 @@
      </model>
      <model>
        <configItem>
-@@ -1342,7 +1398,6 @@
-     <layout>
-       <configItem>
-         <name>us</name>
--        
-         <shortDescription>en</shortDescription>
-         <description>English (US)</description>
-         <languageList>
-@@ -1353,7 +1408,6 @@
-         <variant>
-           <configItem>
-             <name>chr</name>
--            
-             <shortDescription>chr</shortDescription>
-             <description>Cherokee</description>
-             <languageList>
 @@ -1363,6 +1417,12 @@
          </variant>
          <variant>

scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh

@@ -219,15 +219,6 @@ sed -i -e "s/suite/$DEBIAN_SUITE/g" $outmnt/etc/apt/sources.list
 sed -i -e "s/suite/$DEBIAN_SUITE/g" $outmnt/etc/apt/sources.list.d/prawnos.list
 if [ "$DEBIAN_SUITE" != "sid" ]
 then
-    # sid doesn't have updates or security; they're present for all other suites
-    cat $build_resources_apt/updates.list >> $outmnt/etc/apt/sources.list
-    sed -i -e "s/suite/$DEBIAN_SUITE/g" $outmnt/etc/apt/sources.list
-    # sid doesn't have backports; it's present for all other suites
-    cp $build_resources_apt/backports.list $outmnt/etc/apt/sources.list.d/
-    sed -i -e "s/suite/$DEBIAN_SUITE/g" $outmnt/etc/apt/sources.list.d/backports.list
-    #setup apt pinning
-    cp $build_resources_apt/backports.pref $outmnt/etc/apt/preferences.d/
-    sed -i -e "s/suite/$DEBIAN_SUITE/g" $outmnt/etc/apt/preferences.d/backports.pref
     # Install sid (unstable) as an additional source for bleeding edge packages.
     cp $build_resources_apt/sid.list $outmnt/etc/apt/sources.list.d/
     #setup apt pinning
@@ -235,9 +226,15 @@ then
 fi
 if [ "$DEBIAN_SUITE" = "buster" ]
 then
+    # sid and bullseye don't have backports or security; it's present for all other suites
+    cat $build_resources_apt/updates.list >> $outmnt/etc/apt/sources.list
+    sed -i -e "s/suite/$DEBIAN_SUITE/g" $outmnt/etc/apt/sources.list
+    cp $build_resources_apt/backports.list $outmnt/etc/apt/sources.list.d/
+    sed -i -e "s/suite/$DEBIAN_SUITE/g" $outmnt/etc/apt/sources.list.d/backports.list
+    cp $build_resources_apt/backports.pref $outmnt/etc/apt/preferences.d/
+    sed -i -e "s/suite/$DEBIAN_SUITE/g" $outmnt/etc/apt/preferences.d/backports.pref
     # Install bullseye (testing) as an additional source
     cp $build_resources_apt/bullseye.list $outmnt/etc/apt/sources.list.d/
-    #setup apt pinning
     cp $build_resources_apt/bullseye.pref $outmnt/etc/apt/preferences.d/
 fi
 

scripts/InstallScripts/InstallPackages.sh

@@ -148,7 +148,7 @@ then
 
   #Install libinput-gestures and xfdashboard "packages"
   cd $DIR/packages/
-  dtrx libinput-gestures.tar.gz
+  tar -xf libinput-gestures.tar.gz
   cd libinput-gestures
   make install
   cd ..
@@ -186,14 +186,14 @@ then
     echo "flat-volumes = no" > /etc/pulse/daemon.conf
     cp -rf $DIR/veyron/sound.sh /etc/acpi/sound.sh
     cp -rf $DIR/veyron/headphone-acpi-toggle /etc/acpi/events/headphone-acpi-toggle
-    mkdir /etc/X11/xorg.conf.d/
+    mkdir -p /etc/X11/xorg.conf.d/
     cp -rf $DIR/30-touchpad.conf /etc/X11/xorg.conf.d/
 fi
 
 if [[ $device_model == $device_gru_kevin ]] || [[ $device_model == $device_gru_bob ]]
 then
     #same bash trackpad config works well enough
-    mkdir /etc/X11/xorg.conf.d/
+    mkdir -p /etc/X11/xorg.conf.d/
     cp -rf $DIR/30-touchpad.conf /etc/X11/xorg.conf.d/
 fi
 

scripts/Shared/package_lists.sh

@@ -82,7 +82,6 @@ base_debs_download=(
     dbus-user-session
     dpkg
     dkms
-    dtrx
     eject
     emacs
     firefox-esr