Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

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

 utils/desktop-file-utils/DETAILS |    4 ++--
 utils/desktop-file-utils/HISTORY |    3 +++
 x11/merkaartor/DEPENDS           |    9 ++++++++-
 x11/merkaartor/HISTORY           |    5 +++++
 4 files changed, 18 insertions(+), 3 deletions(-)

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

    x11/merkaartor: add missing dependencies
    
    add dependencies on boost, gdal, proj, desktop-file-utils,
    add sub-dependency on WEBKIT for qt4, add optional dependencies
    on exiv2, gpsd, libproxy

commit 3f2f5f21ebb38ef06273b088f07558b97b73e3c2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/desktop-file-utils: version 0.21

diff --git a/utils/desktop-file-utils/DETAILS 
b/utils/desktop-file-utils/DETAILS
index a940dcd..af4eb07 100755
--- a/utils/desktop-file-utils/DETAILS
+++ b/utils/desktop-file-utils/DETAILS
@@ -1,9 +1,9 @@
            SPELL=desktop-file-utils
-         VERSION=0.20
+         VERSION=0.21
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
-      SOURCE_GPG=gurus.gpg:$SOURCE.sig
+     
SOURCE_HASH=sha512:c7372d820e996eef72e85c7190c7f7cce61a3e08ebc348822013d1b28971db294242ce108d8f5e8e6c7539f9044619511d2bba0459a319bddbe5e5cf5d8665aa
         WEB_SITE=http://www.freedesktop.org/
          ENTERED=20031028
          LICENSE=GPL
diff --git a/utils/desktop-file-utils/HISTORY 
b/utils/desktop-file-utils/HISTORY
index 9687434..f01d4ee 100644
--- a/utils/desktop-file-utils/HISTORY
+++ b/utils/desktop-file-utils/HISTORY
@@ -1,3 +1,6 @@
+2013-05-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.21
+
 2012-03-08 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.20
 
diff --git a/x11/merkaartor/DEPENDS b/x11/merkaartor/DEPENDS
index 2e4e2ef..bf80932 100755
--- a/x11/merkaartor/DEPENDS
+++ b/x11/merkaartor/DEPENDS
@@ -1 +1,8 @@
-depends qt4 
+depends -sub WEBKIT qt4 &&
+depends boost &&
+depends gdal &&
+depends proj &&
+depends desktop-file-utils &&
+optional_depends exiv2 "GEOIMAGE=1" "" "for geotagged image support" &&
+optional_depends gpsd  "GPSDLIB=1"  "" "for GPS support" &&
+optional_depends libproxy  "USE_LIBPROXY=1"  "" "for automatic proxy 
configuration"
diff --git a/x11/merkaartor/HISTORY b/x11/merkaartor/HISTORY
index f64fc16..744e2d1 100644
--- a/x11/merkaartor/HISTORY
+++ b/x11/merkaartor/HISTORY
@@ -1,4 +1,9 @@
 2013-05-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: added dependencies on boost, gdal, proj, 
desktop-file-utils,
+         added sub-dependency on WEBKIT for qt4, added optional dependencies
+         on exiv2, gpsd, libproxy
+
+2013-05-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.18.1
 
 2011-02-11 Bor Kraljič <pyrobor AT ver.si>