maj splashy#0.3.13-3

6 files changed, 151 insertions, 19 deletions

diff --git a/base/splashy/.footprint b/base/splashy/.footprint
index 8a410e647..66c8f3ddc 100644
--- a/base/splashy/.footprint
+++ b/base/splashy/.footprint
@@ -11,6 +11,7 @@ drwxr-xr-x	root/root	etc/rc.d/rcsysinit.d/
 lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S00splashy -> ../init.d/splashy
 drwxr-xr-x	root/root	etc/splashy/
 -rw-r--r--	root/root	etc/splashy/config.xml
+drwxr-xr-x	root/root	etc/splashy/steps_dir/
 lrwxrwxrwx	root/root	etc/splashy/themes -> /usr/share/splashy/themes
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/splashy
@@ -65,8 +66,8 @@ drwxr-xr-x	root/root	usr/share/splashy/schemas/
 drwxr-xr-x	root/root	usr/share/splashy/themes/
 drwxr-xr-x	root/root	usr/share/splashy/themes/default/
 -rw-r--r--	root/root	usr/share/splashy/themes/default/FreeSans.ttf
--rw-r--r--	root/root	usr/share/splashy/themes/default/background.jpg
 -rw-r--r--	root/root	usr/share/splashy/themes/default/background.png
 -rw-r--r--	root/root	usr/share/splashy/themes/default/error.png
+-rw-r--r--	root/root	usr/share/splashy/themes/default/nutyx-attapu.jpg
 -rw-r--r--	root/root	usr/share/splashy/themes/default/suspend.png
 -rw-r--r--	root/root	usr/share/splashy/themes/default/theme.xml
diff --git a/base/splashy/.md5sum b/base/splashy/.md5sum
index af45639bc..732c22550 100644
--- a/base/splashy/.md5sum
+++ b/base/splashy/.md5sum
@@ -1,3 +1,4 @@
-9e3d5d8a8c89d6db10c6b41ec498a566  nutyx-attapu.jpg
-ecd26e8203aa99320f3eb26fd47f503c  splashy
+d1c6ff8efc8350efe89da494326d9b49  nutyx-attapu.jpg
+76e6b3666cc7631c0d6bd18831bd0005  splashy
 03b7ee4f31c56ee61463772f74bad8a0  splashy-0.3.13.tar.gz
+8678e7e708a50953e4bad679dbf3dd4b  theme.xml
diff --git a/base/splashy/Pkgfile b/base/splashy/Pkgfile
index 9b36a3f68..4043df3dd 100644
--- a/base/splashy/Pkgfile
+++ b/base/splashy/Pkgfile
@@ -5,9 +5,9 @@
 
 name=splashy
 version=0.3.13
