Source Mage code commit list

[Andraž Levstik <scm AT sourcemage.org>]

GIT changes to master grimoire by Andraž Levstik <ruskie AT codemages.net>:

 ChangeLog                         |    2 ++
 kernels/suspend2-userui/BUILD     |    2 +-
 kernels/suspend2-userui/DEPENDS   |    6 +-----
 kernels/suspend2-userui/DETAILS   |   20 +-------------------
 kernels/suspend2-userui/HISTORY   |    4 ++++
 kernels/suspend2-userui/INSTALL   |    2 +-
 kernels/suspend2-userui/PRE_BUILD |    1 +
 kernels/suspend2-userui/TRIGGERS  |    1 +
 utils/tuxonice-userui/BUILD       |    5 +++++
 utils/tuxonice-userui/CONFIGURE   |    3 +++
 utils/tuxonice-userui/CONFLICTS   |    1 +
 utils/tuxonice-userui/DEPENDS     |    9 +++++++++
 utils/tuxonice-userui/DETAILS     |   13 +++++++++++++
 utils/tuxonice-userui/HISTORY     |    5 +++++
 utils/tuxonice-userui/INSTALL     |    6 ++++++
 utils/tuxonice-userui/PRE_BUILD   |    7 +++++++
 16 files changed, 61 insertions(+), 26 deletions(-)

New commits:
commit 7636d6a53830243395901e5ce65ca5d9911be245
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Andraž Levstik <ruskie AT codemages.net>

    tuxonice-userui: new spell, suspend to disk UI

commit 514b714dbbb8660c1c75847c118752ed8f7fa80d
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Andraž Levstik <ruskie AT codemages.net>

    suspend2-userui: deprecated into tuxonice-userui

diff --git a/ChangeLog b/ChangeLog
index ed6e3f2..28c2bef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-04-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * python-pypi/halrv: new spell, a hal mount/umount utility for cmd 
line use
+       * kernels/suspend2-userui: deprecated into of tuxonice-userui
+       * utils/tuxonice-userui: new spell, suspend to disk user ui
 
 2009-04-02 Mathieu Lonjaret <lejatorn AT sourcemage.org>
        * graphics/plotutils: new spell, plotting libraries and utils
diff --git a/kernels/suspend2-userui/BUILD b/kernels/suspend2-userui/BUILD
index 8f58e6d..27ba77d 100755
--- a/kernels/suspend2-userui/BUILD
+++ b/kernels/suspend2-userui/BUILD
@@ -1 +1 @@
-make
+true
diff --git a/kernels/suspend2-userui/DEPENDS b/kernels/suspend2-userui/DEPENDS
index da8dfcb..4161ce7 100755
--- a/kernels/suspend2-userui/DEPENDS
+++ b/kernels/suspend2-userui/DEPENDS
@@ -1,5 +1 @@
-depends libmng &&
-depends jpeg &&
-depends libpng &&
-depends zlib &&
-depends freetype2
+depends tuxonice-userui
diff --git a/kernels/suspend2-userui/DETAILS b/kernels/suspend2-userui/DETAILS
index f934da8..fb7094c 100755
--- a/kernels/suspend2-userui/DETAILS
+++ b/kernels/suspend2-userui/DETAILS
@@ -1,23 +1,5 @@
            SPELL=suspend2-userui
-         VERSION=0.6.4
-          SOURCE=$SPELL-$VERSION.tar.gz
-         SOURCE2=${SOURCE}.sign
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://www.suspend2.net/downloads/all/$SOURCE
-   SOURCE_URL[1]=http://au-mirror.suspend2.net/downloads/all/$SOURCE
-   SOURCE_URL[2]=http://nl-mirror.suspend2.net/downloads/all/$SOURCE
-   SOURCE_URL[3]=http://at-mirror.suspend2.net/downloads/all/$SOURCE
-  SOURCE2_URL[0]=http://www.suspend2.net/downloads/all/$SOURCE2
-  SOURCE2_URL[1]=http://au-mirror.suspend2.net/downloads/all/$SOURCE2
-  SOURCE2_URL[2]=http://nl-mirror.suspend2.net/downloads/all/$SOURCE2
-  SOURCE2_URL[3]=http://at-mirror.suspend2.net/downloads/all/$SOURCE2
-      SOURCE_GPG="suspend2.gpg:$SOURCE2"
-  SOURCE2_IGNORE=signature
-        WEB_SITE=http://www.suspend2.net/
-         ENTERED=20060919
-      LICENSE[0]=GPL
-            DOCS='CHANGELOG COPYING README SCRIPTLET-API TODO'
-        KEYWORDS="kernels"
+         VERSION=DEAD
            SHORT='splash suspend tools'
 cat << EOF
 Splash screen utilities for software suspend
diff --git a/kernels/suspend2-userui/HISTORY b/kernels/suspend2-userui/HISTORY
index 22b6cec..14a9e47 100644
--- a/kernels/suspend2-userui/HISTORY
+++ b/kernels/suspend2-userui/HISTORY
@@ -1,2 +1,6 @@
+2009-04-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * PRE_BUILD, TRIGGERS, BUILD: deprecates into tuxonice-userui
+       * DEPENDS, DETAILS, INSTALL: deprecates into tuxonice-userui
+
 2006-09-19 David Brown <dmlb2000 AT gmail.com>
        * ALL: created spell
