From: Phillip Berndt <phillip.berndt@googlemail.com>
Date: Mon, 2 Dec 2013 09:34:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'helterscelter/master'
X-Git-Tag: 1.0~151
X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fautorandr.git;a=commitdiff_plain;h=4db3b2ca3ae95ddc6005337ea47528f84ea73deb

Merge remote-tracking branch 'helterscelter/master'

Conflicts:
	pm-utils/40autorandr
---

4db3b2ca3ae95ddc6005337ea47528f84ea73deb
diff --cc pm-utils/40autorandr
index fc97dea,f465b06..4ce7790
--- a/pm-utils/40autorandr
+++ b/pm-utils/40autorandr
@@@ -1,9 -1,18 +1,18 @@@
  #!/bin/sh
  #
  # 40autorandr: Change autorandr profile on thaw/resume
 +exec > /var/log/autorandr.log 2>&1
  
- AUTORANDR="autorandr -c"
+ # detect if we are being called as 40auto-disper or 40autorandr
+ FORM=${0##*40}
+ case $FORM in
+ 	auto-disper)
+ 		AUTORANDR="auto-disper -c"
+ 		;;
+ 	*)
+ 		AUTORANDR="autorandr -c"
+ 		;;
+ esac
 -echo "$AUTORANDR"
  
  detect_display()
  {