-release=1
+release=3
 source=(http://alioth.debian.org/frs/download.php/2691/$name-$version.tar.gz\
-	splashy nutyx-attapu.jpg)
+	splashy nutyx-attapu.jpg theme.xml)
 
 build() {
 	cd $name-$version
@@ -18,14 +18,16 @@ build() {
 	--sysconfdir=/etc
 	make
 	make DESTDIR=$PKG install
-	mkdir -p $PKG/etc/rc.d{,/rcsysinit.d}
+	mkdir -p $PKG/etc/{$name/steps_dir,rc.d{,/rcsysinit.d}}
 	mv $PKG/etc/{init.d,rc.d/}
 	cp ../splashy $PKG/etc/rc.d/init.d/
 	chmod 754 $PKG/etc/rc.d/init.d/splashy
 	ln -s ../init.d/splashy $PKG/etc/rc.d/rcsysinit.d/S00splashy
 	rm $PKG/etc/lsb-base-logging.sh
 	cp ../nutyx-attapu.jpg \
-	$PKG/usr/share/splashy/themes/default/background.jpg
-	sed -i "s/background.png/background.jpg/g" \
+	$PKG/usr/share/splashy/themes/default/nutyx-attapu.jpg
+	cp ../theme.xml \
 	$PKG/usr/share/splashy/themes/default/theme.xml
+	sed -i "s|/lib/init/rw/splashy|/etc/splashy/steps_dir|" \
+	$PKG/etc/default/splashy
 }
diff --git a/base/splashy/nutyx-attapu.jpg b/base/splashy/nutyx-attapu.jpg
index 52771c4c3..941b9759e 100644
--- a/base/splashy/nutyx-attapu.jpg
+++ b/base/splashy/nutyx-attapu.jpg
diff --git a/base/splashy/splashy b/base/splashy/splashy
index 98ab883d2..78d7b6585 100755
--- a/base/splashy/splashy
+++ b/base/splashy/splashy
@@ -40,19 +40,11 @@
 PATH="/sbin:/bin:/usr/sbin:/usr/bin"
 NAME="splashy"
 DESC="Boot splash manager"
-STEPS_DIR="/lib/init/rw/$NAME"
+STEPS_DIR="/etc/$NAME/steps_dir"
 DEBUG=0
 
 [ -r "/etc/default/$NAME" ] && . "/etc/default/$NAME"
 
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-# if [ -r "/lib/lsb/init-functions" ]; then
-#    . "/lib/lsb/init-functions"
-# else
-#    echo "Could not read file /lib/lsb/init-functions. Please install lsb-base"
-#    exit 1
-# fi
 . /etc/sysconfig/rc
 . ${rc_functions}
 
@@ -95,12 +87,11 @@ check_to_enable () {
 calculate_steps () {
 	[ -f /etc/inittab ] &&	RLVL=`sed -n 's/id:\([2345]\):initdefault:/\1/ p' /etc/inittab`
 
-        [ ! -d $STEPS_DIR ] && mkdir -p $STEPS_DIR
 	#
 	# Mount a tmpfs on $STEPS_DIR
 	#
 	# on Ubuntu our Steps dir gets umounted if using /dev/shm/splashy
-	# we will always use /lib/init/rw/splashy and mount a tmpfs there
+	# we will always use $STEPS_DIR and mount a tmpfs there
 	SHM_OPT=
 	[ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT="-osize=$SHM_SIZE"
 	mount -n -t tmpfs shmfs $STEPS_DIR
diff --git a/base/splashy/theme.xml b/base/splashy/theme.xml
new file mode 100644
index 000000000..dd68f1e0b
--- /dev/null
+++ b/base/splashy/theme.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<splashy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://splashy.alioth.debian.org/schemas/1.1/theme.xsd">
+    <info>
+        <!-- theme name is case sensitive. use directory name -->
+        <name>default</name>
+        <version>1.1</version>
+        <description>Default splashy theme</description>
+        <urls>http://splashy.alioth.debian.org/themes</urls>
+        <author>Splashy Team</author>
+    </info>
+    <progressbar>
+        <!-- here are tags to set the bar... x coordinate,
+        y coordinate, width and height are for the progress bar.
+        Remember that x, y, width and height are expressed in percentage -->
+        <dimension>
+            <x>29</x>
+            <y>83</y>
+            <width>46</width>
+            <height>2</height>
+        </dimension>
+        <!-- here you can set the color of the progressbar...
+        set the amount of red, green, blue and alpha channel. 
+        Remember that the max value is 255 and the minumun value is 0-->
+        <color>
+            <red>224</red>
+            <green>89</green>
+            <blue>0</blue>
+            <alpha>250</alpha>
+        </color>
+        <!-- whether or not you want a border around the progressbar. default: no -->
+        <border>
+            <enable>yes</enable>
+            <color>
+                <red>52</red>
+                <green>52</green>
+                <blue>52</blue>
+                <alpha>255</alpha>
+            </color>
+        </border>
+        <!-- here you can set the color of the progressbar background
+        set the amount of red, green, blue and alpha channel. 
+        Remember that the max value is 255 and the minumun value is 0-->
+        <background>
+            <color>
+                <red>127</red>
+                <green>127</green>
+                <blue>127</blue>
+                <alpha>255</alpha>
+            </color>
+        </background>
+        <direction>
+            <boot>forward</boot>
+            <shutdown>backward</shutdown>
+            <resume>forward</resume>
+            <suspend>backward</suspend>
+        </direction>
+        <visibility>
+            <boot>yes</boot>
+            <shutdown>yes</shutdown>
+            <resume>yes</resume>
+            <suspend>yes</suspend>
+        </visibility>
+    </progressbar>
+    <!-- conventional path: /etc/splashy/themes + theme-name -->
+    <background>
+        <boot>nutyx-attapu.jpg</boot>
+        <shutdown>nutyx-attapu.jpg</shutdown>
+        <resume>suspend.png</resume>
+        <suspend>suspend.png</suspend>
+        <errorimg>error.png</errorimg>
+        <!-- resolution of the images. this value affects where 
+        the progressbar will be drawn. If VALUE <= 0, then percentages
+        of the screen width and hight will be assumed -->
+        <dimension>
+            <!-- NOTE: x and y are not used by splashy -->
+            <x>0</x>
+            <y>0</y>
+            <width>0</width>
+            <height>0</height>
+        </dimension>
+    </background>
+    <textbox>
+        <!-- whether you want the textbox always
+        shown or no. If no, it will be shown only on error, 
+        see autoverboseonerror -->
+        <enable>yes</enable>
+        <!-- here are tags to set the text area... x coordinate,
+        y coordinate, width and height are for the text area.
+        Remember that x, y, width and height are expressed in percentage
+        or pixel units -->
+        <dimension>
+            <x>20</x>
+            <y>50</y>
+            <width>60</width>
+            <height>40</height>
+        </dimension>
+        <!-- here you can set the color of the text area...
+        set the amount of red, green, blue and alpha channel. 
+        Remember that the max value is 255 and the minumun value is 0-->
+        <color>
+            <red>0</red>
+            <green>0</green>
+            <blue>0</blue>
+            <alpha>127</alpha>
+        </color>
+        <!-- whether or not you want a border around the progressbar. default: no -->
+        <border>
+            <enable>yes</enable>
+            <color>
+                <red>0</red>
+                <green>0</green>
+                <blue>0</blue>
+                <alpha>255</alpha>
+            </color>
+        </border>
+        <text>
+            <!-- font file to use, path relative to theme -->
+            <font>
+                <file>FreeSans.ttf</file>
+                <height>10</height>
+            </font>
+            <!-- here you can set the color of the text/font...
+            set the amount of red, green, blue and alpha channel. 
+            Remember that the max value is 255 and the minumun value is 0-->
+            <color>
+                <red>128</red>
+                <green>128</green>
+                <blue>32</blue>
+                <alpha>255</alpha>
+            </color>
+        </text>
+    </textbox>
+    <autoverboseonerror>no</autoverboseonerror>
+    <fadein>no</fadein>
+    <fadeout>no</fadeout>
+</splashy>