From bfa90303c96f7032d6c224595af28ec3d55193f6 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 29 Dec 2018 15:56:49 +1100 Subject: [PATCH] custom tildelinux stuff --- data/autostart/autostart.in | 16 +- data/menu.xml | 448 +----- data/rc.xml | 1239 +++++++++-------- debian/changelog | 7 +- debian/copyright | 4 + .../patches/06_openbox-3.5.0-which-2.20.patch | 14 - debian/patches/754207_use-scrot.patch | 30 - debian/patches/series | 3 - 8 files changed, 714 insertions(+), 1047 deletions(-) delete mode 100644 debian/patches/06_openbox-3.5.0-which-2.20.patch delete mode 100644 debian/patches/754207_use-scrot.patch diff --git a/data/autostart/autostart.in b/data/autostart/autostart.in index 1c261a0..04e3e75 100644 --- a/data/autostart/autostart.in +++ b/data/autostart/autostart.in @@ -1,17 +1,7 @@ # # These things are run when an Openbox X Session is started. -# You may place a similar script in $HOME/.config/openbox/autostart -# to run user-specific things. # -# If you want to use GNOME config tools... -# -#if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then -# @libexecdir@/gnome-settings-daemon & -#elif which gnome-settings-daemon >/dev/null; then -# gnome-settings-daemon & -#fi - -# If you want to use XFCE config tools... -# -#xfce-mcs-manager & +xfce4-panel & +feh --bg-scale /usr/share/backgrounds/tildelinux/verse.png & +compton & diff --git a/data/menu.xml b/data/menu.xml index 39da04d..40885c0 100644 --- a/data/menu.xml +++ b/data/menu.xml @@ -2,393 +2,67 @@ - - - - gnome-calculator - - yes - - - - - - gnome-character-map - - yes - - - - - - ark - - yes - - - - + + + + + + obconf + yes + + + + + xfce-setting-show + yes + + + + + arandr + yes + + + + + obmenu + yes + + + + + + + - - - - gvim - - yes - GVim - - - - - - emacs - - yes - Emacs - - - - - - gedit - - yes - - - - - - kate - - yes - - - - - - kwrite - - yes - - - - - - - - - urxvt - - - - - gnome-terminal - - yes - - - - - - xfce4-terminal - - yes - - - - - - konsole - - yes - - - - - xterm - - - - - - - firefox - - yes - Firefox - - - - - - opera - - yes - Opera - - - - - - konqueror - - yes - - - - - - epiphany - - yes - - - - - - pidgin - - yes - - - - - - kopete - - yes - - - - - - xchat - - yes - - - - - - - - - ooffice -base - - - - - ooffice -calc - - - - - ooffice -draw - - - - - ooffice -impress - - - - - ooffice -math - - - - - ooffice-printeradmin - - - - - ooffice -writer - - - - - - - - amarok - - yes - - - - - - rhythmbox - - yes - - - - - - k3b - - yes - - - - - - gmplayer - - yes - MPlayer - - - - - - totem - - yes - - - - - - - - - nautilus --no-desktop --browser - - yes - - - - - - Thunar - - yes - - - - - - kfmclient openURL ~ - - yes - - - - - - rox - - yes - ROX-Filer - - - - - - pcmanfm - - yes - - - - - - - - - gimp - - yes - - - - - - gwenview - - yes - - - - - - dia - - yes - - - - - - inkscape - - yes - - - - - - - - - obconf - yes - - - - - gnome-control-center - yes - - - - - kcontrol - yes - - - - - xfce-setting-show - yes - - - - - xdg-open http://localhost:631/ - - no - cups - - - - - - - - - - - - - - - - - - - - - - - - - yes - - - + + + + + x-www-browser + + yes + + + + + + x-terminal-emulator + + yes + + + + + + + + + + + yes + + + diff --git a/data/rc.xml b/data/rc.xml index 3e5554b..065b792 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -1,57 +1,50 @@ - - - - - - 10 - 20 - - - - yes - - no - - yes - + yes + - no - - 200 - + 200 + - no - - - - - Smart - -
yes
- +
yes
+ - Primary - - 1 - -
- - - Clearlooks - NLIMC - - yes - yes - - sans - 8 - - bold - - normal - - - - sans - 8 - - bold - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - bold - - normal - - - - sans - 9 - - bold - - normal - - - - - - + Normal + + Normal + + + + DejaVu Sans Mono + 9 + + Normal + + Normal + + + + DejaVu Sans Mono + 9 + + Normal + + Normal + + + + DejaVu Sans Mono + 9 + + Normal + + Normal + + + + DejaVu Sans Mono + 9 + + Normal + + Normal + + + + DejaVu Sans Mono + 9 + + Normal + + Normal + + + + + - 4 - 1 - - - - 875 - - - - - yes - Nonpixel - - Center - - - - - 10 - + Center + + + + 10 + - 10 - - - - - - - 0 - 0 - 0 - 0 - - - - TopLeft - - 0 - 0 - no - Above - - Vertical - - no - 300 - - 300 - - Middle - - - - - C-g - - - - leftno - - - rightno - - - upno - - - downno - - - leftno - - - rightno - - - upno - - - downno - - - 1 - - - 2 - - - 3 - - - 4 - - - - - - - - - - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - yesyes - - - - - - - - - - - - right - - - - - left - - - - - up - - - - - down - - - - - - - - true - Konqueror - - kfmclient openProfile filemanagement - - - - - - 1 - - 500 - - 400 - + 0 + 0 + no + Above + + Vertical + + no + 300 + + 300 + + Middle + + + + C-g + + + + left + no + + + + + right + no + + + + + up + no + + + + + down + no + + + + + left + no + + + + + right + no + + + + + up + no + + + + + down + no + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + + + + + + + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + yes + yes + + + + + + + + + + + right + + + + + left + + + + + up + + + + + down + + + + + + + true + Konqueror + + kfmclient openProfile filemanagement + + + + + 1 + + 500 + + 400 + - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - previous - - - next - - - previous - - - next - - - previous - - - next - - - - - - - - - - - - - - no - - - - - - - - - - - yes - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - top - - - - - - left - - - - - - right - - - - - - bottom - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - vertical - - - horizontal - - - - - - - - - - - - - - - - - previous - - - next - - - - previous - - - next - - - previous - - - next - - - - - - - - - - - - - - - - client-list-combined-menu - - - root-menu - - - - - - previous - - - next - - - previous - - - next - - - - - - + + + client-list-combined-menu + + + + + root-menu + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + - - - menu.xml - 200 - + menu.xml + 200 + - no - - 100 - + 100 + - 400 - - yes - - yes - - - - - + yes + + + + - - +
diff --git a/debian/changelog b/debian/changelog index c461a1e..bbe05d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ -openbox (3.6.1-4) unstable; urgency=medium +openbox (3.6.1-4~tildelinux) unstable; urgency=medium + * add TildeLinux specific config + + -- ***REMOVED*** Sat, 29 Dec 2018 15:46:42 +1100 + +openbox (3.6.1-4) unstable; urgency=medium [ Bruno Pennati ] * Update manpage. (Closes: #800669) diff --git a/debian/copyright b/debian/copyright index 4961466..edc6373 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,6 +10,10 @@ Copyright: 2003, Ben Jansens 2003-2011, Dana Jansens License: GPL-2+ +Files: data/autostart/autostart.in data/menu.xml data/rc.xml +Copyright: 2018, TildeLinux Maintainers +License: GPL-2+ + Files: debian/* Copyright: 2002, Kyle McMartin 2003-2004, Tore Anderson diff --git a/debian/patches/06_openbox-3.5.0-which-2.20.patch b/debian/patches/06_openbox-3.5.0-which-2.20.patch deleted file mode 100644 index c8b62ef..0000000 --- a/debian/patches/06_openbox-3.5.0-which-2.20.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fixed load gnome 3 applications -Index: openbox-3.5.0/data/autostart/autostart.in -=================================================================== ---- openbox-3.5.0.orig/data/autostart/autostart.in 2013-07-17 17:09:45.000000000 +0200 -+++ openbox-3.5.0/data/autostart/autostart.in 2013-07-17 18:32:23.000000000 +0200 -@@ -8,7 +8,7 @@ - # - #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then - # @libexecdir@/gnome-settings-daemon & --#elif which gnome-settings-daemon >/dev/null; then -+#elif which gnome-settings-daemon >/dev/null 2>&1; then - # gnome-settings-daemon & - #fi - diff --git a/debian/patches/754207_use-scrot.patch b/debian/patches/754207_use-scrot.patch deleted file mode 100644 index 7df9190..0000000 --- a/debian/patches/754207_use-scrot.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Use scrot for taking a screenshots -Author: Mateusz Łukasik -Bug-Debian: http://bugs.debian.org/754207 - ---- a/data/rc.xml -+++ b/data/rc.xml -@@ -245,9 +245,9 @@ - - client-menu - -- -+ - -- gnome-screenshot -w -+ scrot -s - - - -@@ -312,9 +312,9 @@ - kfmclient openProfile filemanagement - - -- -+ - -- gnome-screenshot -+ scrot - - - diff --git a/debian/patches/series b/debian/patches/series index 36bfb49..d639de8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,14 +1,11 @@ #03_place_windows_in_quadrants.patch ## Needs to be ported on 3.5.2 -01_rc.xml.patch 02_fix_freedesktop_compliance.patch 04_fix_xml_load_file.patch 05_openbox-3.5.0-title-matching.patch -06_openbox-3.5.0-which-2.20.patch 07_update_desktop.patch 08_autostart-fix.patch 704724_fix_refers-to-autostart.sh.patch 719620_fix_show_startup_notification.patch -754207_use-scrot.patch 808138_Replace-getgrent-with-getgroups.patch d9a405e9.patch fix-spelling-error-in-binary.patch