* Added script fma (fast manual access, thanks for the idea -

    wuehlmaus!)
  * Updated debian/overrides.
  * Removed deprecated manpages (moved to grml-network)

diff --git a/debian/changelog b/debian/changelog
index 868818d..2e34a84 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,10 @@ grml-scripts (0.8-26) unstable; urgency=low
 
   * Split out network related scripts into package grml-network,
     depend on it therefore.
+  * Added script fma (fast manual access, thanks for the idea -
+    wuehlmaus!)
   * Another cleanup of debian/rules.
+  * Updated debian/overrides.
   * Added XS-X-Vcs-Hg: header to debian/control, see
     http://www.bononia.it/~zack/blog/posts/xs-x-vcs-XXX.html
 

diff --git a/debian/overrides b/debian/overrides
index d6f3db8..9c829d9 100644 (file)
--- a/debian/overrides
+++ b/debian/overrides
@@ -1,5 +1,26 @@
-grml-scripts: shell-script-fails-syntax-check ./usr/bin/grml-lock
-grml-scripts: shell-script-fails-syntax-check ./usr/sbin/grml-nessus
+grml-scripts: executable-not-elf-or-script ./usr/bin/exifinfo
 grml-scripts: executable-not-elf-or-script ./usr/bin/tinyp2p.py
 grml-scripts: executable-not-elf-or-script ./usr/bin/wwwis
-grml-scripts: executable-not-elf-or-script ./usr/bin/exifinfo
+grml-scripts: script-with-language-extension usr/bin/bincompare.pl
+grml-scripts: script-with-language-extension usr/bin/cpufreq-detect.sh
+grml-scripts: script-with-language-extension usr/bin/cpu-screen.sh
+grml-scripts: script-with-language-extension usr/bin/hgrep.sh
+grml-scripts: script-with-language-extension usr/bin/irclog2html-2.1.pl
+grml-scripts: script-with-language-extension usr/bin/lesspipe.sh
+grml-scripts: script-with-language-extension usr/bin/osd_server.py
+grml-scripts: script-with-language-extension usr/bin/sepdate.pl
+grml-scripts: script-with-language-extension usr/bin/sepdate.sh
+grml-scripts: script-with-language-extension usr/bin/tinyp2p.py
+grml-scripts: script-with-language-extension usr/bin/unbleach.pl
+grml-scripts: script-with-language-extension usr/sbin/ndiswrapper.sh
+grml-scripts: script-with-language-extension usr/sbin/prepare_ramdisk.sh
+grml-scripts: script-with-language-extension usr/sbin/prepare_tmpfs.sh
+grml-scripts: script-with-language-extension usr/sbin/suspenduser_gui.sh
+grml-scripts: script-with-language-extension usr/sbin/suspenduser.sh
+grml-scripts: shell-script-fails-syntax-check ./usr/bin/grml-info
+grml-scripts: shell-script-fails-syntax-check ./usr/bin/grml-lock
+grml-scripts: shell-script-fails-syntax-check ./usr/sbin/grml-nessus
+grml-scripts: shell-script-fails-syntax-check ./usr/sbin/grml-tpm
+grml-scripts: statically-linked-binary ./usr/bin/cpu-screen
+grml-scripts: statically-linked-binary ./usr/bin/ip-screen
+grml-scripts: statically-linked-binary ./usr/sbin/reread_partition_table

