Merge remote-tracking branch 'origin/master' into devel-xorg-modular

Conflicts:
	ChangeLog

4 files changed, 27 insertions, 29 deletions

diff --git a/wm-addons/dzen2/DEPENDS b/wm-addons/dzen2/DEPENDS
index 30b59131e8..370c57073c 100755
--- a/wm-addons/dzen2/DEPENDS
+++ b/wm-addons/dzen2/DEPENDS
@@ -1,8 +1,6 @@
+depends git &&
 depends xorg-libs  &&
 
 optional_depends libxinerama "" "" "Enable Xinerama support?" &&
 optional_depends libxpm "" "" "Enable XPM support?" &&
-if [[ "$DZEN_SCM" == "y" ]]; then
-depends subversion &&
 optional_depends libxft "" "" "Enable XFT support?"
-fi
diff --git a/wm-addons/dzen2/DETAILS b/wm-addons/dzen2/DETAILS
index 5895ade9b7..a6eb7797f7 100755
--- a/wm-addons/dzen2/DETAILS
+++ b/wm-addons/dzen2/DETAILS
@@ -1,28 +1,28 @@
+. "$GRIMOIRE"/FUNCTIONS
            SPELL=dzen2
-if [[ "$DZEN_SCM" == "y" ]]; then
-if [[ "$DZEN_SCM_AUTO" == "y" ]]; then
-         VERSION=$(date +%Y%m%d)
-else
-         VERSION=scm
-fi
-          SOURCE=$SPELL-scm.tar.bz2
-    SOURCE_HINTS=old_svn_compat
+         VERSION=$(get_scm_version)
+          SOURCE=$SPELL-git.tar.bz2
   FORCE_DOWNLOAD=on
-   SOURCE_URL[0]=svn://dzen.googlecode.com/svn/trunk/:dzen2-scm
+   SOURCE_URL[0]=git://github.com/robm/dzen.git
    SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
-else
-         VERSION=0.8.5
-          SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://gotmor.googlepages.com/${SOURCE}
-     SOURCE_HASH=sha512:04b808ebb7a3a0135a9bab9e79ae0c16cb5d777458d34d5ab39a5279228fb7fa771b5fee8e4a14b325433359ef751dafa95cb1f4f75db7683404e0fe12beb273
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-fi
-        WEB_SITE="http://gotmor.googlepages.com/dzen"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
+        WEB_SITE="https://github.com/robm/dzen"
       LICENSE[0]=MIT
          ENTERED=20070309
            SHORT="A scriptable messaging, notification, and launching tool."
 cat << EOF
 dzen is a scriptable notification, messaging, and launching application.
 It provides user control through a flexible event/action mechanism.
+
+It was designed to be fast, tiny and scriptable in any language.
+
+Features
+--------
+* Small, fast, very tiny set of dependencies.
+* Scriptable in any language.
+* Sophisticated formating language - including colours, icons, graphics.
+* Versatile - display all sorts of information.
+* Interactive - user defined mouse and keyboard actions.
+* Optional XFT support.
+* Optional XINERAMA support.
 EOF
diff --git a/wm-addons/dzen2/HISTORY b/wm-addons/dzen2/HISTORY
index 6954731336..4dad0f50a2 100644
--- a/wm-addons/dzen2/HISTORY
+++ b/wm-addons/dzen2/HISTORY
@@ -1,3 +1,9 @@
+2015-01-17 Ismael Luceno <ismael@sourcemage.org>
+	* DEPENDS, DETAILS, HISTORY, PREPARE: Merged with dzen
+	  updated description, switched to git, uses prepare_select_branch
+	  and get_scm_version now.
+	* DETAILS: Fixed SOURCE_URL[0]
+
 2009-04-04 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
 	* DEPENDS: more depends and so on, forgot subversion
 	* PRE_BUILD: apply various depends
@@ -51,4 +57,3 @@
 
 2007-03-09 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
 	* DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell
-
diff --git a/wm-addons/dzen2/PREPARE b/wm-addons/dzen2/PREPARE
index 6cdf278dca..136a21830d 100755
--- a/wm-addons/dzen2/PREPARE
+++ b/wm-addons/dzen2/PREPARE
@@ -1,7 +1,2 @@
-config_query DZEN_SCM "Do you want SCM version" "n" &&
-if [[ "${DZEN_SCM}" == "y" ]]
-then
-config_query DZEN_SCM_AUTO \
-          "Automaticaly update the spell on sorcery queue/system-update?" \
-          "n"
-fi
+. "$GRIMOIRE"/FUNCTIONS &&
+prepare_select_branch