Merge remote-tracking branch 'paulharris/master'

Conflicts:
	README

diff --git a/README.md b/README.md
index aa66042483e9730266d6635c8379b5d7b310bc05..619a9923997cb3e92adc287ab5f58d2a9d20bc1a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -60,3 +60,14 @@ are adjusted accordingly.
 
 To install autorandr call `make install`, define your setup and then call
 `make hotplug` to install hotplug scripts.
+
+For Debian using auto-disper:
+To make the screen auto-configure when your computer wakes up,
+* Copy auto-disper into /usr/local/bin/
+* Copy pm-utils/40auto-disper into /etc/pm/sleep.d/
+* (Assuming gnome) Run gnome-keybinding-properties and ADD a shortcut,
+  I called it "Run auto-disper", I set it to CTRL-F7, and the command is:
+  `auto-disper -c --default default`
+* Create a default disper setting... eg for laptop: unplug all monitors,
+  set up the screen nicely on the laptop display.
+  Then run `auto-disper --save laptop`

diff --git a/pm-utils/40autorandr b/pm-utils/40autorandr
index 4ce7790255d1041db62637f495d1625912306441..74549fc49a7f4e64f7f932398b5c95e965ea7b18 100755 (executable)
--- a/pm-utils/40autorandr
+++ b/pm-utils/40autorandr
@@ -7,10 +7,10 @@ exec > /var/log/autorandr.log 2>&1
 FORM=${0##*40}
 case $FORM in
        auto-disper)
-               AUTORANDR="auto-disper -c"
+               AUTORANDR="auto-disper -c --default default"
                ;;
        *)
-               AUTORANDR="autorandr -c"
+               AUTORANDR="autorandr -c --default default"
                ;;
 esac
 
@@ -25,7 +25,6 @@ detect_display()
                        /bin/su -c "${AUTORANDR}" "$user"
                fi
        done
-       echo "Done"
 }
 
 case "$1" in