[Demudi-commits] r644 - in bootsplash/trunk: . debian debian/patches
Free Ekanayaka
free-guest at costa.debian.org
Mon Feb 6 02:21:38 UTC 2006
Author: free-guest
Date: 2006-02-06 02:21:37 +0000 (Mon, 06 Feb 2006)
New Revision: 644
Added:
bootsplash/trunk/debian/patches/
bootsplash/trunk/debian/patches/00list
bootsplash/trunk/debian/patches/Makefile.dpatch
bootsplash/trunk/debian/patches/bootanim.dpatch
bootsplash/trunk/debian/patches/gcc-4.0.dpatch
bootsplash/trunk/debian/patches/includeprog.dpatch
bootsplash/trunk/debian/patches/initscript.dpatch
bootsplash/trunk/debian/patches/splash.sh.dpatch
Removed:
bootsplash/trunk/Scripts/
bootsplash/trunk/Utilities/
Modified:
bootsplash/trunk/debian/changelog
Log:
* Using dpatch from now on
* Converted all the previous patches in dpatch files
Modified: bootsplash/trunk/debian/changelog
===================================================================
--- bootsplash/trunk/debian/changelog 2006-02-06 02:18:50 UTC (rev 643)
+++ bootsplash/trunk/debian/changelog 2006-02-06 02:21:37 UTC (rev 644)
@@ -1,6 +1,7 @@
bootsplash (3.1-1) UNRELEASED; urgency=low
- * Use dpatch
+ * Using dpatch from now on
+ * Converted all the previous patches in dpatch files
-- Free Ekanayaka <free at agnula.org> Mon, 6 Feb 2006 05:27:50 -0500
Added: bootsplash/trunk/debian/patches/00list
===================================================================
--- bootsplash/trunk/debian/patches/00list 2006-02-06 02:18:50 UTC (rev 643)
+++ bootsplash/trunk/debian/patches/00list 2006-02-06 02:21:37 UTC (rev 644)
@@ -0,0 +1,6 @@
+gcc-4.0
+includeprog
+initscript
+bootanim
+splash.sh
+Makefile
Added: bootsplash/trunk/debian/patches/Makefile.dpatch
===================================================================
--- bootsplash/trunk/debian/patches/Makefile.dpatch 2006-02-06 02:18:50 UTC (rev 643)
+++ bootsplash/trunk/debian/patches/Makefile.dpatch 2006-02-06 02:21:37 UTC (rev 644)
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile.dpatch by <free at mediastation>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bootsplash-3.1~/Utilities/Makefile bootsplash-3.1/Utilities/Makefile
+--- bootsplash-3.1~/Utilities/Makefile 2006-02-06 05:02:26.000000000 -0500
++++ bootsplash-3.1/Utilities/Makefile 2006-02-06 05:02:40.857840736 -0500
+@@ -1,9 +1,12 @@
+ # Makefile for bootsplash utilities.
+ # written by Stefan Reinauer <stepan at suse.de> in 2003
++# debianzied by Matthew A. Nicholson <debian at matt-land.com>, 2003
++# changed by Oliver Sorge <oliver at dediziert.org>, 2004
+ #
+
+-CC = gcc
+-STRIP = strip
++CC = gcc
++STRIP = strip
++INSTALL = install -s
+
+ # Triggering lib64 path from spec file.
+ PREFIX ?= /usr
+@@ -12,7 +15,7 @@
+ LIBDIR = $(PREFIX)/$(LIB)
+
+ PROGRAMS = splash splashpbm fbresolution fbtruetype fbmngplay
+-PROGRAMS_STATIC = fbtruetype.static fbmngplay.static
++PROGRAMS_STATIC = fbtruetype.static
+
+ OBJECTS_FT2 = fbtruetype.o fbtruetype-messages.o console.o ttf.o luxisri.o
+ OBJECTS_MNG = fbmngplay.o fbmngplay-messages.o mng.o console.o
+@@ -56,4 +59,14 @@
+ strip: $(PROGRAMS)
+ $(STRIP) -s $(PROGRAMS)
+
++strip.static: $(PROGRAMS_STATIC)
++ $(STRIP.STATIC) -s $(PROGRAMS_STATIC)
++
++install: $(PROGRAMS) strip
++ $(INSTALL) splash "$(DESTDIR)/usr/sbin/"
++ $(INSTALL) fbresolution fbtruetype fbmngplay splashpbm "$(DESTDIR)/sbin/"
++
++install.static: $(PROGRAMS_STATIC) strip
++ $(INSTALL) fbtruetype.static "$(DESTDIR)/sbin/"
++
+ .PHONY: mostlyclean clean fbtruetype fbtruetype.static all strip
Property changes on: bootsplash/trunk/debian/patches/Makefile.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: bootsplash/trunk/debian/patches/bootanim.dpatch
===================================================================
--- bootsplash/trunk/debian/patches/bootanim.dpatch 2006-02-06 02:18:50 UTC (rev 643)
+++ bootsplash/trunk/debian/patches/bootanim.dpatch 2006-02-06 02:21:37 UTC (rev 644)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bootanim.dpatch by <free at mediastation>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bootsplash-3.1~/Scripts/bootanim bootsplash-3.1/Scripts/bootanim
+--- bootsplash-3.1~/Scripts/bootanim 2006-02-05 20:58:03.000000000 -0500
++++ bootsplash-3.1/Scripts/bootanim 2006-02-05 20:58:08.631805184 -0500
+@@ -9,6 +9,7 @@
+ # of the GNU General Public License. This program has absolutely no warranty.
+ #
+ # (C) 2002,2003 SuSE Linux AG. Written by Stefan Reinauer <stepan at suse.de>
++# Debianized 2004 by Sascha Schroeder, <schroeder.sascha at web.de>
+ #
+ # See http://www.bootsplash.org/ for more information.
+ #
+@@ -41,7 +42,7 @@
+ fi
+
+ THEME="No theme selected"
+-test -f /etc/sysconfig/bootsplash && . /etc/sysconfig/bootsplash
++test -f /etc/default/bootsplash && . /etc/default/bootsplash
+
+ if [ ! -d /etc/bootsplash/themes/$THEME ]
+ then
Property changes on: bootsplash/trunk/debian/patches/bootanim.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: bootsplash/trunk/debian/patches/gcc-4.0.dpatch
===================================================================
--- bootsplash/trunk/debian/patches/gcc-4.0.dpatch 2006-02-06 02:18:50 UTC (rev 643)
+++ bootsplash/trunk/debian/patches/gcc-4.0.dpatch 2006-02-06 02:21:37 UTC (rev 644)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gcc-4.0.dpatch by <free at mediastation>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bootsplash-3.1~/Utilities/mng.c bootsplash-3.1/Utilities/mng.c
+--- bootsplash-3.1~/Utilities/mng.c 2006-02-05 20:42:22.000000000 -0500
++++ bootsplash-3.1/Utilities/mng.c 2006-02-05 20:43:15.701551216 -0500
+@@ -217,7 +217,7 @@
+ // BGRA8
+ unsigned int i = mymng->width;
+ unsigned int fr, fg, fb, br, bg, bb, r, g, b, a;
+- unsigned short output, input;
++ unsigned short output, input, tmp;
+
+ while (i--) {
+ fb = *src++;
+@@ -228,7 +228,8 @@
+ a = a * mymng->alpha / 100;
+ switch (mymng->fbbpp) {
+ case 16:
+- input = *((unsigned short *) background)++;
++ input = *((unsigned short *) background);
++ input++;
+
+ br = (input >> mng->fbredo) << (8 - mng->fbredl);
+ bg = (input >> mng->fbgreeno) << (8 -
+@@ -279,7 +280,9 @@
+ fbgreeno) | (b << mng->
+ fbblueo);
+
+- *((unsigned short *) dest)++ = output;
++ tmp = *((unsigned short *) dest);
++ tmp++;
++ tmp = output;
+ break;
+ case 24:
+ *dest++ = b;
Property changes on: bootsplash/trunk/debian/patches/gcc-4.0.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: bootsplash/trunk/debian/patches/includeprog.dpatch
===================================================================
--- bootsplash/trunk/debian/patches/includeprog.dpatch 2006-02-06 02:18:50 UTC (rev 643)
+++ bootsplash/trunk/debian/patches/includeprog.dpatch 2006-02-06 02:21:37 UTC (rev 644)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## includeprog.dpatch by <free at mediastation>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bootsplash-3.1~/Scripts/includeprog bootsplash-3.1/Scripts/includeprog
+--- bootsplash-3.1~/Scripts/includeprog 1969-12-31 19:00:00.000000000 -0500
++++ bootsplash-3.1/Scripts/includeprog 2006-02-05 20:54:17.071007776 -0500
+@@ -0,0 +1,5 @@
++#!/bin/sh
++
++CMDLINE=$@
++#echo $CMDLINE
++exit 0
Property changes on: bootsplash/trunk/debian/patches/includeprog.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: bootsplash/trunk/debian/patches/initscript.dpatch
===================================================================
--- bootsplash/trunk/debian/patches/initscript.dpatch 2006-02-06 02:18:50 UTC (rev 643)
+++ bootsplash/trunk/debian/patches/initscript.dpatch 2006-02-06 02:21:37 UTC (rev 644)
@@ -0,0 +1,85 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## initscript.dpatch by <free at mediastation>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bootsplash-3.1~/Scripts/bootsplash bootsplash-3.1/Scripts/bootsplash
+--- bootsplash-3.1~/Scripts/bootsplash 1969-12-31 19:00:00.000000000 -0500
++++ bootsplash-3.1/Scripts/bootsplash 2006-02-05 20:52:33.764712720 -0500
+@@ -0,0 +1,74 @@
++
++#!/bin/sh
++# based on initscript from gentoo linux
++# made some changes to fit normal sysvinit like used by debian
++# everything in here is GPL ;)
++# tcs at double-action.org
++
++# source our config
++source /etc/default/bootsplash 2>/dev/null
++
++# default settings
++test -z "${THEME}" && THEME="default"
++test -z "${BOOTSPLASH_TTYS}" && BOOTSPLASH_TTYS=`seq 0 5`
++
++get_bootsplash_theme () {
++ # try to get bootsplash theme from kernel command line
++ for param in `grep "theme=" /proc/cmdline`; do
++ if [ "${param%=*}" == "theme" ]; then
++ THEME="${param#*=}"
++ fi
++ done
++}
++
++SPLASH=$(which splash)
++
++case "$1" in
++start)
++ # Only do this if the kernel has support
++ if [ -f /proc/splash ]
++ then
++ echo "Setting Console frame buffer images"
++
++ get_bootsplash_theme
++ echo "Using theme $THEME"
++ # get console resolution
++ RESOLUTION=$(/sbin/fbresolution)
++
++ # switch to a usable image on all consoles
++ for TTY in `echo "${BOOTSPLASH_TTYS}" | sed -e 's# #\n#g'`
++ do
++ # support for a different config per virtual terminal
++ if [ -e /etc/bootsplash/themes/${THEME}/config/vtsplash-${TTY}-${RESOLUTION}.cfg ]
++ then
++ $SPLASH -s -u $TTY -n /etc/bootsplash/themes/${THEME}/config/vtsplash-${TTY}-${RESOLUTION}.cfg
++ else
++ $SPLASH -s -u $TTY -n /etc/bootsplash/themes/${THEME}/config/bootsplash-${RESOLUTION}.cfg
++ fi
++ done
++ fi
++;;
++stop)
++ CHVT=$(which chvt)
++ # Stop doesn't really stop, it actually changes the image
++ # on vt1 back to the bootsplash image.
++ # Only do this if the kernel has support
++ if [ -f /proc/splash ]
++ then
++ echo "Setting Console frame buffer images"
++ get_bootsplash_theme
++ # source bootsplash config
++ source /etc/bootsplash/themes/${THEME}/config/bootsplash-$(/sbin/fbresolution).cfg 2>/dev/null
++ # Put bootsplash image up
++ $SPLASH -s -u 0 /etc/bootsplash/themes/${THEME}/config/bootsplash-$(/sbin/fbresolution).cfg
++ # ensure "silent" image is displayed
++ echo "silent" > /proc/splash
++ # switch to vt1 (must be &'d otherwise script hangs)
++ ${CHVT} 1 &
++ # print a nice message
++ # /sbin/fbtruetype ........
++ fi
++;;
++esac
++
++exit 0
Property changes on: bootsplash/trunk/debian/patches/initscript.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: bootsplash/trunk/debian/patches/splash.sh.dpatch
===================================================================
--- bootsplash/trunk/debian/patches/splash.sh.dpatch 2006-02-06 02:18:50 UTC (rev 643)
+++ bootsplash/trunk/debian/patches/splash.sh.dpatch 2006-02-06 02:21:37 UTC (rev 644)
@@ -0,0 +1,118 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## splash.sh.dpatch by <free at mediastation>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bootsplash-3.1~/Scripts/splash.sh bootsplash-3.1/Scripts/splash.sh
+--- bootsplash-3.1~/Scripts/splash.sh 2006-02-05 20:59:56.000000000 -0500
++++ bootsplash-3.1/Scripts/splash.sh 2006-02-05 21:00:14.009744840 -0500
+@@ -14,6 +14,8 @@
+ # absolutely no warranty.
+ #
+ # written 2002-2003 Stefan Reinauer, <stepan at suse.de>
++# Debianized 2004 by Sascha Schroeder, <schroeder.sascha at web.de>
++# with modifications from Matthew A. Nicholson, <debian at matt-land.com>
+ #
+ # this script expects the following environment variables for an operable
+ # progress bar:
+@@ -36,25 +38,27 @@
+ _procsplash="`cat /proc/splash 2>/dev/null`"
+
+ THEME="No bootsplash theme selected"
+-test -f /etc/sysconfig/bootsplash && . /etc/sysconfig/bootsplash
++test -f /etc/default/bootsplash && . /etc/default/bootsplash
+ test ! -d "/etc/bootsplash/themes/$THEME" && exit 0
+
+ # parse animations.cfg. This part should not be handled by the
+ # splash binary.
+
+ if [ -f /etc/bootsplash/themes/$THEME/config/animations.cfg ]; then
+- COMMAND="`cat /etc/bootsplash/themes/$THEME/config/animations.cfg| grep "^$1"|cut -f2 -d\:`"
++# COMMAND="`cat /etc/bootsplash/themes/$THEME/config/animations.cfg | grep "^$1" | cut -f2 -d\:`"
++ COMMAND="`cat /etc/bootsplash/themes/$THEME/config/animations.cfg | grep "^$1" | sed -e 's/^.*\://g;'`"
+ eval $COMMAND
+ fi
+
+ # assertions
+ test -r /proc/splash || exit 0
+ test -z "$progress" -a -z "$num" && exit 0
+-test -z "`echo $_procsplash|grep on`" && exit 0
+-test "$1" == "bootnetwork stop" -o "$1" == "YaST" && exit 0 # no progress
++test -z "`echo $_procsplash | grep on`" && exit 0
++# This probably won't happen in Debian ...
++#test "$1" == "bootnetwork stop" -o "$1" == "YaST" && exit 0 # no progress
+
+ # We chose verbose in grub
+-test "`cat /proc/cmdline |grep \"splash=silent\"`" == "" && exit 0
++test "`cat /proc/cmdline | grep \"splash=silent\"`" == "" && exit 0
+
+ if [ "$PREVLEVEL" == "3" -o "$PREVLEVEL" == "5" ] ; then
+ if [ "$RUNLEVEL" = "3" -o "$RUNLEVEL" == "5" ] ; then
+@@ -64,12 +68,14 @@
+
+ # acquire data
+ #
+-num=$(( $sscripts + 2 ))
++#num=$(( $sscripts + 2 ))
++num=$(( $sscripts ))
+ _shutdown="no"
+ _silent="no"
+-test "`cat /proc/splash |grep silent`" && _silent="yes"
++test "`cat /proc/splash | grep silent`" && _silent="yes"
+ test "$RUNLEVEL" == "6" -o "$RUNLEVEL" == "0" && _shutdown="yes"
+-test "$_shutdown" == "yes" && num=$(( $kscripts + 2 ))
++#test "$_shutdown" == "yes" && num=$(( $kscripts + 2 ))
++test "$_shutdown" == "yes" && num=$(( $kscripts ))
+
+ function box() { true; } # ignore box descriptions in the config file
+
+@@ -81,15 +87,29 @@
+ # F2 for verbose mode)
+ #
+
+-if [ "$progress" == 1 -o "$1" == "splash start" ]; then
+- test "$_shutdown" == "yes" && ( echo "silent" >/proc/splash; chvt 1)
+- _boot="Booting"; test "$_shutdown" == "yes" && _boot="Shutting down"
++if [ "$progress" == 5 -o "$1" == "splash start" ]; then
++ if [ x$_shutdown == xyes ]; then
++ echo "silent" > /proc/splash
++ chvt 1
++ _msg=$MSG_SHUTDOWN; # may be defined in /etc/default/bootsplash
++ [ -z "$_msg" ] && _msg="Shutting down the system... Press F2 for verbose mode"
++ else
++ _msg=$MSG_BOOT; # may be defined in /etc/default/bootsplash
++ [ -z "$_msg" ] && _msg="Booting the system... Press F2 for verbose mode"
++ fi
+
+ if [ "$text_x" != "" -a "$text_y" != "" \
+ -a "$text_color" != "" -a "$text_size" != "" -a "$_silent" == "yes" ];
+ then
+- fbtruetype -x $text_x -y $text_y -t $text_color -s $text_size \
+- "$_boot the system... Press F2 for verbose mode"
++ case "$USE_STATIC_FBT" in
++ [Yy]*)
++ fbtruetype="fbtruetype.static"
++ ;;
++ *)
++ fbtruetype="fbtruetype"
++ ;;
++ esac
++ $fbtruetype -x $text_x -y $text_y -t $text_color -s $text_size "$_msg"
+ fi
+ fi
+
+@@ -99,5 +119,11 @@
+ #
+
+ test -z "$progress_enable" && exit 0
+-echo "show $(( 65534 * ( $progress + 1 ) / $num ))" > /proc/splash
++#echo "show $(( 65534 * ( $progress + 1 ) / $num ))" > /proc/splash
++if [ $num -eq 0 ]
++then
++ echo "show 65534" > /proc/splash
++else
++ echo "show $(( 65534 * ( $progress ) / $num ))" > /proc/splash
++fi
+
Property changes on: bootsplash/trunk/debian/patches/splash.sh.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Demudi-commits
mailing list