[Demudi-commits] r919 - in sysv-rc-bootsplash/trunk: . debian
debian/po
Free Ekanayaka
free-guest at costa.debian.org
Wed Sep 20 14:24:15 UTC 2006
Author: free-guest
Date: 2006-09-20 14:24:14 +0000 (Wed, 20 Sep 2006)
New Revision: 919
Added:
sysv-rc-bootsplash/trunk/debian/po/templates.pot
Modified:
sysv-rc-bootsplash/trunk/debian/changelog
sysv-rc-bootsplash/trunk/debian/control
sysv-rc-bootsplash/trunk/debian/postinst
sysv-rc-bootsplash/trunk/debian/sysv-rc-bootsplash.templates
sysv-rc-bootsplash/trunk/rc.bootsplash
sysv-rc-bootsplash/trunk/rc.sysv-rc
Log:
releasing version 1.0.3-1
Modified: sysv-rc-bootsplash/trunk/debian/changelog
===================================================================
--- sysv-rc-bootsplash/trunk/debian/changelog 2006-09-20 14:23:06 UTC (rev 918)
+++ sysv-rc-bootsplash/trunk/debian/changelog 2006-09-20 14:24:14 UTC (rev 919)
@@ -1,3 +1,13 @@
+sysv-rc-bootsplash (1.0.3-1) unstable; urgency=low
+
+ * New upstream. The patches now wotk with sysv-rc version 2.86.ds1-20
+ * Bug fix: "Problem installing in postinst script", thanks to Laurent
+ BAYSSE (Closes: #387488).
+ * Bug fix: "sysv-rc-bootsplash: Please mark your debconf templates
+ string as translatable", thanks to Thomas Huriaux (Closes: #385843).
+
+ -- Free Ekanayaka <freee at debian.org> Wed, 20 Sep 2006 14:14:12 +0200
+
sysv-rc-bootsplash (1.0.2-1) unstable; urgency=low
* New upstream. The patches now work with sysv-rc version 2.85.ds1-15,
Modified: sysv-rc-bootsplash/trunk/debian/control
===================================================================
--- sysv-rc-bootsplash/trunk/debian/control 2006-09-20 14:23:06 UTC (rev 918)
+++ sysv-rc-bootsplash/trunk/debian/control 2006-09-20 14:24:14 UTC (rev 919)
@@ -7,7 +7,7 @@
Package: sysv-rc-bootsplash
Architecture: all
-Depends: sysv-rc (>= 2.86.ds1-15), initramfs-tools, patch, ${misc:Depends}, po-debconf
+Depends: sysv-rc (>= 2.86.ds1-20), initramfs-tools, patch, ${misc:Depends}, po-debconf
Recommends: bootsplash (>= 3.0.0)
Conflicts: sysv-rc-fbsplash
Description: Bootsplash patches for rc files
Added: sysv-rc-bootsplash/trunk/debian/po/templates.pot
===================================================================
--- sysv-rc-bootsplash/trunk/debian/po/templates.pot (rev 0)
+++ sysv-rc-bootsplash/trunk/debian/po/templates.pot 2006-09-20 14:24:14 UTC (rev 919)
@@ -0,0 +1,97 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: freee at debian.org\n"
+"POT-Creation-Date: 2006-09-20 14:13+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:3
+msgid "The system rc and functions files have to be patched"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:3
+msgid ""
+"Your /etc/init.d/rc and /etc/init.d/rcS files will be patched to operate "
+"correctly with bootsplash. Do not edit them after patching; if you do, upon "
+"removal this package will not be able to restore the original files. If you "
+"have already editied your rc and rcS files and the patch fails, you will be "
+"notified, and your rc and rcS files will not be changed."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:3
+msgid "You should also install the bootsplash package with this one."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:16
+msgid "Should bootsplash patch your start up scripts?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:16
+msgid ""
+"In order to operate correctly, bootsplash must patch your /etc/init.d/rc "
+"and /etc/init.d/rcS files. Upon removal of this package the patches will be "
+"removed. If for some reason the patches are not reversed upon removal of "
+"this package just run 'apt-get install --reinstall sysv-rc' to restore your "
+"startup scripts or rename the rc.orig and rcS.orig files in your /etc/init."
+"d/ directory."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:16
+msgid ""
+"If you do not patch your start up scripts progress bars and animations will "
+"not work."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:30
+msgid "Patching your rc and rcS files has failed"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:30
+msgid ""
+"Bootsplash was unable to patch your /etc/init.d/rc and /etc/init.d/rcS "
+"files, please run 'apt-get install --reinstall sysv-rc' to restore the "
+"original rc/S scripts and then run 'dpkg --pending --configure' to complete "
+"this install."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:37
+msgid "Un-patching your rc and rcS files has failed"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:37
+msgid ""
+"Bootsplash was unable to un-patch your /etc/init.d/rc and /etc/init.d/rcS "
+"files, please run 'apt-get install --reinstall sysv-rc' to replace the "
+"original rc scripts after the removal of this package."
+msgstr ""
Modified: sysv-rc-bootsplash/trunk/debian/postinst
===================================================================
--- sysv-rc-bootsplash/trunk/debian/postinst 2006-09-20 14:23:06 UTC (rev 918)
+++ sysv-rc-bootsplash/trunk/debian/postinst 2006-09-20 14:24:14 UTC (rev 919)
@@ -39,7 +39,7 @@
;;
esac
-function print_error {
+print_error () {
echo "Patches would not apply cleanly."
# db_input high sysv-rc-bootsplash/failed || true
# db_go
Modified: sysv-rc-bootsplash/trunk/debian/sysv-rc-bootsplash.templates
===================================================================
--- sysv-rc-bootsplash/trunk/debian/sysv-rc-bootsplash.templates 2006-09-20 14:23:06 UTC (rev 918)
+++ sysv-rc-bootsplash/trunk/debian/sysv-rc-bootsplash.templates 2006-09-20 14:24:14 UTC (rev 919)
@@ -1,6 +1,6 @@
Template: sysv-rc-bootsplash/info
Type: note
-Description: The system rc and functions files have to be patched
+_Description: The system rc and functions files have to be patched
Your /etc/init.d/rc and /etc/init.d/rcS files will be patched
to operate correctly with bootsplash. Do not edit them after patching;
if you do, upon removal this package will not be able to restore the
@@ -13,7 +13,7 @@
Template: sysv-rc-bootsplash/should-patch
Type: boolean
Default: true
-Description: Should bootsplash patch your start up scripts?
+_Description: Should bootsplash patch your start up scripts?
In order to operate correctly, bootsplash must patch your
/etc/init.d/rc and /etc/init.d/rcS files. Upon removal of
this package the patches will be removed. If for some reason
@@ -27,14 +27,14 @@
Template: sysv-rc-bootsplash/failed
Type: note
-Description: Patching your rc and rcS files has failed
+_Description: Patching your rc and rcS files has failed
Bootsplash was unable to patch your /etc/init.d/rc and /etc/init.d/rcS files,
please run 'apt-get install --reinstall sysv-rc' to restore the original
rc/S scripts and then run 'dpkg --pending --configure' to complete this install.
Template: sysv-rc-bootsplash/failed-removal
Type: note
-Description: Un-patching your rc and rcS files has failed
+_Description: Un-patching your rc and rcS files has failed
Bootsplash was unable to un-patch your /etc/init.d/rc and /etc/init.d/rcS files,
please run 'apt-get install --reinstall sysv-rc' to replace the original
rc scripts after the removal of this package.
Modified: sysv-rc-bootsplash/trunk/rc.bootsplash
===================================================================
--- sysv-rc-bootsplash/trunk/rc.bootsplash 2006-09-20 14:23:06 UTC (rev 918)
+++ sysv-rc-bootsplash/trunk/rc.bootsplash 2006-09-20 14:24:14 UTC (rev 919)
@@ -67,22 +67,15 @@
export runlevel previous
-if [ S = "$runlevel" ]
-then
- #
- # See if system needs to be setup. This is ONLY meant to
- # be used for the initial setup after a fresh installation!
- #
- if [ -x /sbin/unconfigured.sh ]
- then
- /sbin/unconfigured.sh
- fi
- rc_splash "splash start" # let bootsplash know we are ready
-fi
-
. /etc/default/rcS
export VERBOSE
+if [ -f /lib/lsb/init-functions ] ; then
+ . /lib/lsb/init-functions
+else
+ log_daemon_msg() { echo $@; }
+fi
+
#
# Stub to do progress bar ticks (currently just for usplash) on startup
#
@@ -99,36 +92,8 @@
# Start script or program.
#
case "$CONCURRENCY" in
- none)
- startup() {
- action=$1
- shift
- scripts="$@"
- sh=sh
- # Debian Policy §9.3.1 requires .sh scripts in runlevel S to be sourced
- # However, some important packages currently contain .sh scripts
- # that do "exit" at some point, thus killing this process. Bad!
- #[ S = "$runlevel" ] && sh=.
- for script in $scripts ; do
- case "$script" in
- *.sh)
- if [ "." = "$sh" ] ; then
- set "$action"
- RC_SAVE_PATH="$PATH"
- startup_progress $debug . "$script"
- PATH="$RC_SAVE_PATH"
- else
- startup_progress $debug $sh "$script" $action
- fi
- ;;
- *)
- startup_progress $debug "$script" $action
- ;;
- esac
- done
- }
- ;;
shell)
+ log_daemon_msg "Using shell-style concurrent boot"
startup() {
action=$1
shift
@@ -161,6 +126,7 @@
}
;;
startpar)
+ log_daemon_msg "Using startpar-style concurrent boot"
startup() {
action=$1
shift
@@ -196,6 +162,35 @@
[ -n "$scripts" ] && startup_progress $debug startpar -a $action $scripts
}
;;
+ none|*)
+ startup() {
+ action=$1
+ shift
+ scripts="$@"
+ sh=sh
+ # Debian Policy §9.3.1 requires .sh scripts in runlevel S to be sourced
+ # However, some important packages currently contain .sh scripts
+ # that do "exit" at some point, thus killing this process. Bad!
+ #[ S = "$runlevel" ] && sh=.
+ for script in $scripts ; do
+ case "$script" in
+ *.sh)
+ if [ "." = "$sh" ] ; then
+ set "$action"
+ RC_SAVE_PATH="$PATH"
+ startup_progress $debug . "$script"
+ PATH="$RC_SAVE_PATH"
+ else
+ startup_progress $debug $sh "$script" $action
+ fi
+ ;;
+ *)
+ startup_progress $debug "$script" $action
+ ;;
+ esac
+ done
+ }
+ ;;
esac
#
@@ -345,14 +340,7 @@
#
[ -d /etc/rc.boot ] && run-parts /etc/rc.boot
- #
- # Finish setup if needed. The comment above about
- # /sbin/unconfigured.sh applies here as well!
- #
- if [ -x /sbin/setup.sh ]
- then
- /sbin/setup.sh
- fi
+ rc_splash "splash start" # let bootsplash know we are ready
fi
rc_splash "master" # stop playing animations
Modified: sysv-rc-bootsplash/trunk/rc.sysv-rc
===================================================================
--- sysv-rc-bootsplash/trunk/rc.sysv-rc 2006-09-20 14:23:06 UTC (rev 918)
+++ sysv-rc-bootsplash/trunk/rc.sysv-rc 2006-09-20 14:24:14 UTC (rev 919)
@@ -62,21 +62,15 @@
export runlevel previous
-if [ S = "$runlevel" ]
-then
- #
- # See if system needs to be setup. This is ONLY meant to
- # be used for the initial setup after a fresh installation!
- #
- if [ -x /sbin/unconfigured.sh ]
- then
- /sbin/unconfigured.sh
- fi
-fi
-
. /etc/default/rcS
export VERBOSE
+if [ -f /lib/lsb/init-functions ] ; then
+ . /lib/lsb/init-functions
+else
+ log_daemon_msg() { echo $@; }
+fi
+
#
# Stub to do progress bar ticks (currently just for usplash) on startup
#
@@ -93,36 +87,8 @@
# Start script or program.
#
case "$CONCURRENCY" in
- none)
- startup() {
- action=$1
- shift
- scripts="$@"
- sh=sh
- # Debian Policy §9.3.1 requires .sh scripts in runlevel S to be sourced
- # However, some important packages currently contain .sh scripts
- # that do "exit" at some point, thus killing this process. Bad!
- #[ S = "$runlevel" ] && sh=.
- for script in $scripts ; do
- case "$script" in
- *.sh)
- if [ "." = "$sh" ] ; then
- set "$action"
- RC_SAVE_PATH="$PATH"
- startup_progress $debug . "$script"
- PATH="$RC_SAVE_PATH"
- else
- startup_progress $debug $sh "$script" $action
- fi
- ;;
- *)
- startup_progress $debug "$script" $action
- ;;
- esac
- done
- }
- ;;
shell)
+ log_daemon_msg "Using shell-style concurrent boot"
startup() {
action=$1
shift
@@ -155,6 +121,7 @@
}
;;
startpar)
+ log_daemon_msg "Using startpar-style concurrent boot"
startup() {
action=$1
shift
@@ -190,6 +157,35 @@
[ -n "$scripts" ] && startup_progress $debug startpar -a $action $scripts
}
;;
+ none|*)
+ startup() {
+ action=$1
+ shift
+ scripts="$@"
+ sh=sh
+ # Debian Policy §9.3.1 requires .sh scripts in runlevel S to be sourced
+ # However, some important packages currently contain .sh scripts
+ # that do "exit" at some point, thus killing this process. Bad!
+ #[ S = "$runlevel" ] && sh=.
+ for script in $scripts ; do
+ case "$script" in
+ *.sh)
+ if [ "." = "$sh" ] ; then
+ set "$action"
+ RC_SAVE_PATH="$PATH"
+ startup_progress $debug . "$script"
+ PATH="$RC_SAVE_PATH"
+ else
+ startup_progress $debug $sh "$script" $action
+ fi
+ ;;
+ *)
+ startup_progress $debug "$script" $action
+ ;;
+ esac
+ done
+ }
+ ;;
esac
# Is there an rc directory for this new runlevel?
@@ -329,15 +325,6 @@
# For compatibility, run the files in /etc/rc.boot too.
#
[ -d /etc/rc.boot ] && run-parts /etc/rc.boot
-
- #
- # Finish setup if needed. The comment above about
- # /sbin/unconfigured.sh applies here as well!
- #
- if [ -x /sbin/setup.sh ]
- then
- /sbin/setup.sh
- fi
fi
trap - EXIT # Disable emergency handler
More information about the Demudi-commits
mailing list