diff --git a/kernels/suspend2-userui/INSTALL b/kernels/suspend2-userui/INSTALL
index 821a80a..27ba77d 100755
--- a/kernels/suspend2-userui/INSTALL
+++ b/kernels/suspend2-userui/INSTALL
@@ -1 +1 @@
-make PREFIX=/usr DESTDIR=${INSTALL_ROOT} install
+true
diff --git a/kernels/suspend2-userui/PRE_BUILD 
b/kernels/suspend2-userui/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kernels/suspend2-userui/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/kernels/suspend2-userui/TRIGGERS 
b/kernels/suspend2-userui/TRIGGERS
new file mode 100755
index 0000000..81222fa
--- /dev/null
+++ b/kernels/suspend2-userui/TRIGGERS
@@ -0,0 +1 @@
+on_cast tuxonice-userui dispel_self
diff --git a/utils/tuxonice-userui/BUILD b/utils/tuxonice-userui/BUILD
new file mode 100755
index 0000000..c609a96
--- /dev/null
+++ b/utils/tuxonice-userui/BUILD
@@ -0,0 +1,5 @@
+if [[ $TUXONICE_UI == all ]]; then
+make tuxoniceui_text tuxoniceui_fbsplash
+else
+make $TUXONICE_UI
+fi
diff --git a/utils/tuxonice-userui/CONFIGURE b/utils/tuxonice-userui/CONFIGURE
new file mode 100755
index 0000000..b7f7c9d
--- /dev/null
+++ b/utils/tuxonice-userui/CONFIGURE
@@ -0,0 +1,3 @@
+. $GRIMOIRE/config_query_multi.function
+config_query_multi TUXONICE_UI "What UI do you wish to use?" \
+                   all tuxoniceui_text tuxoniceui_fbsplash
diff --git a/utils/tuxonice-userui/CONFLICTS b/utils/tuxonice-userui/CONFLICTS
new file mode 100755
index 0000000..805ff1c
--- /dev/null
+++ b/utils/tuxonice-userui/CONFLICTS
@@ -0,0 +1 @@
+conflicts suspend2-userui y
diff --git a/utils/tuxonice-userui/DEPENDS b/utils/tuxonice-userui/DEPENDS
new file mode 100755
index 0000000..e489edd
--- /dev/null
+++ b/utils/tuxonice-userui/DEPENDS
@@ -0,0 +1,9 @@
+if [[ $TUXONICE_UI == tuxoniceui_fbsplash ]] ||
+   [[ $TUXONICE_UI == all ]] ; then
+depends zlib &&
+depends jpeg &&
+depends freetype2 &&
+depends lcms &&
+depends libpng &&
+depends libmng
+fi
diff --git a/utils/tuxonice-userui/DETAILS b/utils/tuxonice-userui/DETAILS
new file mode 100755
index 0000000..e77e061
--- /dev/null
+++ b/utils/tuxonice-userui/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=tuxonice-userui
+         VERSION=1.0
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://tuxonice.net/downloads/all/${SOURCE}
+     
SOURCE_HASH=sha512:c5d7e475806d7c87cf33b07267801631f3549842ca40c93b9b17ac461063dc8b1dc5d0171d3659123106d269d7faef786bf50f298d8de44bca861a9bd86b54eb
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://www.tuxonice.net/userui";
+      LICENSE[0]=GPL
+         ENTERED=20090402
+           SHORT="Tux On Ice User UI to control hybernation"
+cat << EOF
+Tux On Ice User UI to control hybernation
+EOF
diff --git a/utils/tuxonice-userui/HISTORY b/utils/tuxonice-userui/HISTORY
new file mode 100644
index 0000000..076a7cd
--- /dev/null
+++ b/utils/tuxonice-userui/HISTORY
@@ -0,0 +1,5 @@
+2009-04-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * BUILD, CONFIGURE, CONFLICTS, DEPENDS: spell created
+       * DETAILS, INSTALL, PRE_BUILD: spell created
+
+
diff --git a/utils/tuxonice-userui/INSTALL b/utils/tuxonice-userui/INSTALL
new file mode 100755
index 0000000..a1adfbd
--- /dev/null
+++ b/utils/tuxonice-userui/INSTALL
@@ -0,0 +1,6 @@
+if [[ $TUXONICE_UI == all ]]; then
+cp -v tuxoniceui_text /sbin/  &&
+cp -v tuxoniceui_fbsplash /sbin/
+else
+cp -v $TUXONICE_UI /sbin/
+fi
diff --git a/utils/tuxonice-userui/PRE_BUILD b/utils/tuxonice-userui/PRE_BUILD
new file mode 100755
index 0000000..eac1b76
--- /dev/null
+++ b/utils/tuxonice-userui/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i -e "s/^CFLAGS :=.*/CFLAGS \:= $CFLAGS/" Makefile &&
+sed -i -e "s/^LDFLAGS :=.*/LDFLAGS := $LDFLAGS/" Makefile &&
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]] ; then
+sed -i -e "s/LDFLAGS) -static/LDFLAGS)/g" Makefile
+fi