X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F205_ion-lock.diff;h=fce52f9691398b8d87ae8ab069050c621ca9ec53;hb=4caa969e86b611255dddf085563d32e5e0e8f323;hp=630d13b13830adc6c8278731bdda644523365292;hpb=a91cc07e7f876e79a733f25c266073c0b9afda1d;p=ion3.git diff --git a/debian/patches/205_ion-lock.diff b/debian/patches/205_ion-lock.diff index 630d13b..fce52f9 100755 --- a/debian/patches/205_ion-lock.diff +++ b/debian/patches/205_ion-lock.diff @@ -1,22 +1,17 @@ -#! /bin/sh -e -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -Nur ion3-20050322.orig/utils/Makefile ion3-20050322/utils/Makefile ---- ion3-20050322.orig/utils/Makefile 2005-03-22 14:31:06.000000000 +0000 -+++ ion3-20050322/utils/Makefile 2005-03-22 16:29:37.197355881 +0000 +--- ion3.orig/etc/cfg_ioncore.lua ++++ ion3/etc/cfg_ioncore.lua +@@ -331,7 +331,8 @@ + defmenu("mainmenu", { + menuentry("Run...", "mod_query.query_exec(_)"), + menuentry("Terminal", "ioncore.exec_on(_, XTERM or 'xterm')"), +- menuentry("Lock screen", "ioncore.exec_on(_, 'xlock')"), ++ menuentry("Lock screen", ++ "ioncore.exec_on(_, ioncore.lookup_script('ion-lock'))"), + menuentry("Help", "mod_query.query_man(_)"), + menuentry("About Ion", "mod_query.show_about_ion(_)"), + submenu("Styles", "stylemenu"), +--- ion3.orig/utils/Makefile ++++ ion3/utils/Makefile @@ -11,7 +11,7 @@ SUBDIRS=ion-completefile INSTALL_SUBDIRS=$(SUBDIRS) @@ -26,9 +21,8 @@ diff -Nur ion3-20050322.orig/utils/Makefile ion3-20050322/utils/Makefile TARGETS = ion-completeman -diff -Nur ion3-20050322.orig/utils/ion-lock ion3-20050322/utils/ion-lock ---- ion3-20050322.orig/utils/ion-lock 1970-01-01 00:00:00.000000000 +0000 -+++ ion3-20050322/utils/ion-lock 2005-03-22 16:29:19.550092305 +0000 +--- ion3.orig/utils/ion-lock ++++ ion3/utils/ion-lock @@ -0,0 +1,6 @@ +#!/bin/sh +if xscreensaver-command -version >/dev/null 2>&1; then