From f4af1d0fa3b017f9b5a458ef7515862cee4e7377 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 12 Feb 2009 18:12:32 +0100 Subject: [PATCH 01/16] Use mktemp consequently for tmp files --- debian/changelog | 7 +++++-- grml-x | 35 ++++++++++++++++------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index faabb4b..e070da8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,11 +4,14 @@ grml-x (0.4.2) unstable; urgency=low - use double brackets for the test command - make sure the right usage text gets displayed - support fallback options - + - improve description of force option Thanks to ft and z3ttacht for their work! [Closes: issue398] * Use Build-Depends-Indep in debian/control to make lintian happy. + * Consequently use mktemp for handling tmp files. + * Use fluxbox for all usage examples in grml-x itself (on grml-medium + we ship fluxbox only and people might be confused otherwise). - -- Michael Prokop Thu, 12 Feb 2009 18:04:15 +0100 + -- Michael Prokop Thu, 12 Feb 2009 18:10:53 +0100 grml-x (0.4.1) unstable; urgency=low diff --git a/grml-x b/grml-x index a28a5fb..85ec3f0 100755 --- a/grml-x +++ b/grml-x @@ -6,13 +6,6 @@ # License: This file is licensed under the GPL v2. ################################################################################ -# make sure /tmp is writeable {{{ - if ! [ -w /tmp ] ; then - echo 'Fatal: /tmp is not writeable. Can not resume therefore, sorry.' >&2 - exit 1 - fi -# }}} - # debugging {{{ # usage: DEBUG=1 grml-x ..... 2>/tmp/grml-x-debug.log if [[ $DEBUG -gt 0 ]]; then @@ -46,9 +39,14 @@ [ -n "$XINITRC" ] || XINITRC="$HOME/.xinitrc" # temporary files - HWINFO_TMP="/tmp/hwinfo.$$" - MONITORINFO="/tmp/monitorinfo.$$" - MOUSEINFO="/tmp/mouse.$$" + HWINFO_TMP="$(mktemp)" + MONITORINFO="$(mktemp)" + MOUSEINFO="$(mktemp)" + + if [ -z "$HWINFO_TMP" ] ; then + echo "Fatal: could not create temporary file. Exiting.">&2 + bailout 1 + fi if [ -r /etc/sysconfig/keyboard ] ; then source /etc/sysconfig/keyboard @@ -127,17 +125,16 @@ Usage: $PROGRAMNAME $PROGRAMNAME [-options] windowmanager Usage examples: - $PROGRAMNAME wmii $PROGRAMNAME fluxbox - $PROGRAMNAME openbox + $PROGRAMNAME fluxbox $PROGRAMNAME -force -nostart fluxbox $PROGRAMNAME -nosynaptics fluxbox $PROGRAMNAME -nosync fluxbox - $PROGRAMNAME -noddc wmii - $PROGRAMNAME -xinerama -composite wmii - $PROGRAMNAME -module radeon -mode 1024x768 -vsync 60 openbox - XINITRC=~/.xinitrc $PROGRAMNAME openbox - $PROGRAMNAME -display 8 openbox + $PROGRAMNAME -noddc fluxbox + $PROGRAMNAME -xinerama -composite fluxbox + $PROGRAMNAME -module radeon -mode 1024x768 -vsync 60 fluxbox + XINITRC=~/.xinitrc $PROGRAMNAME fluxbox + $PROGRAMNAME -display 8 fluxbox More information on grml-x can be found in the manual page: man grml-x @@ -681,7 +678,7 @@ cat << EOX # /usr/share/doc/xserver-xorg/ and # http://wiki.x.org/wiki/Home and # http://ftp.x.org/pub/X11R7.0/doc/html/index.html for information on Xorg -# +# # Refer to the xorg.conf man page and to # http://ftp.x.org/pub/X11R7.0/doc/html/xorg.conf.5.html # for details about the format of this file. @@ -852,7 +849,7 @@ EOX # writeit {{{ writeit() { - XCONFTMP="/tmp/xconfig.$$" + XCONFTMP="$(mktemp)" xconfig > $XCONFTMP # we do not want to have two CorePointers, deactivate one therefore if grep -Eq '^[[:space:]]+InputDevice[ ]+"USB Mouse"[ ]+"CorePointer"' $XCONFTMP ; then -- 2.1.4 From 50b29c2e24ab0f3be3d4aec175f955d92831158c Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 12 Feb 2009 18:44:47 +0100 Subject: [PATCH 02/16] Exit if mktemp fails, use -u for HWINFO_TMP --- grml-x | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/grml-x b/grml-x index 85ec3f0..fdf8a9d 100755 --- a/grml-x +++ b/grml-x @@ -39,9 +39,11 @@ [ -n "$XINITRC" ] || XINITRC="$HOME/.xinitrc" # temporary files - HWINFO_TMP="$(mktemp)" - MONITORINFO="$(mktemp)" - MOUSEINFO="$(mktemp)" + # notice: we need the unsafe option, otherwise users other than root + # can not write to HWINFO_TMP, but we don't want to run hwinfo as root + HWINFO_TMP="$(mktemp -u)" || exit 1 + MONITORINFO="$(mktemp)" || exit 1 + MOUSEINFO="$(mktemp)" || exit 1 if [ -z "$HWINFO_TMP" ] ; then echo "Fatal: could not create temporary file. Exiting.">&2 -- 2.1.4 From 910af43b493c2d1089d0785c2ed80c8b5bd6116b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 19 Apr 2009 23:45:58 +0200 Subject: [PATCH 03/16] Use Option "DontZap" "false" by default --- debian/changelog | 7 +++++++ etc/X11/xorg.conf.example | 3 +-- etc/X11/xorg.conf.virtualbox | 3 +-- etc/X11/xorg.conf.vmware | 3 +-- grml-x | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index e070da8..73169bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-x (0.4.3) unstable; urgency=low + + * Use Option "DontZap" "false" by default, now as DontZap has become + a default option. See https://wiki.ubuntu.com/X/Config/DontZap + + -- Michael Prokop Sun, 19 Apr 2009 23:45:20 +0200 + grml-x (0.4.2) unstable; urgency=low * Improve zsh completion: diff --git a/etc/X11/xorg.conf.example b/etc/X11/xorg.conf.example index 5db17b7..a213cdb 100644 --- a/etc/X11/xorg.conf.example +++ b/etc/X11/xorg.conf.example @@ -2,7 +2,6 @@ # Filename: /etc/X11/xorg.conf # Purpose: config file for xserver - generated by grml-x # Bug-Reports: see http://grml.org/bugs/ -# Latest change: Sat Apr 15 10:39:38 CEST 2006 [mika] # See also: # /usr/share/doc/xserver-xorg/ and # http://wiki.x.org/wiki/Home and @@ -27,7 +26,7 @@ EndSection Section "ServerFlags" Option "AllowMouseOpenFail" "true" # allows the server to start up even if the mouse does not work Option "DontVTSwitch" "false" # allow switching between virtual terminal - # Option "DontZap" "true" # disable (server abort) + Option "DontZap" "false" # enable (server abort) # Option "DontZoom" "true" # disable / (resolution switching) EndSection diff --git a/etc/X11/xorg.conf.virtualbox b/etc/X11/xorg.conf.virtualbox index 996a47a..b313a30 100644 --- a/etc/X11/xorg.conf.virtualbox +++ b/etc/X11/xorg.conf.virtualbox @@ -2,7 +2,6 @@ # Filename: /etc/X11/xorg.conf.virtualbox # Purpose: config file for xserver - generated by grml-x # Bug-Reports: see http://grml.org/bugs/ -# Latest change: Don Dez 27 23:40:16 CET 2007 [mika] # See also: # /usr/share/doc/xserver-xorg/ and # http://wiki.x.org/wiki/Home and @@ -30,7 +29,7 @@ EndSection Section "ServerFlags" Option "AllowMouseOpenFail" "true" # allows the server to start up even if the mouse does not work Option "DontVTSwitch" "false" # allow switching between virtual terminal - # Option "DontZap" "true" # disable (server abort) + Option "DontZap" "false" # enable (server abort) # Option "DontZoom" "true" # disable / (resolution switching) EndSection diff --git a/etc/X11/xorg.conf.vmware b/etc/X11/xorg.conf.vmware index 98434d9..5c4ef69 100644 --- a/etc/X11/xorg.conf.vmware +++ b/etc/X11/xorg.conf.vmware @@ -2,7 +2,6 @@ # Filename: /etc/X11/xorg.conf.vmware # Purpose: config file for xserver - generated by grml-x # Bug-Reports: see http://grml.org/bugs/ -# Latest change: Son Nov 18 10:04:56 CET 2007 [mika] # See also: # /usr/share/doc/xserver-xorg/ and # http://wiki.x.org/wiki/Home and @@ -31,7 +30,7 @@ EndSection Section "ServerFlags" Option "AllowMouseOpenFail" "true" # allows the server to start up even if the mouse does not work Option "DontVTSwitch" "false" # allow switching between virtual terminal - # Option "DontZap" "true" # disable (server abort) + Option "DontZap" "false" # enable (server abort) # Option "DontZoom" "true" # disable / (resolution switching) EndSection diff --git a/grml-x b/grml-x index fdf8a9d..fc9ff76 100755 --- a/grml-x +++ b/grml-x @@ -704,7 +704,7 @@ EndSection Section "ServerFlags" Option "AllowMouseOpenFail" "true" # allows the server to start up even if the mouse does not work Option "DontVTSwitch" "false" # allow switching between virtual terminal - # Option "DontZap" "true" # disable (server abort) + Option "DontZap" "false" # enable (server abort) # Option "DontZoom" "true" # disable / (resolution switching) EndSection -- 2.1.4 From 6546276ac2c4e3ecdfbbb75c30eb9349c8bf0d07 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 19 Apr 2009 23:46:12 +0200 Subject: [PATCH 04/16] Drop .hgtags --- .hgtags | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .hgtags diff --git a/.hgtags b/.hgtags deleted file mode 100644 index 7e8e78f..0000000 --- a/.hgtags +++ /dev/null @@ -1,22 +0,0 @@ -cbee4935312c2045dc5455675770d0a31596e3ee 0.3-12 -84cb2b626280f045c2a6c87e44c094e76f4e0f80 0.3-13 -e01fb5548bae5733c92b6edde08007328923c25c grml0.9 -25fc42b7e5470b7598c8a9e1eb1df3086f52a038 0.3.16 -906ff773cbecf711e3facfa2371606392e6124d1 0.3.17 -999b71e81e5ab637316ac3260fc9adb428631e05 0.3.18 -9795e9f889e6ab3dc092368c6c00f9b0750ab0e4 0.3.20 -99936bc5be326ae8a289de1f4d2a70754730e188 0.3.21 -2831c989d4be1593dec67770553ace67ab38cbde 0.3.22 -dd603f99a7e0bde65f14657774da1edfbed32fae 0.3.23 -b4d70c423c8df36395d4a90a1b7360f24b2fb986 0.3.24 -1789a1df0641d35470c1964470a2a383a0d7a103 0.3.25 -9a592ecc53f07e6cabe8715879d15c0bf6b58dd6 0.3.27 -af6688623759e44d6fe71182593c5256c9aa19c4 0.3.28 -40e16cf690bf6b9cc4125bc236df5e3843d19f91 0.3.31 -775a664bc3ad13d54f0cf050de9bb297ed46aae7 0.3.32 -aafea101ddc8671d14147608c83c641b0e0768f3 0.3.33 -1d953857ebcd8029671d995c0490168eed4aff93 0.3.34 -862fefde221176b5172c6560dee4cab9ec9f4f73 0.3.35 -677bfe948e9bd48ed0ee8e42961108a746581df4 0.3.36 -67854ada69c6e24ac218199bc1caf677ec7c1c9e 0.3.37 -9327a1258479797ccb6d6c4f7e7387dff5447030 0.4.0 -- 2.1.4 From de43fe6a318e2deff00feb4e33ce31096df9b8f0 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 20 Apr 2009 13:17:16 +0200 Subject: [PATCH 05/16] Add Option "AutoAddDevices" "off" --- debian/changelog | 7 +++++++ etc/X11/xorg.conf.example | 1 + etc/X11/xorg.conf.virtualbox | 1 + etc/X11/xorg.conf.vmware | 1 + grml-x | 1 + 5 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 73169bf..a624fe6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-x (0.4.4) unstable; urgency=low + + * Add Option "AutoAddDevices" "off", as we do not want to depend on + running dbus/hal. See http://wiki.debian.org/XStrikeForce/InputHotplugGuide + + -- Michael Prokop Mon, 20 Apr 2009 13:15:48 +0200 + grml-x (0.4.3) unstable; urgency=low * Use Option "DontZap" "false" by default, now as DontZap has become diff --git a/etc/X11/xorg.conf.example b/etc/X11/xorg.conf.example index a213cdb..3d869a7 100644 --- a/etc/X11/xorg.conf.example +++ b/etc/X11/xorg.conf.example @@ -21,6 +21,7 @@ Section "ServerLayout" InputDevice "Keyboard0" "CoreKeyboard" InputDevice "USB Mouse" "CorePointer" # InputDevice "PS/2 Mouse" "CorePointer" + Option "AutoAddDevices" "off" # do not depend on running dbus/hal EndSection Section "ServerFlags" diff --git a/etc/X11/xorg.conf.virtualbox b/etc/X11/xorg.conf.virtualbox index b313a30..14463de 100644 --- a/etc/X11/xorg.conf.virtualbox +++ b/etc/X11/xorg.conf.virtualbox @@ -24,6 +24,7 @@ Section "ServerLayout" # InputDevice "PS/2 Mouse" "CorePointer" # No synaptics/alps touchpad present. # No serial mouse detected. + Option "AutoAddDevices" "off" # do not depend on running dbus/hal EndSection Section "ServerFlags" diff --git a/etc/X11/xorg.conf.vmware b/etc/X11/xorg.conf.vmware index 5c4ef69..52d0772 100644 --- a/etc/X11/xorg.conf.vmware +++ b/etc/X11/xorg.conf.vmware @@ -25,6 +25,7 @@ Section "ServerLayout" # InputDevice "PS/2 Mouse" "CorePointer" # No synaptics/alps touchpad present. # No serial mouse detected. + Option "AutoAddDevices" "off" # do not depend on running dbus/hal EndSection Section "ServerFlags" diff --git a/grml-x b/grml-x index fc9ff76..c36b04d 100755 --- a/grml-x +++ b/grml-x @@ -698,6 +698,7 @@ Section "ServerLayout" Screen 0 "Screen0" 0 0 # InputDevice "Keyboard0" "CoreKeyboard" # InputDevice "Generic Mouse" "CorePointer" + Option "AutoAddDevices" "off" # do not depend on running dbus/hal $MOUSE EndSection -- 2.1.4 From 3e6ee4dde45ae50598694bb5b39516fc3f991a72 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 20 Apr 2009 13:19:55 +0200 Subject: [PATCH 06/16] Depend on debhelper (>= 5) and bump compat version to 5 --- debian/changelog | 3 ++- debian/compat | 2 +- debian/control | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a624fe6..b4e0788 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ grml-x (0.4.4) unstable; urgency=low * Add Option "AutoAddDevices" "off", as we do not want to depend on running dbus/hal. See http://wiki.debian.org/XStrikeForce/InputHotplugGuide + * Depend on debhelper (>= 5) and bump compat version to 5. - -- Michael Prokop Mon, 20 Apr 2009 13:15:48 +0200 + -- Michael Prokop Mon, 20 Apr 2009 13:19:30 +0200 grml-x (0.4.3) unstable; urgency=low diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index dca6339..4b1a43d 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: grml-x Section: grml Priority: optional Maintainer: Michael Prokop -Build-Depends: debhelper (>= 4.0.0) +Build-Depends: debhelper (>= 5) Build-Depends-Indep: asciidoc, xsltproc, docbook-xsl -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://git.grml.org/?p=grml-x.git Vcs-git: git://git.grml.org/grml-x.git Vcs-Browser: http://git.grml.org/?p=grml-x.git -- 2.1.4 From 4da93232d56a90c4297feede695f8b374d7a27b8 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 22 Jul 2009 22:49:50 +0200 Subject: [PATCH 07/16] Move zsh completion; add xfce4-session to zsh completion --- debian/changelog | 8 ++++++++ debian/control | 2 +- debian/rules | 8 ++++---- .../completion.d => usr_share_grml/zsh/completion/grml}/_grml-x | 4 ++-- 4 files changed, 15 insertions(+), 7 deletions(-) rename {etc/zsh/completion.d => usr_share_grml/zsh/completion/grml}/_grml-x (95%) diff --git a/debian/changelog b/debian/changelog index b4e0788..0ef291b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +grml-x (0.4.5) unstable; urgency=low + + * Move zsh completion file to /usr/share/grml/zsh/completion/grml/_grml-x + as introduced by grml-etc-core 0.3.73. + * Add xfce4-session to zsh completion. + + -- Michael Prokop Wed, 22 Jul 2009 22:46:56 +0200 + grml-x (0.4.4) unstable; urgency=low * Add Option "AutoAddDevices" "off", as we do not want to depend on diff --git a/debian/control b/debian/control index 4b1a43d..80beb0a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Michael Prokop Build-Depends: debhelper (>= 5) Build-Depends-Indep: asciidoc, xsltproc, docbook-xsl -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 Homepage: http://git.grml.org/?p=grml-x.git Vcs-git: git://git.grml.org/grml-x.git Vcs-Browser: http://git.grml.org/?p=grml-x.git diff --git a/debian/rules b/debian/rules index fc8db49..99ea7b3 100755 --- a/debian/rules +++ b/debian/rules @@ -31,12 +31,12 @@ install: build dh_testdir dh_testroot dh_clean -k - dh_installdirs etc/init.d usr/bin + dh_installdirs etc/init.d usr/bin usr/share/grml # Add here commands to install the package into debian/grml-x. - install -m 755 grml-x debian/grml-x/usr/bin/grml-x - cp -r etc/X11/ debian/grml-x/etc/ - cp -r etc/zsh/ debian/grml-x/etc/ + install -m 755 grml-x debian/grml-x/usr/bin/grml-x + cp -r etc/X11/ debian/grml-x/etc/ + cp -r usr_share_grml/ debian/grml-x/usr/share/grml/ # Build architecture-dependent files here. binary-arch: build install diff --git a/etc/zsh/completion.d/_grml-x b/usr_share_grml/zsh/completion/grml/_grml-x similarity index 95% rename from etc/zsh/completion.d/_grml-x rename to usr_share_grml/zsh/completion/grml/_grml-x index 6f01c8b..295a221 100644 --- a/etc/zsh/completion.d/_grml-x +++ b/usr_share_grml/zsh/completion/grml/_grml-x @@ -1,5 +1,5 @@ #compdef grml-x -# Filename: /etc/zsh/completion.d/grml-x +# Filename: /usr/share/grml/zsh/completion/grml/_grml-x # Purpose: completion for command grml-x for zsh (z shell) # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ @@ -14,7 +14,7 @@ wms=() for wm in awesome blackbox dwm evilwm fluxbox fvwm fvwm2 fvwm-crystal \ gnome-session gnomesession icewm ion2 ion3 jwm larswm openbox \ particleman pekwm pwm3 ratpoison startkde twm w9wm windowlab wmi \ - wmii wm-ng xfce4 xfwm4 xmonad ; do + wmii wm-ng xfce4 xfce4-session xfwm4 xmonad ; do [[ -x /usr/bin/$wm ]] && wms+=$wm done -- 2.1.4 From b24543733f512aecbcd6e22facdbbfa5d23c2b7e Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 22 Jul 2009 23:19:11 +0200 Subject: [PATCH 08/16] Fix path of usr_share_grml/zsh --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 99ea7b3..fe37378 100755 --- a/debian/rules +++ b/debian/rules @@ -34,9 +34,9 @@ install: build dh_installdirs etc/init.d usr/bin usr/share/grml # Add here commands to install the package into debian/grml-x. - install -m 755 grml-x debian/grml-x/usr/bin/grml-x - cp -r etc/X11/ debian/grml-x/etc/ - cp -r usr_share_grml/ debian/grml-x/usr/share/grml/ + install -m 755 grml-x debian/grml-x/usr/bin/grml-x + cp -r etc/X11/ debian/grml-x/etc/ + cp -r usr_share_grml/zsh/ debian/grml-x/usr/share/grml/ # Build architecture-dependent files here. binary-arch: build install -- 2.1.4 From ac4d09acab539ad1a65a01e5e75a3379a528b096 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 22 Jul 2009 23:21:32 +0200 Subject: [PATCH 09/16] Drop deprecated /etc/init.d/xfree86-common and debian/dirs --- debian/dirs | 3 -- debian/rules | 2 +- etc/init.d/xfree86-common | 81 ----------------------------------------------- 3 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 debian/dirs delete mode 100755 etc/init.d/xfree86-common diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ac07f15..0000000 --- a/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -etc/zsh -etc/X11 -usr/bin diff --git a/debian/rules b/debian/rules index fe37378..9556cc3 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,7 @@ install: build dh_testdir dh_testroot dh_clean -k - dh_installdirs etc/init.d usr/bin usr/share/grml + dh_installdirs usr/bin usr/share/grml # Add here commands to install the package into debian/grml-x. install -m 755 grml-x debian/grml-x/usr/bin/grml-x diff --git a/etc/init.d/xfree86-common b/etc/init.d/xfree86-common deleted file mode 100755 index 34310c6..0000000 --- a/etc/init.d/xfree86-common +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -# $Id: xfree86-common.init 2186 2005-02-11 07:11:05Z branden $ - -# Copyright 2003, 2004 Branden Robinson . -# -# This is free software; you may redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, -# or (at your option) any later version. -# -# This is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License with -# the Debian operating system, in /usr/share/common-licenses/GPL; if -# not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA - -set -e - -PATH=/bin:/usr/bin:/sbin:/usr/sbin -SOCKET_DIR=/tmp/.X11-unix -ICE_DIR=/tmp/.ICE-unix - -do_restorecon () { - # Restore file security context (SELinux). - if which restorecon >/dev/null 2>&1; then - restorecon "$1" - fi -} - -set_up_socket_dir () { - echo -n "Setting up X server socket directory $SOCKET_DIR..." - if [ -e $SOCKET_DIR ] && ! [ -d $SOCKET_DIR ]; then - mv $SOCKET_DIR $SOCKET_DIR.$$ - fi - mkdir -p $SOCKET_DIR - chown 0:0 $SOCKET_DIR - chmod 1777 $SOCKET_DIR - do_restorecon $SOCKET_DIR - echo "done." -} - -set_up_ice_dir () { - echo -n "Setting up ICE socket directory $ICE_DIR..." - if [ -e $ICE_DIR ] && ! [ -d $ICE_DIR ]; then - mv $ICE_DIR $ICE_DIR.$$ - fi - mkdir -p $ICE_DIR - chown 0:0 $ICE_DIR - chmod 1777 $ICE_DIR - do_restorecon $ICE_DIR - echo "done." -} - -case "$1" in - start) - set_up_socket_dir - set_up_ice_dir - ;; - - restart|reload|force-reload) - /etc/init.d/xfree86-common start - ;; - - stop) - : - ;; - - *) - echo "Usage: /etc/init.d/xfree86-common {start|stop|restart|reload|force-reload}" - exit 1 - ;; -esac - -exit 0 - -# vim:set ai et sts=2 sw=2 tw=80: -- 2.1.4 From 3256f1f7cbead262acc175f37e80bbcd8d4225c5 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 22 Jul 2009 23:23:56 +0200 Subject: [PATCH 10/16] Create /etc/X11 accordingly in debian/rules --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 9556cc3..3b48066 100755 --- a/debian/rules +++ b/debian/rules @@ -31,12 +31,12 @@ install: build dh_testdir dh_testroot dh_clean -k - dh_installdirs usr/bin usr/share/grml + dh_installdirs etc/X11 usr/bin usr/share/grml # Add here commands to install the package into debian/grml-x. install -m 755 grml-x debian/grml-x/usr/bin/grml-x - cp -r etc/X11/ debian/grml-x/etc/ - cp -r usr_share_grml/zsh/ debian/grml-x/usr/share/grml/ + cp -a etc/X11/* debian/grml-x/etc/X11/ + cp -a usr_share_grml/zsh/ debian/grml-x/usr/share/grml/ # Build architecture-dependent files here. binary-arch: build install -- 2.1.4 From f0eab9d077bbfa720444a70f9d687bc225423d1c Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 22 Jul 2009 23:30:47 +0200 Subject: [PATCH 11/16] Add lxsession to zsh completion --- debian/changelog | 4 ++-- usr_share_grml/zsh/completion/grml/_grml-x | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ef291b..fec4fd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,9 @@ grml-x (0.4.5) unstable; urgency=low * Move zsh completion file to /usr/share/grml/zsh/completion/grml/_grml-x as introduced by grml-etc-core 0.3.73. - * Add xfce4-session to zsh completion. + * Add lxsession and xfce4-session to zsh completion. - -- Michael Prokop Wed, 22 Jul 2009 22:46:56 +0200 + -- Michael Prokop Wed, 22 Jul 2009 23:30:27 +0200 grml-x (0.4.4) unstable; urgency=low diff --git a/usr_share_grml/zsh/completion/grml/_grml-x b/usr_share_grml/zsh/completion/grml/_grml-x index 295a221..7340921 100644 --- a/usr_share_grml/zsh/completion/grml/_grml-x +++ b/usr_share_grml/zsh/completion/grml/_grml-x @@ -11,10 +11,10 @@ local -a wms wms=() -for wm in awesome blackbox dwm evilwm fluxbox fvwm fvwm2 fvwm-crystal \ - gnome-session gnomesession icewm ion2 ion3 jwm larswm openbox \ - particleman pekwm pwm3 ratpoison startkde twm w9wm windowlab wmi \ - wmii wm-ng xfce4 xfce4-session xfwm4 xmonad ; do +for wm in awesome blackbox dwm evilwm fluxbox fvwm fvwm2 fvwm-crystal \ + gnome-session gnomesession icewm ion2 ion3 jwm larswm lxsession \ + openbox particleman pekwm pwm3 ratpoison startkde twm w9wm \ + windowlab wmi wmii wm-ng xfce4 xfce4-session xfwm4 xmonad ; do [[ -x /usr/bin/$wm ]] && wms+=$wm done -- 2.1.4 From 1332d371e168385349722e5ea2b8298c868fbb3e Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 10 Aug 2009 16:05:01 +0200 Subject: [PATCH 12/16] Add x-window-manager to zsh completion --- debian/changelog | 6 ++++++ usr_share_grml/zsh/completion/grml/_grml-x | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fec4fd9..6edd351 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml-x (0.4.6) unstable; urgency=low + + * Add x-window-manager to zsh completion. [Closes: issue716] + + -- Michael Prokop Mon, 10 Aug 2009 16:04:02 +0200 + grml-x (0.4.5) unstable; urgency=low * Move zsh completion file to /usr/share/grml/zsh/completion/grml/_grml-x diff --git a/usr_share_grml/zsh/completion/grml/_grml-x b/usr_share_grml/zsh/completion/grml/_grml-x index 7340921..22dc13b 100644 --- a/usr_share_grml/zsh/completion/grml/_grml-x +++ b/usr_share_grml/zsh/completion/grml/_grml-x @@ -14,7 +14,8 @@ wms=() for wm in awesome blackbox dwm evilwm fluxbox fvwm fvwm2 fvwm-crystal \ gnome-session gnomesession icewm ion2 ion3 jwm larswm lxsession \ openbox particleman pekwm pwm3 ratpoison startkde twm w9wm \ - windowlab wmi wmii wm-ng xfce4 xfce4-session xfwm4 xmonad ; do + windowlab wmi wmii wm-ng xfce4 xfce4-session xfwm4 xmonad \ + x-window-manager ; do [[ -x /usr/bin/$wm ]] && wms+=$wm done -- 2.1.4 From 516a12154c2055e87016ad06fe13bf24242a190a Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 18 Oct 2009 15:21:36 +0200 Subject: [PATCH 13/16] Fix virtualbox config, deactivate type1 and freetype module --- debian/changelog | 10 ++++++++++ etc/X11/xorg.conf.example | 8 ++++---- etc/X11/xorg.conf.virtualbox | 18 +++++++++--------- etc/X11/xorg.conf.vmware | 8 ++++---- grml-x | 6 +++--- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6edd351..9ee14bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +grml-x (0.4.7) unstable; urgency=low + + * xorg.conf.virtualbox: deactivate all Options from "Generic Mouse" + so mouse clicking works in recent X.org versions again. + [Closes: issue740] + * Deactivate type1 and freetype module in all xorg.conf files (they + aren't present on nowadays systems). + + -- Michael Prokop Sun, 18 Oct 2009 15:19:00 +0200 + grml-x (0.4.6) unstable; urgency=low * Add x-window-manager to zsh completion. [Closes: issue716] diff --git a/etc/X11/xorg.conf.example b/etc/X11/xorg.conf.example index 3d869a7..7f923d4 100644 --- a/etc/X11/xorg.conf.example +++ b/etc/X11/xorg.conf.example @@ -62,19 +62,19 @@ Section "Module" Load "dbe" # double buffer extension Load "dri" # direct rendering Load "glx" # 3D layer - Load "type1" # font module - Load "freetype" # font rendering Load "extmod" # some commonly used server extensions (e.g. shape extension) Load "record" # recording extension Load "evdev" # generic input handling driver on Linux - # Load "vbe" # Vesa BIOS Extension - # Load "ddc" # ddc probing of monitor # Load "bitmap" # bitmap fonts + # Load "ddc" # ddc probing of monitor + # Load "freetype" # font rendering # Load "GLcore" # render OpenGL in software # Load "i2c" # I2C bus # Load "int10" # initialize graphics cards via int10 call to the BIOS # Load "speedo" # font module + # Load "type1" # font module # Load "v4l" # Video for Linux + # Load "vbe" # Vesa BIOS Extension # Valid entries - see /usr/lib/xorg/modules/[extensions/] # afb bitmap cfb cfb16 cfb24 cfb32 cw damage dbe ddc dri drm extmod fb # fbdevhw freetype GLcore glx i2c int10 int10 layer mfb pcidata rac ramdac diff --git a/etc/X11/xorg.conf.virtualbox b/etc/X11/xorg.conf.virtualbox index 14463de..101afa4 100644 --- a/etc/X11/xorg.conf.virtualbox +++ b/etc/X11/xorg.conf.virtualbox @@ -54,19 +54,19 @@ Section "Module" Load "dbe" # double buffer extension Load "dri" # direct rendering Load "glx" # 3D layer - Load "type1" # font module - Load "freetype" # font rendering Load "extmod" # some commonly used server extensions (e.g. shape extension) Load "record" # recording extension Load "evdev" # generic input handling driver on Linux - # Load "vbe" # Vesa BIOS Extension - # Load "ddc" # ddc probing of monitor # Load "bitmap" # bitmap fonts + # Load "ddc" # ddc probing of monitor + # Load "freetype" # font rendering # Load "GLcore" # render OpenGL in software # Load "i2c" # I2C bus # Load "int10" # initialize graphics cards via int10 call to the BIOS # Load "speedo" # font module + # Load "type1" # font module # Load "v4l" # Video for Linux + # Load "vbe" # Vesa BIOS Extension # Valid entries - see /usr/lib/xorg/modules/[extensions/] # afb bitmap cfb cfb16 cfb24 cfb32 cw damage dbe ddc dri drm extmod fb # fbdevhw freetype GLcore glx i2c int10 int10 layer mfb pcidata rac ramdac @@ -97,11 +97,11 @@ Section "InputDevice" Identifier "Generic Mouse" # Driver "mouse" # old one Driver "vboxmouse" # special VirtualBox driver - Option "Device" "/dev/input/mice" - Option "Protocol" "auto" - Option "ZAxisMapping" "4 5" - Option "Buttons" "5" - Option "SendCoreEvents" "true" + # Option "Device" "/dev/input/mice" + # Option "Protocol" "auto" + # Option "ZAxisMapping" "4 5" + # Option "Buttons" "5" + # Option "SendCoreEvents" "true" EndSection Section "Monitor" diff --git a/etc/X11/xorg.conf.vmware b/etc/X11/xorg.conf.vmware index 52d0772..0ba8fe4 100644 --- a/etc/X11/xorg.conf.vmware +++ b/etc/X11/xorg.conf.vmware @@ -55,19 +55,19 @@ Section "Module" Load "dbe" # double buffer extension Load "dri" # direct rendering Load "glx" # 3D layer - Load "type1" # font module - Load "freetype" # font rendering Load "extmod" # some commonly used server extensions (e.g. shape extension) Load "record" # recording extension Load "evdev" # generic input handling driver on Linux - # Load "vbe" # Vesa BIOS Extension - # Load "ddc" # ddc probing of monitor # Load "bitmap" # bitmap fonts + # Load "ddc" # ddc probing of monitor + # Load "freetype" # font rendering # Load "GLcore" # render OpenGL in software # Load "i2c" # I2C bus # Load "int10" # initialize graphics cards via int10 call to the BIOS # Load "speedo" # font module + # Load "type1" # font module # Load "v4l" # Video for Linux + # Load "vbe" # Vesa BIOS Extension # Valid entries - see /usr/lib/xorg/modules/[extensions/] # afb bitmap cfb cfb16 cfb24 cfb32 cw damage dbe ddc dri drm extmod fb # fbdevhw freetype GLcore glx i2c int10 int10 layer mfb pcidata rac ramdac diff --git a/grml-x b/grml-x index c36b04d..6cf4906 100755 --- a/grml-x +++ b/grml-x @@ -724,16 +724,16 @@ Section "Module" Load "dbe" # double buffer extension Load "dri" # direct rendering Load "glx" # 3D layer / GLX extension - Load "type1" # type1 font module - Load "freetype" # freetype fonts rendering Load "extmod" # some commonly used server extensions (e.g. shape extension) Load "record" # recording extension Load "evdev" # generic input handling driver on Linux Load "xtrap" # X Trap extension - # Load "vbe" # Vesa BIOS Extension + # Load "freetype" # freetype fonts rendering # Load "i2c" # I2C bus # Load "int10" # initialize graphics cards via int10 call to the BIOS + # Load "type1" # type1 font module # Load "v4l" # Video for Linux + # Load "vbe" # Vesa BIOS Extension ## Deprecated/unneeded modules with Xorg >=7.0: # Load "speedo" # font module (does not exist anymore) # Load "ddc" # ddc probing of monitor (automatically loaded) -- 2.1.4 From 122dbe9570abf48c81c847833f9245e879457256 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 18 Oct 2009 15:22:09 +0200 Subject: [PATCH 14/16] Bump Standards-Version to 3.8.3 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ee14bf..ed9af1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ grml-x (0.4.7) unstable; urgency=low [Closes: issue740] * Deactivate type1 and freetype module in all xorg.conf files (they aren't present on nowadays systems). + * Bump Standards-Version to 3.8.3 (no further changes). - -- Michael Prokop Sun, 18 Oct 2009 15:19:00 +0200 + -- Michael Prokop Sun, 18 Oct 2009 15:21:54 +0200 grml-x (0.4.6) unstable; urgency=low diff --git a/debian/control b/debian/control index 80beb0a..a126bf5 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Michael Prokop Build-Depends: debhelper (>= 5) Build-Depends-Indep: asciidoc, xsltproc, docbook-xsl -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Homepage: http://git.grml.org/?p=grml-x.git Vcs-git: git://git.grml.org/grml-x.git Vcs-Browser: http://git.grml.org/?p=grml-x.git -- 2.1.4 From 15fb7bb26711b6e24fcffdb276e38eeaac33d28f Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 9 Jan 2010 02:48:12 +0100 Subject: [PATCH 15/16] Add xserver-xorg-input-all + xserver-xorg-video-all to Recommends. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a126bf5..f666b33 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Vcs-Browser: http://git.grml.org/?p=grml-x.git Package: grml-x Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg | xserver, hwinfo, grml-etc (>= 0.5-20), grml-etc-core (>= 0.2.46), zsh, pciutils, sudo, grml-shlib, bc, x11-xkb-utils, x11-xserver-utils, xauth, xinit -Recommends: fluxbox | x-window-manager, xterm | x-terminal-emulator, xfonts-base, xserver-xorg-input-vmmouse, xcursor-themes, x11-utils +Recommends: fluxbox | x-window-manager, x11-utils, xcursor-themes, xfonts-base, xserver-xorg-input-all, xserver-xorg-input-vmmouse, xserver-xorg-video-all, xterm | x-terminal-emulator, Suggests: xfonts-100dpi, xfonts-75dpi, fonts-ttf-west-european, xfonts-base-transcoded Conflicts: grml-scripts (<= 0.4-4) Description: wrapper for startx for running X Window System -- 2.1.4 From c7d2c003996f95e1d2f7f996355e04034b13fa75 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 9 Jan 2010 02:48:50 +0100 Subject: [PATCH 16/16] Update changelog for new release. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index ed9af1c..a175f9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml-x (0.4.8) unstable; urgency=low + + * Add xserver-xorg-input-all + xserver-xorg-video-all to Recommends. + + -- Michael Prokop Sat, 09 Jan 2010 02:48:23 +0100 + grml-x (0.4.7) unstable; urgency=low * xorg.conf.virtualbox: deactivate all Options from "Generic Mouse" -- 2.1.4