removed old bootsplash2 dir.

adapted Makefile to copy tools/{splashy,splashy_update} to SLX-share-path/splashy/...
Please check or modifiy Makefile!



git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1336 95ad53e4-c205-0410-b2fa-d234c58c8868

5 files changed, 2 insertions, 150 deletions

diff --git a/Makefile b/Makefile
index ce334290..881097fd 100644
--- a/Makefile
+++ b/Makefile
@@ -135,6 +135,7 @@ supported."; \
 	      -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/cdboot \
 	      -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/initramfs \
 	      -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/busybox \
+	      -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/splashy \
 	      -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/squashfs \
 	      -p $(SLX_BUILD_PATH)$(SLX_PRIVATE_PATH)/config/default/initramfs \
 	      -p $(SLX_BUILD_PATH)$(SLX_PRIVATE_PATH)/config/default/rootfs \
@@ -198,6 +199,7 @@ supported."; \
 	  tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/themes; cd ..; \
 	cp -pP tools/busybox{,.links,.x86_64,.i586} \
 	  $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/busybox/; \
+	cp -p tools/splashy{,_update} $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/splashy/; \
 	cp -p tools/mksquashfs $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/squashfs/; \
 
 	@   # create default config folder hierarchy:
diff --git a/theming/openslx/bootsplash2/config.xml b/theming/openslx/bootsplash2/config.xml
deleted file mode 100644
index 16080a07..00000000
--- a/theming/openslx/bootsplash2/config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Automatically generated by splashy_config. Do not edit -->
-<splashy>
-    <!-- themes directory: conventional path /etc/splashy/themes -->
-    <themes>/etc/splashy/themes</themes>
-    <!-- current theme could be relative the themes defined above or full path -->
-    <current_theme>openslx</current_theme>
-    <!-- full path to theme to fall back in case of problems. DO NOT CHANGE -->
-    <default_theme>/etc/splashy/themes/openslx</default_theme>
-    <pid>/etc/splashy/splashy.pid</pid>
-    <fifo>/dev/.initramfs/splashy.fifo</fifo>
-</splashy>
diff --git a/theming/openslx/bootsplash2/themes/openslx/blank.ttf b/theming/openslx/bootsplash2/themes/openslx/blank.ttf
deleted file mode 100644
index e69de29b..00000000
--- a/theming/openslx/bootsplash2/themes/openslx/blank.ttf
+++ /dev/null
diff --git a/theming/openslx/bootsplash2/themes/openslx/openslx.png b/theming/openslx/bootsplash2/themes/openslx/openslx.png
deleted file mode 100644
index 1f61180c..00000000
--- a/theming/openslx/bootsplash2/themes/openslx/openslx.png
+++ /dev/null
diff --git a/theming/openslx/bootsplash2/themes/openslx/theme.xml b/theming/openslx/bootsplash2/themes/openslx/theme.xml
deleted file mode 100644
index 6b78ba67..00000000
--- a/theming/openslx/bootsplash2/themes/openslx/theme.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Automatically generated by splashy_config. Do not edit -->
-<splashy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://splashy.alioth.debian.org/schemas/1.1/themes.xsd">
-    <info>
-        <!-- theme name is case sensitive. use directory name -->
-        <name>openslx</name>
-        <version>0.1</version>
-        <description>...</description>
-        <urls>http://</urls>
-        <author>Author &lt;author@mail.com&gt;</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>5</x>
-            <y>95</y>
-            <width>90</width>
-            <height>1</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>255</red>
-            <green>139</green>
-            <blue>0</blue>
-            <alpha>0</alpha>
-        </color>
-        <!-- whether or not you want a border around the progressbar. default: no -->
-        <border>
-            <enable>no</enable>
-            <color>
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-                <alpha>0</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>62</red>
-                <green>93</green>
-                <blue>114</blue>
-                <alpha>0</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>openslx.png</boot>
-        <shutdown>openslx.png</shutdown>
-        <resume>openslx.png</resume>
-        <suspend>openslx.png</suspend>
-        <errorimg>openslx.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>no</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>24</x>
-            <y>45</y>
-            <width>71</width>
-            <height>45</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>10</alpha>
-        </color>
-        <!-- whether or not you want a border around the progressbar. default: no -->
-        <border>
-            <enable>no</enable>
-            <color>
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-                <alpha>0</alpha>
-            </color>
-        </border>
-        <text>
-            <!-- font file to use, path relative to theme -->
-            <font>
-                <file>blank.ttf</file>
-                <height>2</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>62</red>
-                <green>93</green>
-                <blue>114</blue>
-                <alpha>0</alpha>
-            </color>
-        </text>
-    </textbox>
-    <autoverboseonerror>no</autoverboseonerror>
-    <fadein>no</fadein>
-    <fadeout>no</fadeout>
-</splashy>