Source Mage code commit list

[Arwed von Merkatz <scm AT sourcemage.org>]

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

 xorg-xserver/xorg-server/HISTORY                    |    5 +++++
 xorg-xserver/xorg-server/PRE_SUB_DEPENDS            |    2 +-
 xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit b2c54515e78f93f772bd4f11511233a8464ea39a
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    xorg-server: fixed DPMS sub dependency

diff --git a/xorg-xserver/xorg-server/HISTORY 
b/xorg-xserver/xorg-server/HISTORY
index c5741ea..f506f6d 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,8 @@
+2010-02-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS: fixed DPMS sub
+         dependency to actually return 0 if it is available, otherwise always
+         recompiles xorg-server if something needs DPMS
+
 2010-02-17 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.7.5
 
diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS 
b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
index 5de1740..e9ea305 100755
--- a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
@@ -1,6 +1,6 @@
 case $THIS_SUB_DEPENDS in
   XCOMPOSITE) is_depends_enabled $SPELL libxcomposite  ;;
-        DPMS) list_find XORG_SERVER_OPTS "--enable-dpms"  ;;
+        DPMS) list_find "$XORG_SERVER_OPTS" "--enable-dpms" && return 0 ;;
            *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
    return 1;;
 esac
diff --git a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS 
b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
index 5de1740..e9ea305 100755
--- a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,6 +1,6 @@
 case $THIS_SUB_DEPENDS in
   XCOMPOSITE) is_depends_enabled $SPELL libxcomposite  ;;
-        DPMS) list_find XORG_SERVER_OPTS "--enable-dpms"  ;;
+        DPMS) list_find "$XORG_SERVER_OPTS" "--enable-dpms" && return 0 ;;
            *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
    return 1;;
 esac