merge

Kicksecure · Oct 4, 2022 · 9b4ea37 · 9b4ea37
2 parents 42b89df + ba82079
commit 9b4ea37
Show file tree

Hide file tree

Showing 9 changed files with 160 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Configuration for Derivative Xfce Desktop #
+# Configuration for Derivative Desktop #
 
 Sets desktop and display setting, wallpaper and desktop icons.
 Sets icon theme and style.
@@ -21,6 +21,12 @@ Disables thumbnails for better security.
 
 Disables save on exit for better privacy.
 
+Ships `zsh` derivative configuration settings folder `/etc/zsh/dist`.
+Set environment variable `ZDOTDIR=/etc/zsh/dist` through use of file
+`/usr/lib/systemd/system.conf.d/30_kicksecure-desktop-config-dist-zsh.conf`.
+But does not configure `zsh` as default shell.
+(That is up to package `dist-base-files`.)
+
 ## How to install `desktop-config-dist` using apt-get ##
 
 1\. Download the APT Signing Key.

diff --git a/changelog.upstream b/changelog.upstream
@@ -1,3 +1,111 @@
+commit 9a55251b271636d93cd12c6fc7e69394a6870c44
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Sat Oct 1 10:22:51 2022 -0400
+
+    description
+
+commit e4a88c57057e5fe5f714870d407f2f8eb00152e5
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Sat Oct 1 10:18:47 2022 -0400
+
+    description
+
+commit 3ede5b548979f41610119eef8431683c2b7bb986
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Sat Oct 1 10:15:53 2022 -0400
+
+    description
+
+commit c84605e61dbeedd09159a57890c85508cf8143c5
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Sat Oct 1 10:10:48 2022 -0400
+
+    split into desktop-config-dist and desktop-config-dist-dependencies
+
+    https://forums.whonix.org/t/change-default-shell-from-bash-to-zsh-by-default/14792
+
+commit 62347318519e7a65ab4c637f2e1ad76dc462a016
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Fri Sep 30 09:01:08 2022 -0400
+
+    genmkfile debinstfile
+
+commit 7d31cf50771b0e92d1625e3663a5e12079276247
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Fri Sep 30 08:43:35 2022 -0400
+
+    bumped changelog version
+
+commit 6058791683507c5c17fafdcf364e27efa49e2169
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Fri Sep 30 08:19:46 2022 -0400
+
+    comment
+
+commit 86ae7cd7e274fea7f64209f1c22d1a1a3bf7762a
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Fri Sep 30 08:18:41 2022 -0400
+
+    ignore lintian error
+
+    desktop-config-dist: missing-dep-for-interpreter zsh => zsh | zsh-beta (etc/zsh/dist/.zshrc) #!zsh
+
+    to avoid zsh being a dependency of this package
+
+commit adc380ad667ba8ba06d68b9e0cc66964249d1c6b
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Fri Sep 30 07:39:04 2022 -0400
+
+    minor
+
+commit 64761c8f525b991d40c842f05878ce2ad4469621
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Fri Sep 30 07:37:43 2022 -0400
+
+    make executable to fix lintian warning
+
+    https://forums.whonix.org/t/change-default-shell-from-bash-to-zsh-by-default/14792/30
+
+commit d9efa1d54ff8bc31e319470befc8051dd00f71d1
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Fri Sep 30 07:34:06 2022 -0400
+
+    bumped changelog version
+
+commit 26f22bf49d2418a1e0ecc16fd48aa78d174f7836
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Fri Sep 30 07:25:43 2022 -0400
+
+    renamed:    usr/lib/systemd/system.conf.d/30_kicksecure.conf -> usr/lib/systemd/system.conf.d/30_kicksecure-desktop-config-dist-zsh.conf
+
+commit 533f7353fb1ebcb1e267af6248c6503b01d823e8
+Merge: a361d37 e7b499a
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Fri Sep 30 07:24:44 2022 -0400
+
+    Merge remote-tracking branch 'github-kicksecure/master'
+
+commit e7b499aecc7581951e9caaf26b0c96aeff13c8ad
+Merge: a361d37 0e6ec56
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Fri Sep 30 07:21:29 2022 -0400
+
+    Merge pull request #1 from nyxnor/master
+
+    add zsh files
+
+commit 0e6ec566a99d7805a9b33895b2a66e2dbb317a16
+Author: nyxnor <nyxnor@protonmail.com>
+Date:   Thu Sep 29 21:31:56 2022 +0000
+
+    add zsh files
+
+commit a361d370ed8c7da743b273c2e7d52ddd1348c262
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 25 06:05:44 2022 -0400
+
+    bumped changelog version
+
 commit 29ee6b641f49122a929908fbf666d76da4c59dbc
 Author: Patrick Schleizer <adrelanos@whonix.org>
 Date:   Fri May 20 15:27:04 2022 -0400

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,21 @@
+desktop-config-dist (3:5.4-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <adrelanos@whonix.org>  Sat, 01 Oct 2022 14:28:03 +0000
+
+desktop-config-dist (3:5.3-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <adrelanos@whonix.org>  Fri, 30 Sep 2022 12:43:35 +0000
+
+desktop-config-dist (3:5.2-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <adrelanos@whonix.org>  Fri, 30 Sep 2022 11:34:06 +0000
+
 desktop-config-dist (3:5.1-1) unstable; urgency=medium
 
   * New upstream version (local package).

diff --git a/debian/control b/debian/control
@@ -17,11 +17,8 @@ Architecture: all
 Provides: whonix-xfce-desktop-config
 Replaces: whonix-xfce-desktop-config
 Conficts: whonix-xfce-desktop-config
-Depends: xfce4-whiskermenu-plugin, xfce4-genmon-plugin,
- arc-theme, gnome-themes-extra, gnome-themes-extra-data, gtk2-engines-murrine,
- gnome-colors-common, adwaita-icon-theme,
- ${misc:Depends}
-Description: Configuration for Derivative Xfce Desktop
+Depends: ${misc:Depends}
+Description: Configuration for Derivative Desktop
  Sets desktop and display setting, wallpaper and desktop icons.
  Sets icon theme and style.
  Settings for the default panel aka task bar, like panel position/color/size
@@ -42,3 +39,20 @@ Description: Configuration for Derivative Xfce Desktop
  Disables thumbnails for better security.
  .
  Disables save on exit for better privacy.
+ .
+ Ships `zsh` derivative configuration settings folder `/etc/zsh/dist`.
+ Set environment variable `ZDOTDIR=/etc/zsh/dist` through use of file
+ `/usr/lib/systemd/system.conf.d/30_kicksecure-desktop-config-dist-zsh.conf`.
+ But does not configure `zsh` as default shell.
+ (That is up to package `dist-base-files`.)
+
+Package: desktop-config-dist-dependencies
+Architecture: all
+Depends: xfce4-whiskermenu-plugin, xfce4-genmon-plugin,
+ arc-theme, gnome-themes-extra, gnome-themes-extra-data, gtk2-engines-murrine,
+ gnome-colors-common, adwaita-icon-theme,
+ ${misc:Depends}
+Description: Dependencies of desktop-config-dist
+ A metapackage with dependencies for package desktop-config-dist.
+ .
+ Only useful for Non-Qubes. Not useful in Qubes.
diff --git a/debian/desktop-config-dist.install b/debian/desktop-config-dist.install
@@ -1,7 +1,7 @@
 ## Copyright (C) 2020 - 2022 ENCRYPTED SUPPORT LP <adrelanos@whonix.org>
 ## See the file COPYING for copying conditions.
 
-## This file was generated using genmkfile 'make debinstfile'.
+## This file was generated using 'genmkfile debinstfile'.
 
 etc/*
 usr/*
diff --git a/etc/zsh/dist/.aliasrc b/etc/zsh/dist/.aliasrc
@@ -21,6 +21,3 @@ if command -v dircolors >/dev/null; then
     export LESS_TERMCAP_us=$'\E[1;32m'     # begin underline
     export LESS_TERMCAP_ue=$'\E[0m'        # reset underline
 fi
-
-
-
diff --git a/etc/zsh/dist/.shrc b/etc/zsh/dist/.shrc
@@ -48,5 +48,3 @@ fi
 
 ## ====================
 ## End Whonix section
-
-
diff --git a/make-helper-overrides.bsh b/make-helper-overrides.bsh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+## Copyright (C) 2022 - 2022 ENCRYPTED SUPPORT LP <adrelanos@whonix.org>
+## See the file COPYING for copying conditions.
+
+## Avoid zsh being a dependency of this package due to /etc/zsh/dist folder.
+genmkfile_lintian_post_opts+=" --suppress-tags missing-dep-for-interpreter "
diff --git a/.../systemd/system.conf.d/30_kicksecure.conf → ...0_kicksecure-desktop-config-dist-zsh.conf b/.../systemd/system.conf.d/30_kicksecure.conf → ...0_kicksecure-desktop-config-dist-zsh.conf