Source Mage code commit list

[Pol Vinogradov <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

 kde-core/kdebase/DEPENDS |   11 ++++++-----
 kde-core/kdebase/HISTORY |    4 ++++
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 8a60926ec08b497c3daf33d364948683f6a820c3
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

    kde-core/kdebase:
    
    DEPENDS: moved optional depends on XDAMAGE from xorg-modular checking to
    global area, it works for monolithic xorg too

diff --git a/kde-core/kdebase/DEPENDS b/kde-core/kdebase/DEPENDS
index cc8fa7b..7b5ef8a 100755
--- a/kde-core/kdebase/DEPENDS
+++ b/kde-core/kdebase/DEPENDS
@@ -22,11 +22,7 @@ if  check_if_xorg_modular_libs  qt-x11  
   depends  libxtst        &&
   depends  libxxf86misc   &&
   depends  xsetroot       &&
-  depends  xset           &&
-  optional_depends    XDAMAGE                   \
-                  '--with-composite'            \
-                  '--without-composite'         \
-                  'for kompmgr - kde compositing manager'
+  depends  xset
 fi  &&
 
 source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
@@ -113,6 +109,11 @@ optional_depends  hal                   
                   '--without-hal'                     \
                   'for automatic hardware detection'  &&
 
+optional_depends  XDAMAGE                       \
+                  '--with-composite'            \
+                  '--without-composite'         \
+                  'for kompmgr - kde compositing manager'  &&
+
 # is_depends_enabled is only in devel for now #12949
 # once it is everywhere, only the second if block should remain
 if declare -f is_depends_enabled &> /dev/null; then
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index e05eede..e564790 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,7 @@
+2006-08-31 Pol Vinogradov <vin.public AT gmail.com>
+       * DEPENDS: moved optional depends on XDAMAGE from xorg-modular 
checking to
+         global area, it works for monolithic xorg too
+
 2006-08-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DEPENDS: added optional libxdamage for kompmgr #13029