From 44813f34920b62ccb68172797ce3ee2ac056457a Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 18 Mar 2007 16:45:24 +0100 Subject: [PATCH] Added xlockmore to suggests, added check for vlock in grml-lock. --- debian/changelog | 6 ++++++ debian/control | 2 +- usr_bin/grml-lock | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d5762d8..f6e58aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml-scripts (0.9.31) unstable; urgency=low + + * Added xlockmore to suggests, added check for vlock in grml-lock. + + -- Michael Prokop Sun, 18 Mar 2007 16:44:53 +0100 + grml-scripts (0.9.30) unstable; urgency=low * Added idesk to Suggests. diff --git a/debian/control b/debian/control index 362317f..410ea70 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ XS-X-Vcs-Hg: http://hg.grml.org/grml-scripts Package: grml-scripts Architecture: any Depends: less, dialog, perl, zsh, dash, w3m | links | links2, screen, console-tools | xbase-clients, grml-network, grml-etc-core -Suggests: ruby, python, grml-x, ipcalc, hwinfo, antiword, grml-etc, grml-rebuildfstab, grml-scanpartitions, grml-files, grml-hwinfo, grml-saveconfig, pptp-linux, flite, wmii, mutt | mutt-ng, slrn, grml-docs, grml-autoconfig (>= 0.6.9), lzop, dirvish, sudo, idesk +Suggests: ruby, python, grml-x, ipcalc, hwinfo, antiword, grml-etc, grml-rebuildfstab, grml-scanpartitions, grml-files, grml-hwinfo, grml-saveconfig, pptp-linux, flite, wmii, mutt | mutt-ng, slrn, grml-docs, grml-autoconfig (>= 0.6.9), lzop, dirvish, sudo, idesk, xlockmore Conflicts: scanmodem, grml-etc-core (<< 0.1-30) Description: some small scripts which should make life easier Some scripts which should make life easier. For example: diff --git a/usr_bin/grml-lock b/usr_bin/grml-lock index 2d75050..e6e50e1 100755 --- a/usr_bin/grml-lock +++ b/usr_bin/grml-lock @@ -4,11 +4,16 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Sam Mai 27 15:12:24 CEST 2006 [mika] +# Latest change: Son Mär 18 16:41:49 CET 2007 [mika] ################################################################################ PN=$0 +if [ -r /etc/grml/script-functions ] ; then + . /etc/grml/script-functions + check4progs vlock xlock sudo chpasswd dialog || { echo "Sorry, can't continue. Exiting.">&2 ; exit 1 } +fi + if [ -r /etc/grml_version ] ; then else dialog --stdout --title "$PN" --msgbox "Warning: this system does not look like a grml-system -- 2.1.4