summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog43
-rw-r--r--debian/control8
-rw-r--r--debian/xebian-default-settings.gsettings-override2
-rw-r--r--etc/X11/Xsession.d/56xebian-session4
-rw-r--r--etc/X11/Xsession.d/60x11-common_xdg_path4
-rw-r--r--etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml2
-rw-r--r--etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml2
-rw-r--r--etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml2
-rw-r--r--usr/share/lightdm/lightdm-gtk-greeter.conf.d/10-xebian-default.conf2
9 files changed, 61 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 5f07990..31e51be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,46 @@
+xebian-default-settings (22.07) unstable; urgency=medium
+
+ [ Krytarik Raido ]
+ * Switch from Numix to Greybird.
+
+ [ Unit 193 ]
+ * e/X11/Xsession.d/(56xebian-session,60x11-common_xdg_path):
+ - Inject the variables set into the session via
+ dbus-update-activation-environment.
+ * d/control:
+ - Bump DH compat to 13.
+ - Set Vcs-* fields.
+ * Update Standards-Version to 4.6.1.
+
+ -- Unit 193 <unit193@xebian.org> Sun, 31 Jul 2022 18:02:51 -0400
+
+xebian-default-settings (20.12) unstable; urgency=medium
+
+ * usr/share/polkit-1/actions/*: Drop, mousepad ships its own policykit rules.
+ * d/control, d/copyright: Update my email address.
+ * d/xebian-default-settings.gsettings-override:
+ - Drop light-locker and deprecated mousepad key.
+ * e/modprobe.d/blacklist-pcspkr.conf:
+ - Blacklist pcspkr due to making an annoying 'beep' on many events.
+ * e/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml:
+ - Set Gtk/CursorThemeName to DMZ-White.
+ * e/xdg/xdg-xebian/xfce4/panel/default.xml:
+ - Migrate statusnotifier to systray and remove from panel.
+ * e/xdg/xdg-xebian/xfce4/helpers.rc:
+ - Change FileManager key to lowercase thunar to fix defaults.
+ * e/xdg/xdg-xebian/menus/xfce-applications.menu,
+ e/xdg/xdg-xebian/xfce4/whiskermenu/defaults.rc:
+ - Replace exo-* with xfce4-* commands.
+ * e/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml:
+ - Exclude applications menu on desktop right click.
+ * e/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/thunar.xml:
+ - Enabled opening folders in new tab on middle click.
+ * e/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml:
+ - Re-sync keybinds with upstream Xfce, sort.
+ * Update Standards-Version to 4.5.1.
+
+ -- Unit 193 <unit193@xebian.org> Wed, 23 Dec 2020 19:03:37 -0500
+
xebian-default-settings (20.03) unstable; urgency=medium
[ Simon Steinbeiß ]
diff --git a/debian/control b/debian/control
index 96a239c..ed96640 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xebian-default-settings
Section: x11
Priority: optional
Maintainer: Unit 193 <unit193@xebian.org>
-Build-Depends: debhelper-compat (= 12), intltool
+Build-Depends: debhelper-compat (= 13), intltool
Rules-Requires-Root: no
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
+Vcs-Browser: https://github.com/xebian/xebian-default-settings
+Vcs-Git: https://github.com/xebian/xebian-default-settings
Package: xebian-default-settings
Architecture: all
@@ -14,8 +16,8 @@ Recommends:
elementary-xfce-icon-theme,
fonts-noto-hinted,
fonts-noto-mono,
+ greybird-gtk-theme,
libxfce4ui-utils,
- numix-gtk-theme,
xfce4-session
Enhances: lightdm-gtk-greeter, mousepad, xfce4
Description: default settings for the Xebian desktop
diff --git a/debian/xebian-default-settings.gsettings-override b/debian/xebian-default-settings.gsettings-override
index 2b30056..7791ed1 100644
--- a/debian/xebian-default-settings.gsettings-override
+++ b/debian/xebian-default-settings.gsettings-override
@@ -2,7 +2,7 @@
picture-uri='file:///usr/share/xfce4/backdrops/xebian-wallpaper.png'
[org.gnome.desktop.interface]
-gtk-theme='Numix'
+gtk-theme='Greybird-dark'
icon-theme='elementary-xfce-darker'
font-name='Noto Sans 9'
monospace-font-name='Monospace 10'
diff --git a/etc/X11/Xsession.d/56xebian-session b/etc/X11/Xsession.d/56xebian-session
index 893deef..91a59ae 100644
--- a/etc/X11/Xsession.d/56xebian-session
+++ b/etc/X11/Xsession.d/56xebian-session
@@ -4,4 +4,8 @@ if [ "$DESKTOP_SESSION" = xebian ]; then
export GTK_OVERLAY_SCROLLING=0
# Qt5 apps to use GTK style
export QT_QPA_PLATFORMTHEME=gtk2
+ if [ -n "$DBUS_SESSION_BUS_ADDRESS" ] && \
+ command -v dbus-update-activation-environment >/dev/null; then
+ dbus-update-activation-environment --verbose --systemd GTK_OVERLAY_SCROLLING QT_QPA_PLATFORMTHEME
+ fi
fi
diff --git a/etc/X11/Xsession.d/60x11-common_xdg_path b/etc/X11/Xsession.d/60x11-common_xdg_path
index a3083ad..73f3df1 100644
--- a/etc/X11/Xsession.d/60x11-common_xdg_path
+++ b/etc/X11/Xsession.d/60x11-common_xdg_path
@@ -21,4 +21,8 @@ if [ -n "$DESKTOP_SESSION" ]; then
fi
export XDG_DATA_DIRS
fi
+ if [ -n "$DBUS_SESSION_BUS_ADDRESS" ] && \
+ command -v dbus-update-activation-environment >/dev/null; then
+ dbus-update-activation-environment --verbose --systemd XDG_CONFIG_DIRS XDG_DATA_DIRS
+ fi
fi
diff --git a/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
index dcbbbdc..89891d4 100644
--- a/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
+++ b/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
@@ -2,7 +2,7 @@
<channel name="xfce4-notifyd" version="1.0">
<property name="notify-location" type="uint" value="2"/>
- <property name="theme" type="string" value="Numix"/>
+ <property name="theme" type="string" value="Greybird"/>
<property name="initial-opacity" type="double" value="0.850000"/>
<property name="do-fadeout" type="bool" value="true"/>
</channel>
diff --git a/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
index f626d7b..9308749 100644
--- a/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ b/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
@@ -37,7 +37,7 @@
<property name="snap_to_border" type="bool" value="true"/>
<property name="snap_to_windows" type="bool" value="false"/>
<property name="snap_width" type="int" value="10"/>
- <property name="theme" type="string" value="Numix"/>
+ <property name="theme" type="string" value="Greybird-dark"/>
<property name="title_alignment" type="string" value="center"/>
<property name="title_font" type="string" value="Noto Sans Bold 9"/>
<property name="title_horizontal_offset" type="int" value="0"/>
diff --git a/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
index 3096a95..35f3cb0 100644
--- a/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/etc/xdg/xdg-xebian/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -2,7 +2,7 @@
<channel name="xsettings" version="1.0">
<property name="Net" type="empty">
- <property name="ThemeName" type="string" value="Numix"/>
+ <property name="ThemeName" type="string" value="Greybird-dark"/>
<property name="IconThemeName" type="string" value="elementary-xfce-darker"/>
</property>
<property name="Xft" type="empty">
diff --git a/usr/share/lightdm/lightdm-gtk-greeter.conf.d/10-xebian-default.conf b/usr/share/lightdm/lightdm-gtk-greeter.conf.d/10-xebian-default.conf
index 7cfd432..896cd55 100644
--- a/usr/share/lightdm/lightdm-gtk-greeter.conf.d/10-xebian-default.conf
+++ b/usr/share/lightdm/lightdm-gtk-greeter.conf.d/10-xebian-default.conf
@@ -1,5 +1,5 @@
[greeter]
background=/usr/share/xfce4/backdrops/xebian-wallpaper.png
-theme-name=Numix
+theme-name=Greybird-dark
icon-theme-name=elementary-xfce-dark
font-name=Noto Sans 9