From 0350ccc8102dd1ed32e65d5b9f08fdf33a2ab48a Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 20 Dec 2011 20:13:18 +0100 Subject: [PATCH 01/16] Release new version 0.3.13 --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index b3ea9ad..481b295 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +grml-desktop (0.3.13) unstable; urgency=low + + [ Ulrich Dangel ] + * [85ddb6f] Remove deprecated startupinfo + * [4a5a058] This patch fixes the incorrect keyboard layout under Xorg. + * [f384ac0] Add Mod4+{j,k} to fluxbox shortcuts + + -- Michael Prokop Tue, 20 Dec 2011 20:13:04 +0100 + grml-desktop (0.3.12) unstable; urgency=low [ Ulrich Dangel ] -- 2.1.4 From 117436c68072e2dd29b1b277dc4d3ad056f7b220 Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Sat, 31 Dec 2011 01:10:29 +0100 Subject: [PATCH 02/16] Update colorscheme to original tomorrow theme --- etc/skel/.Xresources | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/skel/.Xresources b/etc/skel/.Xresources index 4b8e1dd..cd09793 100644 --- a/etc/skel/.Xresources +++ b/etc/skel/.Xresources @@ -116,10 +116,10 @@ URxvt*scrollTtyKeypress: true *.background: #1d1f21 *.cursorColor: orange *.color0: #000000 -*.color1: #af7575 -*.color2: #8baf83 +*.color1: #912226 +*.color2: #778900 *.color3: #ae7b00 -*.color4: #8991b7 +*.color4: #1d2594 *.color5: #682a9b *.color6: #2b6651 *.color7: #929593 -- 2.1.4 From 6996aacfd605e9db3dd212a41de61064eb0459d6 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 9 Jan 2012 16:27:42 +0100 Subject: [PATCH 03/16] Release new version 0.3.14 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 481b295..de9394b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-desktop (0.3.14) unstable; urgency=low + + [ Ulrich Dangel ] + * [117436c] Update colorscheme to original tomorrow theme + + -- Michael Prokop Mon, 09 Jan 2012 16:27:35 +0100 + grml-desktop (0.3.13) unstable; urgency=low [ Ulrich Dangel ] -- 2.1.4 From 9d29286a16ef770a9425fd2671d3ea6514e24624 Mon Sep 17 00:00:00 2001 From: Frank Terbeck Date: Wed, 10 Oct 2012 09:23:17 +0200 Subject: [PATCH 04/16] To NOT terminate the X server when shift-backspace is pressed Signed-off-by: Frank Terbeck --- etc/skel/.Xmodmap | 2 +- etc/skel/.Xmodmap.german | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/skel/.Xmodmap b/etc/skel/.Xmodmap index 0a47007..9c7a853 100644 --- a/etc/skel/.Xmodmap +++ b/etc/skel/.Xmodmap @@ -128,7 +128,7 @@ keycode 18 = 9 parenleft bracketright keycode 19 = 0 parenright braceright keycode 20 = minus underscore ssharp keycode 21 = equal plus plusminus -keycode 22 = BackSpace Terminate_Server BackSpace Terminate_Server +keycode 22 = BackSpace BackSpace BackSpace BackSpace keycode 23 = Tab ISO_Left_Tab keycode 24 = q Q at keycode 25 = w W lstroke Lstroke lstroke Lstroke diff --git a/etc/skel/.Xmodmap.german b/etc/skel/.Xmodmap.german index b9bf5fa..068000c 100644 --- a/etc/skel/.Xmodmap.german +++ b/etc/skel/.Xmodmap.german @@ -130,7 +130,7 @@ keycode 18 = 9 parenright bracketright plusminus bracketright plusminus keycode 19 = 0 equal braceright degree braceright degree keycode 20 = ssharp question backslash questiondown backslash questiondown keycode 21 = dead_acute dead_grave dead_cedilla dead_ogonek dead_cedilla dead_ogonek -keycode 22 = BackSpace Terminate_Server BackSpace Terminate_Server +keycode 22 = BackSpace BackSpace BackSpace BackSpace keycode 23 = Tab ISO_Left_Tab keycode 24 = q Q at keycode 25 = w W lstroke Lstroke lstroke Lstroke -- 2.1.4 From 4146a6f3074b48035d98b85e28d0dac5b2693bbc Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 28 Oct 2012 12:46:23 +0100 Subject: [PATCH 05/16] Bump Standards-Version to 3.9.4 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 8b556d1..ad7eee3 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: grml Priority: extra Maintainer: Michael Prokop Build-Depends: debhelper (>= 5) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Homepage: http://git.grml.org/?p=grml-desktop.git Vcs-git: git://git.grml.org/grml-desktop.git Vcs-Browser: http://git.grml.org/?p=grml-desktop.git -- 2.1.4 From 5f8ee46ebcb413daca47db85617250e41f7f7441 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 28 Oct 2012 12:46:55 +0100 Subject: [PATCH 06/16] Release new version 0.4.0 --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index de9394b..1b1b2d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +grml-desktop (0.4.0) unstable; urgency=low + + [ Frank Terbeck ] + * [9d29286] To NOT terminate the X server when shift-backspace is + pressed + + [ Michael Prokop ] + * [4146a6f] Bump Standards-Version to 3.9.4 + + -- Michael Prokop Sun, 28 Oct 2012 12:46:27 +0100 + grml-desktop (0.3.14) unstable; urgency=low [ Ulrich Dangel ] -- 2.1.4 From d4a2c5b0a3cdc17b398b72748bad26455c2ae80a Mon Sep 17 00:00:00 2001 From: Thiago Perrotta Date: Sun, 19 Apr 2015 23:25:15 -0300 Subject: [PATCH 07/16] include .Xresources.local on .Xresources --- etc/skel/.Xresources | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/skel/.Xresources b/etc/skel/.Xresources index cd09793..d0de2b4 100644 --- a/etc/skel/.Xresources +++ b/etc/skel/.Xresources @@ -197,4 +197,6 @@ nedit*XmText.background: white nedit*XmTextField.background: white nedit*XmList.background: white +#include ".Xresources.local" + !# END OF FILE ################################################################# -- 2.1.4 From 3048137a0962c0a5f73d2a8feb6e0db782c57e2b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 6 Jun 2015 01:55:23 +0200 Subject: [PATCH 08/16] Bump Standards-Version to 3.9.6 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ad7eee3..3a2b9f6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: grml Priority: extra Maintainer: Michael Prokop Build-Depends: debhelper (>= 5) -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Homepage: http://git.grml.org/?p=grml-desktop.git Vcs-git: git://git.grml.org/grml-desktop.git Vcs-Browser: http://git.grml.org/?p=grml-desktop.git -- 2.1.4 From b84f7c306bfbe2e20d73bf2007940690c1df7da9 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 6 Jun 2015 01:55:33 +0200 Subject: [PATCH 09/16] Release new version 0.4.1 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1b1b2d1..c03ab8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +grml-desktop (0.4.1) unstable; urgency=medium + + [ Thiago Perrotta ] + * [d4a2c5b] include .Xresources.local on .Xresources + + [ Michael Prokop ] + * [3048137] Bump Standards-Version to 3.9.6 + + -- Michael Prokop Sat, 06 Jun 2015 01:55:30 +0200 + grml-desktop (0.4.0) unstable; urgency=low [ Frank Terbeck ] -- 2.1.4 From eb98a4cdbf00055fa4ab5952c4901d06c584cf6b Mon Sep 17 00:00:00 2001 From: Darshaka Pathirana Date: Fri, 5 May 2017 15:57:47 +0200 Subject: [PATCH 10/16] Replace iceweasel with firefox The "Iceweasel Age"[1] has ended and we can use Firefox again. + Changed the fluxbox shortcut to open firefox + Changed the fluxbox menu to open firefox [1] https://lwn.net/Articles/676799/ Closes grml/grml#15 --- etc/skel/.fluxbox/keys | 2 +- etc/skel/.fluxbox/menu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/skel/.fluxbox/keys b/etc/skel/.fluxbox/keys index cab7bcd..1aee5c6 100644 --- a/etc/skel/.fluxbox/keys +++ b/etc/skel/.fluxbox/keys @@ -88,7 +88,7 @@ Control Mod1 a :ArrangeWindows # keymappings for programs Control Mod1 l :ExecCommand xlock -Control Mod1 f :ExecCommand iceweasel +Control Mod1 f :ExecCommand firefox # screenshot Control Shift s :ExecCommand import -window root `date +shot-%Y-%m-%d-%H%M%S.jpg` diff --git a/etc/skel/.fluxbox/menu b/etc/skel/.fluxbox/menu index 55c60e6..772bbf0 100644 --- a/etc/skel/.fluxbox/menu +++ b/etc/skel/.fluxbox/menu @@ -1,6 +1,6 @@ [begin] (Fluxbox) {} <> [exec] (xterm) {x-terminal-emulator} <> - [exec] (Iceweasel / Firefox) {iceweasel} <> + [exec] (Firefox) {firefox} <> [exec] (Run ...) {fbrun} <> [exec] (configure network) {sudo x-terminal-emulator -T "grml-network" -e /usr/sbin/grml-network} <> [exec] (configure and run terminalserver) {grml-exec-wrapper -p grml-terminalserver sudo x-terminal-emulator -T "grml-terminalserver" -e /usr/sbin/grml-terminalserver} <> -- 2.1.4 From b00877396303daf38e2b70ae33a9fd31fdcbef34 Mon Sep 17 00:00:00 2001 From: Darshaka Pathirana Date: Fri, 5 May 2017 15:59:21 +0200 Subject: [PATCH 11/16] Remove workaround for an old iceweasel bug The workaround for an old iceweasel bug regarding the forward/back button is not needed anymore. --- etc/skel/.gtkrc-2.0 | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 etc/skel/.gtkrc-2.0 diff --git a/etc/skel/.gtkrc-2.0 b/etc/skel/.gtkrc-2.0 deleted file mode 100644 index 6df9501..0000000 --- a/etc/skel/.gtkrc-2.0 +++ /dev/null @@ -1,2 +0,0 @@ -# workaround for an iceweasel bug regarding the forward/back button -gtk-fallback-icon-theme="moblin" -- 2.1.4 From 3031693b24058c1a56a3ac63cf1771169413dd84 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 5 May 2017 16:04:36 +0200 Subject: [PATCH 12/16] Bump Standards-Version to 3.9.8 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 3a2b9f6..2094be8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: grml Priority: extra Maintainer: Michael Prokop Build-Depends: debhelper (>= 5) -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: http://git.grml.org/?p=grml-desktop.git Vcs-git: git://git.grml.org/grml-desktop.git Vcs-Browser: http://git.grml.org/?p=grml-desktop.git -- 2.1.4 From 5d20b1a4cb0829a5c7d51fbc18680d75203304b3 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 5 May 2017 16:04:45 +0200 Subject: [PATCH 13/16] Bump debian/compat to 9 --- debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 -- 2.1.4 From 86b59c3f840e73a75572f62869b4abf7f742f4a5 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 5 May 2017 16:07:54 +0200 Subject: [PATCH 14/16] Drop Conflicts on grml-etc <= 1.3.4, no longer relevant --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 2094be8..74de529 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,6 @@ Architecture: all Depends: grml-scripts (>= 1.1.18), moblin-icon-theme, hsetroot, ${misc:Depends} Recommends: fluxbox Suggests: idesk, fvwm | fvwm2 | fvwm-crystal, awesome, pekwm -Conflicts: grml-etc (<= 1.3.4) Description: configuration files for the X desktop at grml This package provides several configuration files for different tools and window managers used at Grml. The -- 2.1.4 From 8e35166e0756a2e9a543238c59ff8c1a82792165 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 5 May 2017 16:09:25 +0200 Subject: [PATCH 15/16] Drop all packages from Suggests, no longer needed nor supported --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 74de529..ddc0fa4 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Package: grml-desktop Architecture: all Depends: grml-scripts (>= 1.1.18), moblin-icon-theme, hsetroot, ${misc:Depends} Recommends: fluxbox -Suggests: idesk, fvwm | fvwm2 | fvwm-crystal, awesome, pekwm Description: configuration files for the X desktop at grml This package provides several configuration files for different tools and window managers used at Grml. The -- 2.1.4 From 6321791e4950b519bb5c3f8d1dfeccaf3819035e Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 5 May 2017 16:09:32 +0200 Subject: [PATCH 16/16] Drop hsetroot from Depends, seems to be no longer relevant --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ddc0fa4..bedcbd8 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Bugs: mailto:bugs@grml.org Package: grml-desktop Architecture: all -Depends: grml-scripts (>= 1.1.18), moblin-icon-theme, hsetroot, ${misc:Depends} +Depends: grml-scripts (>= 1.1.18), moblin-icon-theme, ${misc:Depends} Recommends: fluxbox Description: configuration files for the X desktop at grml This package provides several configuration files for -- 2.1.4