Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to devel-xorg-modular grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 wm-addons/i3lock/BUILD   |    6 +-----
 wm-addons/i3lock/DEPENDS |   15 ++++++++++-----
 wm-addons/i3lock/DETAILS |    2 +-
 wm-addons/i3lock/HISTORY |    6 ++++++
 4 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit 430e12ec4928c36ff436de50e14fdb254a4f3186
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    wm-addons/i3lock: version 2.5

diff --git a/wm-addons/i3lock/BUILD b/wm-addons/i3lock/BUILD
index 7e59e30..6dfecc1 100755
--- a/wm-addons/i3lock/BUILD
+++ b/wm-addons/i3lock/BUILD
@@ -1,5 +1 @@
-if ( is_depends_enabled $SPELL cairo ); then
-  make
-else
-  make NOLIBCAIRO=y
-fi
+default_build_make
diff --git a/wm-addons/i3lock/DEPENDS b/wm-addons/i3lock/DEPENDS
index ba31222..44cc0e0 100755
--- a/wm-addons/i3lock/DEPENDS
+++ b/wm-addons/i3lock/DEPENDS
@@ -1,6 +1,11 @@
-depends  linux-pam  &&
-depends  xcb-util  &&
-depends  pkgconfig  &&
+depends  linux-pam        &&
+depends  libxcb           &&
+depends  libev            &&
+depends  libx11           &&
+depends  libxkbfile       &&
+depends  libxkbcommon     &&
+depends  xcb-util         &&
+depends  pkgconfig        &&
 depends  xcb-util-keysyms &&
-depends  xcb-util-image &&
-optional_depends  cairo  ''  ''  'for image support'
+depends  xcb-util-image   &&
+depends  cairo
diff --git a/wm-addons/i3lock/DETAILS b/wm-addons/i3lock/DETAILS
index e9e8658..ef18d56 100755
--- a/wm-addons/i3lock/DETAILS
+++ b/wm-addons/i3lock/DETAILS
@@ -1,5 +1,5 @@
            SPELL=i3lock
-         VERSION=2.4.1
+         VERSION=2.5
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://i3wm.org/${SPELL}/${SOURCE}
diff --git a/wm-addons/i3lock/HISTORY b/wm-addons/i3lock/HISTORY
index 521d2fd..a14c6a8 100644
--- a/wm-addons/i3lock/HISTORY
+++ b/wm-addons/i3lock/HISTORY
@@ -1,3 +1,9 @@
+2014-05-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.5
+       * DEPENDS: add dependencies on libev, libxcb, libx11, libxkbfile,
+         libxkbcommon, make dependency on cairo mandatory
+       * BUILD: use default_build_make
+
 2012-06-02 Sukneet Basuta <sukneet AT sourcemage.org>
        * DETAILS: updated spell to 2.4.1