X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=debian%2Fpatches%2F209_use-etc-default.diff;h=cce1b62b202bf61d88a12d2f0082d7c18a79f714;hp=190bc8b56a2f967994c6161a165c72821ac69117;hb=0d045a880cec44192afc010e55d5ed41478138ea;hpb=7329232cac0c56809d39244969208012890b9647

diff --git a/debian/patches/209_use-etc-default.diff b/debian/patches/209_use-etc-default.diff
old mode 100755
new mode 100644
index 190bc8b..cce1b62
--- a/debian/patches/209_use-etc-default.diff
+++ b/debian/patches/209_use-etc-default.diff
@@ -1,29 +1,11 @@
-#! /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-20060317.orig/etc/cfg_ion.lua ion3-20060317/etc/cfg_ion.lua
---- ion3-20060317.orig/etc/cfg_ion.lua	2006-03-17 20:43:04.000000000 +0100
-+++ ion3-20060317/etc/cfg_ion.lua	2006-03-17 22:16:02.000000000 +0100
-@@ -12,6 +12,9 @@
+--- ion3.orig/etc/cfg_ion.lua
++++ ion3/etc/cfg_ion.lua
+@@ -16,6 +16,8 @@
+ -- Set default modifiers. Alt should usually be mapped to Mod1 on
+ -- XFree86-based systems. The flying window keys are probably Mod3
+ -- or Mod4; see the output of 'xmodmap'.
++-- These may be defined in /etc/default/ion3, loaded as cfg_debian.
++dopath("cfg_debian")
  --META="Mod1+"
  --ALTMETA=""
  
-+-- Debian sets the META and ALTMETA keys in /etc/default/ion3.
-+dopath("cfg_debian")
-+
- -- Some basic settings
- ioncore.set{
-     -- Maximum delay between clicks in milliseconds to be considered a