[Demudi-commits] r991 - in sysv-rc-bootsplash/trunk: . debian
debian/po
Free Ekanayaka
free-guest at alioth.debian.org
Sat Jan 6 10:31:56 CET 2007
Author: free-guest
Date: 2007-01-06 10:31:56 +0100 (Sat, 06 Jan 2007)
New Revision: 991
Added:
sysv-rc-bootsplash/trunk/debian/po/cs-utf8.po
sysv-rc-bootsplash/trunk/debian/po/de.po
sysv-rc-bootsplash/trunk/debian/po/fr.po
Modified:
sysv-rc-bootsplash/trunk/debian/changelog
sysv-rc-bootsplash/trunk/debian/control
sysv-rc-bootsplash/trunk/debian/prerm
sysv-rc-bootsplash/trunk/rc.bootsplash
sysv-rc-bootsplash/trunk/rc.sysv-rc
Log:
releasing version 1.0.5-1
Modified: sysv-rc-bootsplash/trunk/debian/changelog
===================================================================
--- sysv-rc-bootsplash/trunk/debian/changelog 2007-01-06 09:31:36 UTC (rev 990)
+++ sysv-rc-bootsplash/trunk/debian/changelog 2007-01-06 09:31:56 UTC (rev 991)
@@ -1,3 +1,26 @@
+sysv-rc-bootsplash (1.0.5-1) unstable; urgency=low
+
+ * New upstream. The patches now work with sysv-rc version 2.86.ds1-36,
+ thanks to Pablo Chinea
+ * Bug fix: "sysv-rc-bootsplash: fails to install or remove", thanks to
+ David Broome and (Closes: #402259).
+ * Bug fix: "sysv-rc-bootsplash: Bashisms in prerm script make removal
+ fail if /bin/sh is dash", thanks to Christian Perrier (Closes:
+ #390423).
+ * Bug fix: "Failed to patch rc script", thanks to Stromek (Closes:
+ #390490).
+ * Bug fix: "sysv-rc-bootsplash: [INTL:fr] French debconf templates
+ translation", thanks to Steve (Closes: #391283).
+ * Bug fix: "sysv-rc-bootsplash: [INTL:de] Initial German debconf
+ translation", thanks to Helge Kreutzmann (Closes: #396624).
+ * Bug fix: "[l10n] Updated Czech translation for sysv-rc-bootsplash
+ debconf", thanks to Jakub Kasparec (Closes: #396719).
+ * Depends on the particular version of sysv-rc the patch works with,
+ this should avoid problems when trying to use this package with
+ another version of sysv-rc
+
+ -- Free Ekanayaka <freee at debian.org> Tue, 2 Jan 2007 11:17:04 +0100
+
sysv-rc-bootsplash (1.0.4-1) unstable; urgency=low
* Bug fix: "sysv-rc-bootsplash: misbehaviour of the progress bar during
Modified: sysv-rc-bootsplash/trunk/debian/control
===================================================================
--- sysv-rc-bootsplash/trunk/debian/control 2007-01-06 09:31:36 UTC (rev 990)
+++ sysv-rc-bootsplash/trunk/debian/control 2007-01-06 09:31:56 UTC (rev 991)
@@ -2,12 +2,13 @@
Section: base
Priority: optional
Maintainer: Free Ekanayaka <freee at debian.org>
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 4.0.0), po-debconf
Standards-Version: 3.7.2
Package: sysv-rc-bootsplash
Architecture: all
-Depends: sysv-rc (>= 2.86.ds1-20), patch, ${misc:Depends}, po-debconf, bootsplash (>= 3.2)
+Pre-Depends: bootsplash (>= 3.3-3)
+Depends: sysv-rc (= 2.86.ds1-36), patch, ${misc:Depends}
Conflicts: sysv-rc-fbsplash
Description: Bootsplash patches for rc files
This package provides support bootsplash (progress bars, animations,
Added: sysv-rc-bootsplash/trunk/debian/po/cs-utf8.po
===================================================================
--- sysv-rc-bootsplash/trunk/debian/po/cs-utf8.po 2007-01-06 09:31:36 UTC (rev 990)
+++ sysv-rc-bootsplash/trunk/debian/po/cs-utf8.po 2007-01-06 09:31:56 UTC (rev 991)
@@ -0,0 +1,89 @@
+# translation of sysv-rc-bootsplash_1.0.4-1_cs-utf8.po to czech
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Jakub Kasparec <mr.k at centrum.cz>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: sysv-rc-bootsplash_1.0.4-1_cs-utf8\n"
+"Report-Msgid-Bugs-To: freee at debian.org\n"
+"POT-Creation-Date: 2006-09-23 07:57+0200\n"
+"PO-Revision-Date: 2006-11-01 22:26+0100\n"
+"Last-Translator: Jakub Kasparec <mr.k at centrum.cz>\n"
+"Language-Team: czech <debian-l10n-czech at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:4
+msgid "Should bootsplash patch your start up scripts?"
+msgstr "Může bootsplash upravit vaše startovacà skripty?"
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:4
+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 ""
+"Aby mohl pracovat správně, musà bootsplash pozměnit (záplatovat) vaše "
+"soubory /etc/init.d/rc a /etc/init.d/rcS. PÅ™i odstraňovánà tohoto balÃku "
+"budou odstraněny také záplaty. Pokud z jakéhokoli důvodu nedojde k "
+"odstranÄ›nà záplat pÅ™i odstraňovánà tohoto balÃku, spusÅ¥te 'apt-get install --"
+"reinstall sysv-rc' k obnovenà původnÃch startovacÃch skriptů, nebo "
+"přejmenujte soubory rc.orig a rcS.orig v adresáři /etc/init.d/."
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:4
+msgid ""
+"If you do not patch your start up scripts progress bars and animations will "
+"not work."
+msgstr ""
+"Jestliže nezazáplatujete své startovacà skripty, ukazatele a animace nebudou "
+"fungovat."
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:18
+msgid "Patching your rc and rcS files has failed"
+msgstr "Záplatovánà souborů rc a rcS selhalo"
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:18
+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 ""
+"Bootsplash nebyl schopen záplatovat vaše soubory /etc/init.d/rc a /etc/init."
+"d/rcS. K obnovenà původnÃch skriptů rc/S prosÃm spusÅ¥te 'apt-get install --"
+"reinstall sysv-rc' a poté dokonÄete instalaci pÅ™Ãkazem 'dpkg --pending --"
+"configure'."
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:25
+msgid "Un-patching your rc and rcS files has failed"
+msgstr "Odstraněnà záplat ze souborů rc a rcS selhalo"
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:25
+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 ""
+"Bootsplash nemohl odebrat záplaty z vašich souborů /etc/init.d/rc a /etc/"
+"init.d/rcS. Pro nahrazenà původnÃch rc skriptů po odebránà tohoto balÃku "
+"prosÃm spusÅ¥te 'apt-get install --reinstall sysv-rc'."
Added: sysv-rc-bootsplash/trunk/debian/po/de.po
===================================================================
--- sysv-rc-bootsplash/trunk/debian/po/de.po 2007-01-06 09:31:36 UTC (rev 990)
+++ sysv-rc-bootsplash/trunk/debian/po/de.po 2007-01-06 09:31:56 UTC (rev 991)
@@ -0,0 +1,90 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the sysv-rc-bootsplash package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: freee at debian.org\n"
+"POT-Creation-Date: 2006-09-23 07:57+0200\n"
+"PO-Revision-Date: 2006-11-01 21:02+0100\n"
+"Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
+"Language-Team: de <debian-l10n-german at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:4
+msgid "Should bootsplash patch your start up scripts?"
+msgstr "Soll Bootsplash Ihre Startup-Skripte patchen?"
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:4
+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 ""
+"Um korrekt zu funktionieren, muss Bootsplash Ihre /etc/init.d/rc und /etc/"
+"init.d/rcS-Dateien patchen. Bei der Entfernung dieses Pakets werden die "
+"Patches entfernt. Falls aus irgend einem Grund die Patches bei der "
+"Entfernung des Paketes nicht rückgängig gemacht werden, führen Sie einfach "
+"»apt-get install --reinstall sysv-rc« aus, um Ihre Startup-Skripte wieder "
+"herzustellen oder benennen Sie die rc.orig- und rcS.orig-Dateien in Ihrem /"
+"etc/init.d/-Verzeichnis um."
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:4
+msgid ""
+"If you do not patch your start up scripts progress bars and animations will "
+"not work."
+msgstr ""
+"Falls Sie Ihre Startup-Skripte nicht patchen, werden die Fortschrittsbalken "
+"und Animationen nicht funktionieren."
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:18
+msgid "Patching your rc and rcS files has failed"
+msgstr "Das Patchen Ihrer rc- und rcS-Dateien ist fehlgeschlagen"
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:18
+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 ""
+"Bootsplash war nicht in der Lage, Ihre /etc/init.d/rc- und /etc/init.d/rcS-"
+"Dateien zu patchen, bitte führen Sie »apt-get install --reinstall sysv-rc« "
+"aus, um Ihre Original-rc/S-Skripte wieder herzustellen und führen Sie dann "
+"»dpkg --pending --configure« aus, um diese Installation fertigzustellen."
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:25
+msgid "Un-patching your rc and rcS files has failed"
+msgstr "Ent-Patchen Ihrer rc- und rcS-Dateien ist fehlgeschlagen"
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:25
+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 ""
+"Bootsplash war nicht in der Lage, Ihre /etc/init.d/rc- und /etc/init.d/rcS-"
+"Dateien zu entpatchen, bitte führen Sie »apt-get install --reinstall sysv-"
+"rc« aus, um die Original-rc-Skripte nach der Entfernung dieses Pakets zu "
+"ersetzen."
Added: sysv-rc-bootsplash/trunk/debian/po/fr.po
===================================================================
--- sysv-rc-bootsplash/trunk/debian/po/fr.po 2007-01-06 09:31:36 UTC (rev 990)
+++ sysv-rc-bootsplash/trunk/debian/po/fr.po 2007-01-06 09:31:56 UTC (rev 991)
@@ -0,0 +1,114 @@
+# sysv-rc-bootsplash package.
+# Copyright (C) 2006
+# This file is distributed under the same license as the sysv-rc-bootsplash package.
+# Free Ekanayaka <freee at debian.org>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sysv-rc-bootsplash_1.0.3-1\n"
+"Report-Msgid-Bugs-To: freee at debian.org\n"
+"POT-Creation-Date: 2006-09-23 07:57+0200\n"
+"PO-Revision-Date: 2006-09-22 10:26+0100\n"
+"Last-Translator: Steve Petruzzello <dlist at bluewin.ch>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: SWITZERLAND\n"
+"X-Poedit-SourceCharset: iso-8859-15\n"
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:4
+msgid "Should bootsplash patch your start up scripts?"
+msgstr "Bootsplash doit-il modifier vos scripts de démarrage ?"
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:4
+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 ""
+"Afin de fonctionner correctement, bootsplash doit modifier les fichiers /etc/"
+"init.d/rc et /etc/init.d/rcS. Ces modifications seront supprimées à la "
+"suppression du paquet. Si pour une raison ou une autre, celles-ci ne sont "
+"pas supprimées, veuillez exécuter « apt-get install --reinstall sysv-rc » "
+"afin de restaurer les scripts de démarrage ou renommez les fichiers rc.orig "
+"et rcS.orig dans le répertoire /etc/init.d. "
+
+#. Type: boolean
+#. Description
+#: ../sysv-rc-bootsplash.templates:4
+msgid ""
+"If you do not patch your start up scripts progress bars and animations will "
+"not work."
+msgstr ""
+"Si vous ne corrigez pas vos scripts de démarrage, la barre de progression "
+"ainsi que les animations ne fonctionneront pas."
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:18
+msgid "Patching your rc and rcS files has failed"
+msgstr "Échec de la modification des fichiers de démarrage rc et rcS"
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:18
+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 ""
+"Bootsplash n'a pas réussi à modifier les fichiers /etc/init.d/rc et /etc/"
+"init.d/rcS ; veuillez exécuter la commande « apt-get install --reinstall "
+"sysv-rc » afin de restaurer les scripts rc/rcS d'origine et exécutez ensuite "
+"la commande « dpkg --pending --configure » afin de terminer l'installation."
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:25
+msgid "Un-patching your rc and rcS files has failed"
+msgstr "Échec de la modification des fichiers de démarrage rc et rcS"
+
+#. Type: note
+#. Description
+#: ../sysv-rc-bootsplash.templates:25
+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 ""
+"La modification des fichiers /etc/init.d/rc et /etc/init.d/rcS par "
+"Bootsplash a échoué. Veuillez exécuter la commande « apt-get install --"
+"reinstall sysv-rc » afin de restaurer les fichiers d'origine après la "
+"suppression de ce paquet."
+
+#~ msgid "The system rc and functions files have to be patched"
+#~ msgstr ""
+#~ "Modifications nécessaires sur les fichiers de démarrage et les "
+#~ "bibliothèques de fonctions"
+
+#~ 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 ""
+#~ "Les fichiers /etc/init.d/rc et /etc/init.d/rcS doivent être modifiés pour "
+#~ "fonctionner correctement avec bootsplash. Évitez de les modifier plus "
+#~ "tard car sinon, à la suppression du paquet, ils ne seront pas restaurés à "
+#~ "l'original. Si vous avez déjà modifié ces fichiers et que la modification "
+#~ "échoue, vous en serez informé et les fichiers ne seront pas modifiés."
+
+#~ msgid "You should also install the bootsplash package with this one."
+#~ msgstr "Installation nécessaire du paquet bootsplash"
Modified: sysv-rc-bootsplash/trunk/debian/prerm
===================================================================
--- sysv-rc-bootsplash/trunk/debian/prerm 2007-01-06 09:31:36 UTC (rev 990)
+++ sysv-rc-bootsplash/trunk/debian/prerm 2007-01-06 09:31:56 UTC (rev 991)
@@ -16,14 +16,13 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-function print_error {
+print_error () {
echo "Patches would not removed cleanly."
- db_input high sysv-rc-bootsplash/failed-removal || true
- db_go
+ exit 1;
}
case "$1" in
- remove|upgrade|deconfigure)
+ remove|deconfigure)
db_get sysv-rc-bootsplash/should-patch
SHOULD_PATCH="$RET"
@@ -33,18 +32,24 @@
# attempt to un-patch the rc and rcS files, if we fail
# notify the user and report the error.
echo "Testing if patches remove cleanly..."
- patch /etc/init.d/rc --dry-run -Rfs /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch || print_error
+ if patch /etc/init.d/rc --dry-run -Rfs /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch; then
+ # unapply the patches
+ echo "Patches remove cleanly, un-patching files..."
+ patch /etc/init.d/rc -Rfs /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch
+ else
+ print_error
+ fi
- # unapply the patches
- echo "Patches remove cleanly, un-patching files..."
- patch /etc/init.d/rc -R /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch
-
else
echo "Not unpatching start up files..."
fi
+
db_stop
;;
+ upgrade)
+ ;;
+
failed-upgrade)
;;
Modified: sysv-rc-bootsplash/trunk/rc.bootsplash
===================================================================
--- sysv-rc-bootsplash/trunk/rc.bootsplash 2007-01-06 09:31:36 UTC (rev 990)
+++ sysv-rc-bootsplash/trunk/rc.bootsplash 2007-01-06 09:31:56 UTC (rev 991)
@@ -13,11 +13,11 @@
# Miquel van Smoorenburg <miquels at cistron.nl>
# Bruce Perens <Bruce at Pixar.com>
# Edited for bootsplash by Pablo Chinea <khertz at gmail.com>, 2006
-# Edited by Varun Hiremath <varunhiremath at gmail.com>, 2006
-# corrected misbehaviour of the progress bar during the shutdown sequence
+# Edited by Varun Hiremath <varunhiremath at gmail.com>, 2006
+# corrected misbehaviour of the progress bar during the shutdown sequence
#
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
export PATH
# Un-comment the following for debugging.
@@ -248,7 +248,7 @@
num_steps=0
for s in /etc/rc$runlevel.d/[SK]*; do
case "${s##/etc/rc$runlevel.d/S??}" in
- gdm|xdm|kdm|reboot|halt)
+ gdm|xdm|kdm|ltsp-client|reboot|halt)
break
;;
esac
Modified: sysv-rc-bootsplash/trunk/rc.sysv-rc
===================================================================
--- sysv-rc-bootsplash/trunk/rc.sysv-rc 2007-01-06 09:31:36 UTC (rev 990)
+++ sysv-rc-bootsplash/trunk/rc.sysv-rc 2007-01-06 09:31:56 UTC (rev 991)
@@ -13,7 +13,7 @@
# Miquel van Smoorenburg <miquels at cistron.nl>
# Bruce Perens <Bruce at Pixar.com>
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
export PATH
# Un-comment the following for debugging.
@@ -79,7 +79,7 @@
if [ "$SPLASH" = true ] ; then
step=$(($step + $step_change))
progress=$(($step * $progress_size / $num_steps + $first_step))
- usplash_write "PROGRESS $progress" || true
+ $debug usplash_write "PROGRESS $progress" || true
fi
}
@@ -231,7 +231,7 @@
num_steps=0
for s in /etc/rc$runlevel.d/[SK]*; do
case "${s##/etc/rc$runlevel.d/S??}" in
- gdm|xdm|kdm|reboot|halt)
+ gdm|xdm|kdm|ltsp-client|reboot|halt)
break
;;
esac
@@ -283,7 +283,6 @@
# Now run the START scripts for this runlevel.
# Run all scripts with the same level in parallel
CURLEVEL=""
- step=0
for s in /etc/rc$runlevel.d/S*
do
level=$(echo $s | sed 's/.*\/S\([0-9][0-9]\).*/\1/')
More information about the Demudi-commits
mailing list