diff --git a/manpages/grml-ap.8 b/manpages/grml-ap.8
deleted file mode 100644 (file)
index 2daf402..0000000
--- a/manpages/grml-ap.8
+++ /dev/null
@@ -1,57 +0,0 @@
-.TH grml-ap 8
-.SH "NAME"
-grml-ap \- set up your box as access point
-.SH SYNOPSIS
-.B grml-ap
-.RI " start|stop|restart|info "
-.SH DESCRIPTION
-This manual page documents briefly the
-.B grml-ap
-command.
-.SH NOTES
-grml-ap uses the capabilities of your WLAN cards driver. Therefore
-you need a card including drivers providing access point features.
-atheros-based cards using the madwifi[-ng] drivers are known to work
-very well.
-.SH CONFIGURATION
-Configure setup via configuration file /etc/grml/routersetup.
-The variable AP_ESSID sets the essid of the accesspoint, if it is unset the essid grml-ap will be used by default.
-The variable AP_ENC toggles the use of encryption; set it off (that is the default) if you do not want to use encryption at all or if you want to enable encryption set the encryption key via the AP_ENC variable.
-
-.SH USAGE
-
-On the server side (where running grml-ap):
-
-  ,----
-  | # grml-ap start
-  | # cat /etc/network/interfaces
-  | iface ap inet static
-  |   address 192.168.10.1
-  |   netmask 255.255.255.0
-  |   network 192.168.10.0
-  |   broadcast 192.168.10.255
-  | # ifup ath0=ap
-  | # grml-router start
-  `----
-
-On the client side (assuming eth0 is your WLAN device):
-
-  ,----
-  | # cat /etc/network/interfaces
-  | iface ap inet static
-  |   address 192.168.10.2
-  |   netmask 255.255.255.0
-  |   network 192.168.10.0
-  |   broadcast 192.168.10.255
-  |   gateway 192.168.10.1
-  | # ifup eth0=ap
-  `----
-  
-.SH SEE ALSO
-.BR grml-bridge (8),
-.BR grml-router (8).
-.SH AUTHOR
-grml-ap was written by Ulrich Dangel <schula@grml.org> and Michael Prokop <mika@grml.org>.
-.PP
-This manual page was written by Michael Prokop
-<mika@grml.org> for the Debian project (but may be used by others).

diff --git a/manpages/grml-bridge.8 b/manpages/grml-bridge.8
deleted file mode 100644 (file)
index f16abac..0000000
--- a/manpages/grml-bridge.8
+++ /dev/null
@@ -1,85 +0,0 @@
-.TH grml-bridge 8
-.SH "NAME"
-grml-bridge \- set up your box as bridge
-.SH SYNOPSIS
-.B grml-bridge
-.RI " start|stop|restart|info "
-.SH DESCRIPTION
-This manual page documents briefly the
-.B grml-bridge
-command.
-.SH USAGE
-Configure setup via configuration file /etc/grml/routersetup.
-To specify which DEVICES should be bridged, use BRIDGE_DEVICES, e.g.
-
-  BRIDGE_DEVICES="eth0 eth1"
-
-would bridge device eth0 and eth1. 
-Note: The auto interface name is not allowed here!
-
-To specify the name of the bridge, use BRIDGE_NAME, e.g.
-
-  BRIDGE_NAME="br0"
-
-Note: this entry is optional, per default the name br0 is choosen.
-
-If you want do disable Spanning Tree Protocol (STP) on your bridge, just set BRIDGE_STP to no, e.g.
-
-  BRIDGE_STP="no"
-
-Per default stp is on.
-
-Example Configuration file:
-
-  ,----[ /etc/grml/routersetup ]
-  | # Bridges eth0 and ath0 together
-  | BRIDGE_DEVICES="eth0 ath0"
-  |
-  | # Bridge name is grml-bridge
-  | BRIDGE_NAME="grml-bridge"
-  |
-  | # Disable stp
-  | BRIDGE_STP="no"
-  `----
-
-Start the bridge:
-
-  ,----
-  | # grml-bridge start
-  `----
-
-Now, your bridging device is up and running. Now you have to set the ip address of
-your bridged devices to 0.0.0.0. You can do this with following command:
-
-  ,----
-  | source /etc/grml/routersetup
-  | for i in $BRIDGED_DEVICES ; do ifconfig $i 0.0.0.0 ; done
-  `----
-
-Now your bridge is working. If you want that your bridge is reachable, please
-give your bridge an ip adress. You can do this for example with
-
-  ,----
-  | ifconfig grml-bridge 192.168.0.1
-  `----
-
-Stop the bridge:
-
-  ,----
-  | # grml-bridge stop
-  `----
-
-Note, your devices do not have an ip address, so you have to give them an ip address. You can do this with
-
-  ,----
-  | ifconfig eth1 $IP_ADDR
-  `----
-
-.SH SEE ALSO
-.BR grml-ap (8),
-.BR grml-router (8).
-.SH AUTHOR
-grml-bridge was written by Ulrich Dangel <schula@grml.org> and Michael Prokop <mika@grml.org>.
-.PP
-This manual page was written by Michael Prokop
-<mika@grml.org> for the Debian project (but may be used by others).

diff --git a/manpages/grml-router.8 b/manpages/grml-router.8
deleted file mode 100644 (file)
index 89f1467..0000000
--- a/manpages/grml-router.8
+++ /dev/null
@@ -1,32 +0,0 @@
-.TH grml-router 8
-.SH "NAME"
-grml-router \- set up your box as NAT-router
-.SH SYNOPSIS
-.B grml-router
-.RI " start|stop|restart|info "
-.SH DESCRIPTION
-This manual page documents briefly the
-.B grml-router
-command.
-.SH USAGE
-grml-router reads the configuration file /etc/grml/routerconfig and uses the
-variable OUTDEV for setting the WAN device. If OUTDEV is set to auto, the
-device with a default route entry is used.
-
-You have to set up a DNS-server server, or use the DNS-server provided by your
-provider.
-
-On the client(s) you have to specify the gateway manually, also specify a
-nameserver. You can run the following commands on the client:
-
-  route add default gw $IP_ADDRSS_OF_GW
-  echo "nameserver $IP_OF_NAMESERVER" >> /etc/resolv.conf
-
-.SH SEE ALSO
-.BR grml-ap (8),
-.BR grml-bridge (8).
-.SH AUTHOR
-grml-router was written by Ulrich Dangel <schula@grml.org> and Michael Prokop <mika@grml.org>.
-.PP
-This manual page was written by Michael Prokop
-<mika@grml.org> for the Debian project (but may be used by others).

diff --git a/usr_bin/fma b/usr_bin/fma
new file mode 100755 (executable)
index 0000000..b499747
--- /dev/null
+++ b/usr_bin/fma
@@ -0,0 +1,55 @@
+#!/bin/zsh
+# Filename:      fma
+# Purpose:       "fast manual access"
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2.
+# Latest change: Sam Okt 28 00:32:10 CEST 2006 [mika]
+################################################################################
+
+. /etc/grml/lsb-functions
+. /etc/grml/script-functions
+
+check4progs man lzop vim || exit 1
+
+MANDIR=$HOME/man
+
+if ! [ -d "$MANDIR" ] ; then
+   einfo "Creating $MANDIR."
+   mkdir $MANDIR ; eend $?
+fi
+
+case $1 in
+  [0-9])
+    SECTION="${1}"
+    SECTIONFILE=".${1}"
+    MANPAGE="$2"
+    ;;
+  *)
+    SECTION=''
+    MANPAGE="$1"
+    ;;
+esac
+
+if [ -z "$MANPAGE" ] ; then
+   eerror "Usage: $0 [section] manpage" ; eend 1
+   exit 1
+fi
+
+if ! [ -f "${MANDIR}/${MANPAGE}${SECTIONFILE}.txt.lzo" ] ; then
+   einfo "Writing manpage to ${MANDIR}/${MANPAGE}${SECTIONFILE}.txt"
+   if man $SECTION $MANPAGE 1>/dev/null ; then
+      man $SECTION $MANPAGE > ${MANDIR}/${MANPAGE}${SECTIONFILE}.txt ; eend $?
+      einfo "Compressing manpage with lzop"
+      lzop -o ${MANDIR}/${MANPAGE}${SECTIONFILE}.txt.lzo ${MANDIR}/${MANPAGE}${SECTIONFILE}.txt ; eend $?
+   else
+      exit 1
+      eend 1
+   fi
+fi
+
+vim -c 'set ft=man' =( lzop -cd $MANDIR/${MANPAGE}${SECTIONFILE}.txt.lzo)
+
+einfo "Thanks for flying $0." ; eend 0
+
+## END OF FILE #################################################################