summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Debian/Debhelper/Dh_Getopt.pm1
-rw-r--r--autoscripts/postinst-init-restart13
-rw-r--r--debian/changelog5
-rwxr-xr-xdh_installinit31
-rw-r--r--doc/TODO3
-rw-r--r--man/po4a/po/debhelper.pot93
-rw-r--r--man/po4a/po/es.po125
-rw-r--r--man/po4a/po/fr.po125
8 files changed, 253 insertions, 143 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 77e4a72..f8e0288 100644
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -123,6 +123,7 @@ sub parseopts {
"r" => \$options{R_FLAG},
"no-restart-on-upgrade" => \$options{R_FLAG},
"no-start" => \$options{NO_START},
+ "R|restart-after-upgrade" => \$options{RESTART_AFTER_UPGRADE},
"k" => \$options{K_FLAG},
"keep" => \$options{K_FLAG},
diff --git a/autoscripts/postinst-init-restart b/autoscripts/postinst-init-restart
new file mode 100644
index 0000000..ba4b3a0
--- /dev/null
+++ b/autoscripts/postinst-init-restart
@@ -0,0 +1,13 @@
+if [ -x "/etc/init.d/#SCRIPT#" ]; then
+ update-rc.d #SCRIPT# #INITPARMS# >/dev/null
+ if [ -n "$2" ]; then
+ _dh_action=restart
+ else
+ _dh_action=start
+ fi
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ invoke-rc.d #SCRIPT# $_dh_action || #ERROR_HANDLER#
+ else
+ /etc/init.d/#SCRIPT# $_dh_action || #ERROR_HANDLER#
+ fi
+fi
diff --git a/debian/changelog b/debian/changelog
index 5fd4dc9..a955eb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
debhelper (7.0.9) UNRELEASED; urgency=low
* rules.tiny: Typo fix. Closes: #479647
+ * dh_installinit: Add --restart-after-upgrade, which avoids stopping a
+ daemon in the prerm, and instead restarts it in the postinst, keeping
+ its downtime minimal. Since some daemons could break if files are upgraded
+ while they're running, it's not the default. It might become the default
+ in a future (v8) compatability level. Closes: #471060
-- Joey Hess <joeyh@debian.org> Mon, 05 May 2008 18:53:10 -0400
diff --git a/dh_installinit b/dh_installinit
index 248d517..7dde363 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib;
=head1 SYNOPSIS
-B<dh_installinit> [S<I<debhelper options>>] [B<--name=>I<name>] [B<-n>] [B<-r>] [B<-d>] [S<B<--> I<params>>]
+B<dh_installinit> [S<I<debhelper options>>] [B<--name=>I<name>] [B<-n>] [B<-R>] [B<-r>] [B<-d>] [S<B<--> I<params>>]
=head1 DESCRIPTION
@@ -45,9 +45,20 @@ script or default files. May be useful if the init script is shipped and/or
installed by upstream in a way that doesn't make it easy to let
dh_installinit find it.
+=item B<-R>, B<--restart-after-upgrade>
+
+Do not stop the init script until after the package upgrade has been
+completed. This is different than the default behavior, which stops the
+script in the prerm, and starts it again in the postinst.
+
+This can be useful for daemons that should not have a possibly long
+downtime during upgrade. But you should make sure that the daemon will not
+get confused by the package being upgraded while it's running before using
+this option.
+
=item B<-r>, B<--no-restart-on-upgrade>
-Do not restart init script on upgrade.
+Do not stop init script on upgrade.
=item B<--no-start>
@@ -166,11 +177,19 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (! $dh{NOSCRIPTS}) {
if (! $dh{NO_START}) {
- # update-rc.d, and start script
- autoscript($package,"postinst", "postinst-init",
- "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+ if ($dh{RESTART_AFTER_UPGRADE}) {
+ # update-rc.d, and restart (or
+ # start if new install) script
+ autoscript($package,"postinst", "postinst-init-restart",
+ "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+ }
+ else {
+ # update-rc.d, and start script
+ autoscript($package,"postinst", "postinst-init",
+ "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+ }
- if ($dh{R_FLAG}) {
+ if ($dh{R_FLAG} || $dh{RESTART_AFTER_UPGRADE}) {
# stops script only on remove
autoscript($package,"prerm","prerm-init-norestart",
"s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
diff --git a/doc/TODO b/doc/TODO
index 17d7a18..84c0513 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -30,10 +30,11 @@ Wishlist items:
This needs more thought.
-v7:
+v9:
* escaping in config files (for whitespace)?
* make dh_install use hard links for efficiency
+* dh_installinit --restart-after-upgrade as default?
Deprecated:
diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index e04db4a..9541cbb 100644
--- a/man/po4a/po/debhelper.pot
+++ b/man/po4a/po/debhelper.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-04-30 02:17-0400\n"
+"POT-Creation-Date: 2008-05-07 16:32-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -344,7 +344,7 @@ msgid ""
msgstr ""
# type: =head1
-#: debhelper.pod:168 dh_installcatalogs:54 dh_installdocs:87 dh_installemacsen:54 dh_installexamples:50 dh_installinfo:57 dh_installinit:99 dh_installman:79 dh_installmime:41 dh_installmodules:56 dh_installwm:53 dh_installxfonts:37 dh_movefiles:58 dh_scrollkeeper:42 dh_strip:68 dh_usrlocal:49
+#: debhelper.pod:168 dh_installcatalogs:52 dh_installdocs:87 dh_installemacsen:54 dh_installexamples:50 dh_installinfo:57 dh_installinit:110 dh_installman:79 dh_installmime:41 dh_installmodules:56 dh_installwm:53 dh_installxfonts:37 dh_movefiles:58 dh_scrollkeeper:42 dh_strip:68 dh_usrlocal:49
msgid "NOTES"
msgstr ""
@@ -897,7 +897,7 @@ msgid ""
msgstr ""
# type: =head1
-#: debhelper.pod:503 dh_builddeb:85 dh_clean:129 dh_compress:189 dh_desktop:47 dh_fixperms:110 dh_gconf:92 dh_gencontrol:73 dh_installcatalogs:111 dh_installchangelogs:140 dh_installcron:61 dh_installdebconf:118 dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:109 dh_installexamples:103 dh_installinfo:103 dh_installinit:197 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:249 dh_installmenu:80 dh_installmime:85 dh_installmodules:116 dh_installpam:52 dh_install:268 dh_installppp:56 dh_installwm:107 dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:222 dh_md5sums:86 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:159 dh_strip:224 dh_suidregister:117 dh_testdir:43 dh_testroot:26 dh_testversion:74 dh_undocumented:28 dh_usrlocal:114
+#: debhelper.pod:503 dh_builddeb:85 dh_clean:129 dh_compress:189 dh_desktop:47 dh_fixperms:110 dh_gconf:92 dh_gencontrol:73 dh_installcatalogs:109 dh_installchangelogs:140 dh_installcron:61 dh_installdebconf:118 dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:109 dh_installexamples:103 dh_installinfo:103 dh_installinit:216 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:249 dh_installmenu:80 dh_installmime:85 dh_installmodules:116 dh_installpam:52 dh_install:268 dh_installppp:56 dh_installwm:107 dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:222 dh_md5sums:86 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:159 dh_strip:224 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
msgid "SEE ALSO"
msgstr ""
@@ -922,12 +922,12 @@ msgid "Debhelper web site."
msgstr ""
# type: =head1
-#: debhelper.pod:517 dh_builddeb:91 dh_clean:135 dh_compress:195 dh_desktop:53 dh_fixperms:116 dh_gconf:98 dh_gencontrol:79 dh_installcatalogs:117 dh_installchangelogs:146 dh_installcron:67 dh_installdebconf:124 dh_installdeb:100 dh_installdirs:89 dh_installdocs:243 dh_installemacsen:115 dh_installexamples:109 dh_installinfo:109 dh_installinit:203 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:255 dh_installmenu:88 dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:274 dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229 dh_listpackages:35 dh_makeshlibs:228 dh_md5sums:92 dh_movefiles:168 dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:165 dh_strip:230 dh_suidregister:123 dh_testdir:49 dh_testroot:32 dh_testversion:80 dh_undocumented:34 dh_usrlocal:120
+#: debhelper.pod:517 dh_builddeb:91 dh_clean:135 dh_compress:195 dh_desktop:53 dh_fixperms:116 dh_gconf:98 dh_gencontrol:79 dh_installcatalogs:115 dh_installchangelogs:146 dh_installcron:67 dh_installdebconf:124 dh_installdeb:100 dh_installdirs:89 dh_installdocs:243 dh_installemacsen:115 dh_installexamples:109 dh_installinfo:109 dh_installinit:222 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:255 dh_installmenu:88 dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:274 dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229 dh_listpackages:35 dh_makeshlibs:228 dh_md5sums:92 dh_movefiles:168 dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:165 dh_strip:230 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81 dh_undocumented:34 dh_usrlocal:120
msgid "AUTHOR"
msgstr ""
# type: textblock
-#: debhelper.pod:519 dh_builddeb:93 dh_clean:137 dh_compress:197 dh_fixperms:118 dh_gencontrol:81 dh_installchangelogs:148 dh_installcron:69 dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 dh_installdocs:245 dh_installemacsen:117 dh_installexamples:111 dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:257 dh_installmenu:90 dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:276 dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231 dh_listpackages:37 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170 dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:51 dh_testroot:34 dh_testversion:82 dh_undocumented:36
+#: debhelper.pod:519 dh_builddeb:93 dh_clean:137 dh_compress:197 dh_fixperms:118 dh_gencontrol:81 dh_installchangelogs:148 dh_installcron:69 dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 dh_installdocs:245 dh_installemacsen:117 dh_installexamples:111 dh_installinfo:111 dh_installinit:224 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:257 dh_installmenu:90 dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:276 dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231 dh_listpackages:37 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170 dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_testversion:83 dh_undocumented:36
msgid "Joey Hess <joeyh@debian.org>"
msgstr ""
@@ -951,7 +951,7 @@ msgid ""
msgstr ""
# type: =head1
-#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:34 dh_gencontrol:26 dh_installcatalogs:44 dh_installchangelogs:44 dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:51 dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40 dh_installman:58 dh_installmenu:34 dh_installmime:31 dh_installmodules:39 dh_installpam:24 dh_install:47 dh_installppp:26 dh_installwm:32 dh_link:48 dh_makeshlibs:28 dh_md5sums:28 dh_movefiles:32 dh_perl:31 dh_python:39 dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39
+#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:34 dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44 dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:51 dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40 dh_installman:58 dh_installmenu:34 dh_installmime:31 dh_installmodules:39 dh_installpam:24 dh_install:47 dh_installppp:26 dh_installwm:32 dh_link:48 dh_makeshlibs:28 dh_md5sums:28 dh_movefiles:32 dh_perl:31 dh_python:39 dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39
msgid "OPTIONS"
msgstr ""
@@ -985,7 +985,7 @@ msgid "B<-u>I<params>"
msgstr ""
# type: =item
-#: dh_builddeb:37 dh_gencontrol:32 dh_installdebconf:58 dh_installinit:67 dh_makeshlibs:76 dh_shlibdeps:32
+#: dh_builddeb:37 dh_gencontrol:32 dh_installdebconf:58 dh_installinit:78 dh_makeshlibs:76 dh_shlibdeps:32
msgid "B<--> I<params>"
msgstr ""
@@ -995,12 +995,12 @@ msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
msgstr ""
# type: textblock
-#: dh_builddeb:87 dh_clean:131 dh_compress:191 dh_fixperms:112 dh_gconf:94 dh_gencontrol:75 dh_installcatalogs:113 dh_installchangelogs:142 dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 dh_installdocs:239 dh_installemacsen:111 dh_installexamples:105 dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:251 dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:270 dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225 dh_listpackages:31 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164 dh_perl:154 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:45 dh_testroot:28 dh_testversion:76 dh_undocumented:30 dh_usrlocal:116
+#: dh_builddeb:87 dh_clean:131 dh_compress:191 dh_fixperms:112 dh_gconf:94 dh_gencontrol:75 dh_installcatalogs:111 dh_installchangelogs:142 dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 dh_installdocs:239 dh_installemacsen:111 dh_installexamples:105 dh_installinfo:105 dh_installinit:218 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:251 dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:270 dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225 dh_listpackages:31 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164 dh_perl:154 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
msgid "L<debhelper(7)>"
msgstr ""
# type: textblock
-#: dh_builddeb:89 dh_clean:133 dh_compress:193 dh_desktop:51 dh_fixperms:114 dh_gconf:96 dh_gencontrol:77 dh_installchangelogs:144 dh_installcron:65 dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241 dh_installemacsen:113 dh_installexamples:107 dh_installinfo:107 dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:253 dh_installmenu:86 dh_installmime:89 dh_installmodules:120 dh_installpam:56 dh_install:272 dh_installppp:60 dh_installwm:111 dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:226 dh_md5sums:90 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:163 dh_strip:228 dh_suidregister:121 dh_testdir:47 dh_testroot:30 dh_testversion:78 dh_undocumented:32 dh_usrlocal:118
+#: dh_builddeb:89 dh_clean:133 dh_compress:193 dh_desktop:51 dh_fixperms:114 dh_gconf:96 dh_gencontrol:77 dh_installchangelogs:144 dh_installcron:65 dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241 dh_installemacsen:113 dh_installexamples:107 dh_installinfo:107 dh_installinit:220 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:253 dh_installmenu:86 dh_installmime:89 dh_installmodules:120 dh_installpam:56 dh_install:272 dh_installppp:60 dh_installwm:111 dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:226 dh_md5sums:90 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:163 dh_strip:228 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
msgid "This program is a part of debhelper."
msgstr ""
@@ -1365,12 +1365,11 @@ msgstr ""
#: dh_installcatalogs:20
msgid ""
"dh_installcatalogs is a debhelper program that installs and registers SGML "
-"catalogs. (Note: it will be extended for XML catalog registration when "
-"xml-core is available.) It complies with the Debian XML/SGML policy."
+"catalogs. It complies with the Debian XML/SGML policy."
msgstr ""
# type: textblock
-#: dh_installcatalogs:25
+#: dh_installcatalogs:23
msgid ""
"The file F<debian/I<package>.sgmlcatalogs> contains the catalogs to be "
"installed per package. Each line in that file should be of the form "
@@ -1381,14 +1380,14 @@ msgid ""
msgstr ""
# type: textblock
-#: dh_installcatalogs:32
+#: dh_installcatalogs:30
msgid ""
"Catalogs will be registered in a supercatalog, in "
"F</etc/sgml/I<package>.cat>."
msgstr ""
# type: textblock
-#: dh_installcatalogs:35
+#: dh_installcatalogs:33
msgid ""
"This command automatically adds maintainer script snippets for registering "
"and unregistering the catalogs and \"supercatalogs\" (unless B<-n> is "
@@ -1398,24 +1397,24 @@ msgid ""
msgstr ""
# type: textblock
-#: dh_installcatalogs:41
+#: dh_installcatalogs:39
msgid ""
"A dependency on B<sgml-base> will be added to C<${misc:Depends}>, so be sure "
"your package uses that variable in F<debian/control>."
msgstr ""
# type: =item
-#: dh_installcatalogs:48 dh_installdebconf:54 dh_installdocs:60 dh_installemacsen:39 dh_installinfo:46 dh_installinit:37 dh_installmenu:38 dh_installmime:35 dh_installmodules:43 dh_installwm:42 dh_makeshlibs:62 dh_python:60 dh_scrollkeeper:36 dh_usrlocal:43
+#: dh_installcatalogs:46 dh_installdebconf:54 dh_installdocs:60 dh_installemacsen:39 dh_installinfo:46 dh_installinit:37 dh_installmenu:38 dh_installmime:35 dh_installmodules:43 dh_installwm:42 dh_makeshlibs:62 dh_python:60 dh_scrollkeeper:36 dh_usrlocal:43
msgid "B<-n>, B<--noscripts>"
msgstr ""
# type: textblock
-#: dh_installcatalogs:50
+#: dh_installcatalogs:48
msgid "Do not modify F<postinst>/F<postrm>/F<prerm> scripts."
msgstr ""
# type: textblock
-#: dh_installcatalogs:56 dh_installdocs:93 dh_installemacsen:56 dh_installinfo:59 dh_installinit:101 dh_installmime:43 dh_installmodules:58 dh_installwm:55 dh_scrollkeeper:44 dh_usrlocal:51
+#: dh_installcatalogs:54 dh_installdocs:93 dh_installemacsen:56 dh_installinfo:59 dh_installinit:112 dh_installmime:43 dh_installmodules:58 dh_installwm:55 dh_scrollkeeper:44 dh_usrlocal:51
msgid ""
"Note that this command is not idempotent. L<dh_prep(1)> should be called "
"between invocations of this command. Otherwise, it may cause multiple "
@@ -1423,12 +1422,12 @@ msgid ""
msgstr ""
# type: textblock
-#: dh_installcatalogs:115
+#: dh_installcatalogs:113
msgid "F</usr/share/doc/sgml-base-doc/>"
msgstr ""
# type: textblock
-#: dh_installcatalogs:119
+#: dh_installcatalogs:117
msgid "Adam Di Carlo <aph@debian.org>"
msgstr ""
@@ -1529,7 +1528,7 @@ msgid ""
msgstr ""
# type: =item
-#: dh_installcron:28 dh_installinit:72 dh_installlogrotate:26 dh_installmodules:47 dh_installpam:28 dh_installppp:30
+#: dh_installcron:28 dh_installinit:83 dh_installlogrotate:26 dh_installmodules:47 dh_installpam:28 dh_installppp:30
msgid "B<--name=>I<name>"
msgstr ""
@@ -2047,7 +2046,7 @@ msgstr ""
#: dh_installinit:14
msgid ""
"B<dh_installinit> [S<I<debhelper options>>] [B<--name=>I<name>] [B<-n>] "
-"[B<-r>] [B<-d>] [S<B<--> I<params>>]"
+"[B<-R>] [B<-r>] [B<-d>] [S<B<--> I<params>>]"
msgstr ""
# type: textblock
@@ -2102,33 +2101,55 @@ msgstr ""
# type: =item
#: dh_installinit:48
-msgid "B<-r>, B<--no-restart-on-upgrade>"
+msgid "B<-R>, B<--restart-after-upgrade>"
msgstr ""
# type: textblock
#: dh_installinit:50
-msgid "Do not restart init script on upgrade."
+msgid ""
+"Do not stop the init script until after the package upgrade has been "
+"completed. This is different than the default behavior, which stops the "
+"script in the prerm, and starts it again in the postinst."
+msgstr ""
+
+# type: textblock
+#: dh_installinit:54
+msgid ""
+"This can be useful for daemons that should not have a possibly long downtime "
+"during upgrade. But you should make sure that the daemon will not get "
+"confused by the package being upgraded while it's running before using this "
+"option."
msgstr ""
# type: =item
-#: dh_installinit:52
+#: dh_installinit:59
+msgid "B<-r>, B<--no-restart-on-upgrade>"
+msgstr ""
+
+# type: textblock
+#: dh_installinit:61
+msgid "Do not stop init script on upgrade."
+msgstr ""
+
+# type: =item
+#: dh_installinit:63
msgid "B<--no-start>"
msgstr ""
# type: textblock
-#: dh_installinit:54
+#: dh_installinit:65
msgid ""
"Do not start the init script on install or upgrade, or stop it on removal. "
"Only call update-rc.d. Useful for rcS scripts."
msgstr ""
# type: =item
-#: dh_installinit:57
+#: dh_installinit:68
msgid "B<-d>, B<--remove-d>"
msgstr ""
# type: textblock
-#: dh_installinit:59
+#: dh_installinit:70
msgid ""
"Remove trailing \"d\" from the name of the package, and use the result for "
"the filename the init script is installed as in etc/init.d/ , and the "
@@ -2138,19 +2159,19 @@ msgid ""
msgstr ""
# type: =item
-#: dh_installinit:65
+#: dh_installinit:76
msgid "B<-u>I<params> B<--update-rcd-params=>I<params>"
msgstr ""
# type: textblock
-#: dh_installinit:69
+#: dh_installinit:80
msgid ""
"Pass \"params\" to L<update-rc.d(8)>. If not specified, \"defaults\" will be "
"passed to L<update-rc.d(8)>."
msgstr ""
# type: textblock
-#: dh_installinit:74
+#: dh_installinit:85
msgid ""
"Install the init script (and default file) using the filename I<name> "
"instead of the default filename, which is the package name. When this "
@@ -2160,12 +2181,12 @@ msgid ""
msgstr ""
# type: =item
-#: dh_installinit:80
+#: dh_installinit:91
msgid "B<--init-script=>I<scriptname>"
msgstr ""
# type: textblock
-#: dh_installinit:82
+#: dh_installinit:93
msgid ""
"Use \"scriptname\" as the filename the init script is installed as in "
"etc/init.d/ (and also use it as the filename for the defaults file, if it is "
@@ -2176,17 +2197,17 @@ msgid ""
msgstr ""
# type: textblock
-#: dh_installinit:89
+#: dh_installinit:100
msgid "This parameter is deprecated, use the --name parameter instead."
msgstr ""
# type: =item
-#: dh_installinit:91
+#: dh_installinit:102
msgid "B<--error-handler=>I<function>"
msgstr ""
# type: textblock
-#: dh_installinit:93
+#: dh_installinit:104
msgid ""
"Call the named shell function if running the init script fails. The function "
"should be provided in the prerm and postinst scripts, before the #DEBHELPER# "
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index 4244835..d2960b4 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-04-30 02:17-0400\n"
+"POT-Creation-Date: 2008-05-07 16:32-0400\n"
"PO-Revision-Date: 2005-09-18 00:11+0200\n"
"Last-Translator: Rubén Porras Campo <debian-l10n-spanish@lists.debian.org>\n"
"Language-Team: SPANISH <debian-l10n-spanish@lists.debian.org>\n"
@@ -467,9 +467,9 @@ msgstr ""
"tengan efecto en TODOS los paquetes sobre los que actúa, no sólo el primero."
# type: =head1
-#: debhelper.pod:168 dh_installcatalogs:54 dh_installdocs:87
+#: debhelper.pod:168 dh_installcatalogs:52 dh_installdocs:87
#: dh_installemacsen:54 dh_installexamples:50 dh_installinfo:57
-#: dh_installinit:99 dh_installman:79 dh_installmime:41 dh_installmodules:56
+#: dh_installinit:110 dh_installman:79 dh_installmime:41 dh_installmodules:56
#: dh_installwm:53 dh_installxfonts:37 dh_movefiles:58 dh_scrollkeeper:42
#: dh_strip:68 dh_usrlocal:49
msgid "NOTES"
@@ -1176,17 +1176,17 @@ msgstr ""
# type: =head1
#: debhelper.pod:503 dh_builddeb:85 dh_clean:129 dh_compress:189 dh_desktop:47
-#: dh_fixperms:110 dh_gconf:92 dh_gencontrol:73 dh_installcatalogs:111
+#: dh_fixperms:110 dh_gconf:92 dh_gencontrol:73 dh_installcatalogs:109
#: dh_installchangelogs:140 dh_installcron:61 dh_installdebconf:118
#: dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:109
-#: dh_installexamples:103 dh_installinfo:103 dh_installinit:197
+#: dh_installexamples:103 dh_installinfo:103 dh_installinit:216
#: dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197
#: dh_installman:249 dh_installmenu:80 dh_installmime:85 dh_installmodules:116
#: dh_installpam:52 dh_install:268 dh_installppp:56 dh_installwm:107
#: dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:222
#: dh_md5sums:86 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76
-#: dh_shlibdeps:159 dh_strip:224 dh_suidregister:117 dh_testdir:43
-#: dh_testroot:26 dh_testversion:74 dh_undocumented:28 dh_usrlocal:114
+#: dh_shlibdeps:159 dh_strip:224 dh_suidregister:117 dh_testdir:44
+#: dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
msgid "SEE ALSO"
msgstr "VÉASE ADEMÁS"
@@ -1212,17 +1212,17 @@ msgstr "Web de Debhelper."
# type: =head1
#: debhelper.pod:517 dh_builddeb:91 dh_clean:135 dh_compress:195 dh_desktop:53
-#: dh_fixperms:116 dh_gconf:98 dh_gencontrol:79 dh_installcatalogs:117
+#: dh_fixperms:116 dh_gconf:98 dh_gencontrol:79 dh_installcatalogs:115
#: dh_installchangelogs:146 dh_installcron:67 dh_installdebconf:124
#: dh_installdeb:100 dh_installdirs:89 dh_installdocs:243
#: dh_installemacsen:115 dh_installexamples:109 dh_installinfo:109
-#: dh_installinit:203 dh_installlogcheck:57 dh_installlogrotate:56
+#: dh_installinit:222 dh_installlogcheck:57 dh_installlogrotate:56
#: dh_installmanpages:203 dh_installman:255 dh_installmenu:88
#: dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:274
#: dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229
#: dh_listpackages:35 dh_makeshlibs:228 dh_md5sums:92 dh_movefiles:168
#: dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:165 dh_strip:230
-#: dh_suidregister:123 dh_testdir:49 dh_testroot:32 dh_testversion:80
+#: dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81
#: dh_undocumented:34 dh_usrlocal:120
msgid "AUTHOR"
msgstr "AUTOR"
@@ -1232,13 +1232,13 @@ msgstr "AUTOR"
#: dh_fixperms:118 dh_gencontrol:81 dh_installchangelogs:148 dh_installcron:69
#: dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91
#: dh_installdocs:245 dh_installemacsen:117 dh_installexamples:111
-#: dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58
+#: dh_installinfo:111 dh_installinit:224 dh_installlogrotate:58
#: dh_installmanpages:205 dh_installman:257 dh_installmenu:90
#: dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:276
#: dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231
#: dh_listpackages:37 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170
-#: dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:51
-#: dh_testroot:34 dh_testversion:82 dh_undocumented:36
+#: dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:52
+#: dh_testroot:35 dh_testversion:83 dh_undocumented:36
msgid "Joey Hess <joeyh@debian.org>"
msgstr "Joey Hess <joeyh@debian.org>"
@@ -1268,7 +1268,7 @@ msgstr ""
# type: =head1
#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:34
-#: dh_gencontrol:26 dh_installcatalogs:44 dh_installchangelogs:44
+#: dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44
#: dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:51
#: dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37
#: dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40
@@ -1314,7 +1314,7 @@ msgid "B<-u>I<params>"
msgstr "B<-u>I<parámetros>"
# type: =item
-#: dh_builddeb:37 dh_gencontrol:32 dh_installdebconf:58 dh_installinit:67
+#: dh_builddeb:37 dh_gencontrol:32 dh_installdebconf:58 dh_installinit:78
#: dh_makeshlibs:76 dh_shlibdeps:32
msgid "B<--> I<params>"
msgstr "B<--> I<parámetros>"
@@ -1326,16 +1326,16 @@ msgstr "Pasa I<parámetros> a L<dpkg-deb(1)> cuando se construye el paquete."
# type: textblock
#: dh_builddeb:87 dh_clean:131 dh_compress:191 dh_fixperms:112 dh_gconf:94
-#: dh_gencontrol:75 dh_installcatalogs:113 dh_installchangelogs:142
+#: dh_gencontrol:75 dh_installcatalogs:111 dh_installchangelogs:142
#: dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85
#: dh_installdocs:239 dh_installemacsen:111 dh_installexamples:105
-#: dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53
+#: dh_installinfo:105 dh_installinit:218 dh_installlogcheck:53
#: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:251
#: dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:270
#: dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225
#: dh_listpackages:31 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164
-#: dh_perl:154 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:45
-#: dh_testroot:28 dh_testversion:76 dh_undocumented:30 dh_usrlocal:116
+#: dh_perl:154 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:46
+#: dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
msgid "L<debhelper(7)>"
msgstr "L<debhelper(7)>"
@@ -1344,13 +1344,13 @@ msgstr "L<debhelper(7)>"
#: dh_gconf:96 dh_gencontrol:77 dh_installchangelogs:144 dh_installcron:65
#: dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241
#: dh_installemacsen:113 dh_installexamples:107 dh_installinfo:107
-#: dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201
+#: dh_installinit:220 dh_installlogrotate:54 dh_installmanpages:201
#: dh_installman:253 dh_installmenu:86 dh_installmime:89 dh_installmodules:120
#: dh_installpam:56 dh_install:272 dh_installppp:60 dh_installwm:111
#: dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:226
#: dh_md5sums:90 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80
-#: dh_shlibdeps:163 dh_strip:228 dh_suidregister:121 dh_testdir:47
-#: dh_testroot:30 dh_testversion:78 dh_undocumented:32 dh_usrlocal:118
+#: dh_shlibdeps:163 dh_strip:228 dh_suidregister:121 dh_testdir:48
+#: dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
msgid "This program is a part of debhelper."
msgstr "Este programa es parte de debhelper."
@@ -1798,10 +1798,10 @@ msgstr "B<dh_installcatalogs> [S<I<opciones debhelper>>] [B<-n>]"
# type: textblock
#: dh_installcatalogs:20
+#, fuzzy
msgid ""
"dh_installcatalogs is a debhelper program that installs and registers SGML "
-"catalogs. (Note: it will be extended for XML catalog registration when xml-"
-"core is available.) It complies with the Debian XML/SGML policy."
+"catalogs. It complies with the Debian XML/SGML policy."
msgstr ""
"dh_installcatalogs es un programa de debhelper que instala y registra "
"catálogos SGML. (Nota: se extenderá para catálogos XML cuando xml-core esté "
@@ -1809,7 +1809,7 @@ msgstr ""
"se refiere."
# type: textblock
-#: dh_installcatalogs:25
+#: dh_installcatalogs:23
msgid ""
"The file F<debian/I<package>.sgmlcatalogs> contains the catalogs to be "
"installed per package. Each line in that file should be of the form "
@@ -1825,7 +1825,7 @@ msgstr ""
"share/sgml/>."
# type: textblock
-#: dh_installcatalogs:32
+#: dh_installcatalogs:30
msgid ""
"Catalogs will be registered in a supercatalog, in F</etc/sgml/I<package>."
"cat>."
@@ -1834,7 +1834,7 @@ msgstr ""
"I<paquete>.cat>."
# type: textblock
-#: dh_installcatalogs:35
+#: dh_installcatalogs:33
#, fuzzy
msgid ""
"This command automatically adds maintainer script snippets for registering "
@@ -1852,14 +1852,14 @@ msgstr ""
"desarrollador."
# type: textblock
-#: dh_installcatalogs:41
+#: dh_installcatalogs:39
msgid ""
"A dependency on B<sgml-base> will be added to C<${misc:Depends}>, so be sure "
"your package uses that variable in F<debian/control>."
msgstr ""
# type: =item
-#: dh_installcatalogs:48 dh_installdebconf:54 dh_installdocs:60
+#: dh_installcatalogs:46 dh_installdebconf:54 dh_installdocs:60
#: dh_installemacsen:39 dh_installinfo:46 dh_installinit:37 dh_installmenu:38
#: dh_installmime:35 dh_installmodules:43 dh_installwm:42 dh_makeshlibs:62
#: dh_python:60 dh_scrollkeeper:36 dh_usrlocal:43
@@ -1867,13 +1867,13 @@ msgid "B<-n>, B<--noscripts>"
msgstr "B<-n>, B<--noscripts>"
# type: textblock
-#: dh_installcatalogs:50
+#: dh_installcatalogs:48
msgid "Do not modify F<postinst>/F<postrm>/F<prerm> scripts."
msgstr "No modifica los scripts de F<postinst>/F<postrm>/F<prerm>."
# type: textblock
-#: dh_installcatalogs:56 dh_installdocs:93 dh_installemacsen:56
-#: dh_installinfo:59 dh_installinit:101 dh_installmime:43 dh_installmodules:58
+#: dh_installcatalogs:54 dh_installdocs:93 dh_installemacsen:56
+#: dh_installinfo:59 dh_installinit:112 dh_installmime:43 dh_installmodules:58
#: dh_installwm:55 dh_scrollkeeper:44 dh_usrlocal:51
#, fuzzy
msgid ""
@@ -1886,12 +1886,12 @@ msgstr ""
"mantenimiento contengan partes duplicadas."
# type: textblock
-#: dh_installcatalogs:115
+#: dh_installcatalogs:113
msgid "F</usr/share/doc/sgml-base-doc/>"
msgstr "F</usr/share/doc/sgml-base-doc/>"
# type: textblock
-#: dh_installcatalogs:119
+#: dh_installcatalogs:117
msgid "Adam Di Carlo <aph@debian.org>"
msgstr "Adam Di Carlo <aph@debian.org>"
@@ -2027,7 +2027,7 @@ msgstr ""
"cron.d."
# type: =item
-#: dh_installcron:28 dh_installinit:72 dh_installlogrotate:26
+#: dh_installcron:28 dh_installinit:83 dh_installlogrotate:26
#: dh_installmodules:47 dh_installpam:28 dh_installppp:30
msgid "B<--name=>I<name>"
msgstr "B<--name=>I<nombre>"
@@ -2731,9 +2731,10 @@ msgstr ""
# type: textblock
#: dh_installinit:14
+#, fuzzy
msgid ""
"B<dh_installinit> [S<I<debhelper options>>] [B<--name=>I<name>] [B<-n>] [B<-"
-"r>] [B<-d>] [S<B<--> I<params>>]"
+"R>] [B<-r>] [B<-d>] [S<B<--> I<params>>]"
msgstr ""
"B<dh_installinit> [S<I<opciones debhelper>>] [B<--name=>I<nombre>] [B<-n>] "
"[B<-r>] [B<-d>] [S<B<--> I<parámetros>>]"
@@ -2803,21 +2804,45 @@ msgstr ""
# type: =item
#: dh_installinit:48
-msgid "B<-r>, B<--no-restart-on-upgrade>"
+#, fuzzy
+msgid "B<-R>, B<--restart-after-upgrade>"
msgstr "B<-r>, B<--no-restart-on-upgrade>"
# type: textblock
#: dh_installinit:50
-msgid "Do not restart init script on upgrade."
+msgid ""
+"Do not stop the init script until after the package upgrade has been "
+"completed. This is different than the default behavior, which stops the "
+"script in the prerm, and starts it again in the postinst."
+msgstr ""
+
+# type: textblock
+#: dh_installinit:54
+msgid ""
+"This can be useful for daemons that should not have a possibly long downtime "
+"during upgrade. But you should make sure that the daemon will not get "
+"confused by the package being upgraded while it's running before using this "
+"option."
+msgstr ""
+
+# type: =item
+#: dh_installinit:59
+msgid "B<-r>, B<--no-restart-on-upgrade>"
+msgstr "B<-r>, B<--no-restart-on-upgrade>"
+
+# type: textblock
+#: dh_installinit:61
+#, fuzzy
+msgid "Do not stop init script on upgrade."
msgstr "No reinicia el script de init después de una actualización."
# type: =item
-#: dh_installinit:52
+#: dh_installinit:63
msgid "B<--no-start>"
msgstr "B<--no-start>"
# type: textblock
-#: dh_installinit:54
+#: dh_installinit:65
msgid ""
"Do not start the init script on install or upgrade, or stop it on removal. "
"Only call update-rc.d. Useful for rcS scripts."
@@ -2826,12 +2851,12 @@ msgstr ""
"cuando se desinstale. Sólo llama a update-rc.d. Útil para scripts de rcS."
# type: =item
-#: dh_installinit:57
+#: dh_installinit:68
msgid "B<-d>, B<--remove-d>"
msgstr "B<-d>, B<--remove-d>"
# type: textblock
-#: dh_installinit:59
+#: dh_installinit:70
msgid ""
"Remove trailing \"d\" from the name of the package, and use the result for "
"the filename the init script is installed as in etc/init.d/ , and the "
@@ -2846,12 +2871,12 @@ msgstr ""
"preferencia sobre --init-script)."
# type: =item
-#: dh_installinit:65
+#: dh_installinit:76
msgid "B<-u>I<params> B<--update-rcd-params=>I<params>"
msgstr "B<-u>I<parámetros> B<--update-rcd-params=>I<parámetros>"
# type: textblock
-#: dh_installinit:69
+#: dh_installinit:80
msgid ""
"Pass \"params\" to L<update-rc.d(8)>. If not specified, \"defaults\" will be "
"passed to L<update-rc.d(8)>."
@@ -2860,7 +2885,7 @@ msgstr ""
"\"defaults\" a L<update-rc.d(8)>."
# type: textblock
-#: dh_installinit:74
+#: dh_installinit:85
msgid ""
"Install the init script (and default file) using the filename I<name> "
"instead of the default filename, which is the package name. When this "
@@ -2875,12 +2900,12 @@ msgstr ""
"debian/paquete.init y debian/paquete.default, y los instala."
# type: =item
-#: dh_installinit:80
+#: dh_installinit:91
msgid "B<--init-script=>I<scriptname>"
msgstr "B<--init-script=>I<nombrescript>"
# type: textblock
-#: dh_installinit:82
+#: dh_installinit:93
msgid ""
"Use \"scriptname\" as the filename the init script is installed as in etc/"
"init.d/ (and also use it as the filename for the defaults file, if it is "
@@ -2897,17 +2922,17 @@ msgstr ""
"que instala normalmente."
# type: textblock
-#: dh_installinit:89
+#: dh_installinit:100
msgid "This parameter is deprecated, use the --name parameter instead."
msgstr "Se desaconseja el uso de esta opción, use --name en su lugar."
# type: =item
-#: dh_installinit:91
+#: dh_installinit:102
msgid "B<--error-handler=>I<function>"
msgstr "B<--error-handler=>I<función>"
# type: textblock
-#: dh_installinit:93
+#: dh_installinit:104
msgid ""
"Call the named shell function if running the init script fails. The function "
"should be provided in the prerm and postinst scripts, before the #DEBHELPER# "
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 378d9e2..31c9613 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debhelper manpages\n"
-"POT-Creation-Date: 2008-04-30 02:17-0400\n"
+"POT-Creation-Date: 2008-05-07 16:32-0400\n"
"PO-Revision-Date: 2006-11-19 20:50+0100\n"
"Last-Translator: Valery Perrin <valery.perrin.debian@free.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -471,9 +471,9 @@ msgstr ""
"commande concernent TOUS les paquets construits et pas seulement le premier."
# type: =head1
-#: debhelper.pod:168 dh_installcatalogs:54 dh_installdocs:87
+#: debhelper.pod:168 dh_installcatalogs:52 dh_installdocs:87
#: dh_installemacsen:54 dh_installexamples:50 dh_installinfo:57
-#: dh_installinit:99 dh_installman:79 dh_installmime:41 dh_installmodules:56
+#: dh_installinit:110 dh_installman:79 dh_installmime:41 dh_installmodules:56
#: dh_installwm:53 dh_installxfonts:37 dh_movefiles:58 dh_scrollkeeper:42
#: dh_strip:68 dh_usrlocal:49
msgid "NOTES"
@@ -1206,17 +1206,17 @@ msgstr ""
# type: =head1
#: debhelper.pod:503 dh_builddeb:85 dh_clean:129 dh_compress:189 dh_desktop:47
-#: dh_fixperms:110 dh_gconf:92 dh_gencontrol:73 dh_installcatalogs:111
+#: dh_fixperms:110 dh_gconf:92 dh_gencontrol:73 dh_installcatalogs:109
#: dh_installchangelogs:140 dh_installcron:61 dh_installdebconf:118
#: dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:109
-#: dh_installexamples:103 dh_installinfo:103 dh_installinit:197
+#: dh_installexamples:103 dh_installinfo:103 dh_installinit:216
#: dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197
#: dh_installman:249 dh_installmenu:80 dh_installmime:85 dh_installmodules:116
#: dh_installpam:52 dh_install:268 dh_installppp:56 dh_installwm:107
#: dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:222
#: dh_md5sums:86 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76
-#: dh_shlibdeps:159 dh_strip:224 dh_suidregister:117 dh_testdir:43
-#: dh_testroot:26 dh_testversion:74 dh_undocumented:28 dh_usrlocal:114
+#: dh_shlibdeps:159 dh_strip:224 dh_suidregister:117 dh_testdir:44
+#: dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
@@ -1243,17 +1243,17 @@ msgstr "Le site internet de debhelper."
# type: =head1
#: debhelper.pod:517 dh_builddeb:91 dh_clean:135 dh_compress:195 dh_desktop:53
-#: dh_fixperms:116 dh_gconf:98 dh_gencontrol:79 dh_installcatalogs:117
+#: dh_fixperms:116 dh_gconf:98 dh_gencontrol:79 dh_installcatalogs:115
#: dh_installchangelogs:146 dh_installcron:67 dh_installdebconf:124
#: dh_installdeb:100 dh_installdirs:89 dh_installdocs:243
#: dh_installemacsen:115 dh_installexamples:109 dh_installinfo:109
-#: dh_installinit:203 dh_installlogcheck:57 dh_installlogrotate:56
+#: dh_installinit:222 dh_installlogcheck:57 dh_installlogrotate:56
#: dh_installmanpages:203 dh_installman:255 dh_installmenu:88
#: dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:274
#: dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229
#: dh_listpackages:35 dh_makeshlibs:228 dh_md5sums:92 dh_movefiles:168
#: dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:165 dh_strip:230
-#: dh_suidregister:123 dh_testdir:49 dh_testroot:32 dh_testversion:80
+#: dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81
#: dh_undocumented:34 dh_usrlocal:120
msgid "AUTHOR"
msgstr "AUTEUR"
@@ -1263,13 +1263,13 @@ msgstr "AUTEUR"
#: dh_fixperms:118 dh_gencontrol:81 dh_installchangelogs:148 dh_installcron:69
#: dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91
#: dh_installdocs:245 dh_installemacsen:117 dh_installexamples:111
-#: dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58
+#: dh_installinfo:111 dh_installinit:224 dh_installlogrotate:58
#: dh_installmanpages:205 dh_installman:257 dh_installmenu:90
#: dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:276
#: dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231
#: dh_listpackages:37 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170
-#: dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:51
-#: dh_testroot:34 dh_testversion:82 dh_undocumented:36
+#: dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:52
+#: dh_testroot:35 dh_testversion:83 dh_undocumented:36
msgid "Joey Hess <joeyh@debian.org>"
msgstr "Joey Hess <joeyh@debian.org>"
@@ -1299,7 +1299,7 @@ msgstr ""
# type: =head1
#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:34
-#: dh_gencontrol:26 dh_installcatalogs:44 dh_installchangelogs:44
+#: dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44
#: dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:51
#: dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37
#: dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40
@@ -1345,7 +1345,7 @@ msgid "B<-u>I<params>"
msgstr "B<-u> I<paramètres>"
# type: =item
-#: dh_builddeb:37 dh_gencontrol:32 dh_installdebconf:58 dh_installinit:67
+#: dh_builddeb:37 dh_gencontrol:32 dh_installdebconf:58 dh_installinit:78
#: dh_makeshlibs:76 dh_shlibdeps:32
msgid "B<--> I<params>"
msgstr "B<--> I<paramètres>"
@@ -1358,16 +1358,16 @@ msgstr ""
# type: textblock
#: dh_builddeb:87 dh_clean:131 dh_compress:191 dh_fixperms:112 dh_gconf:94
-#: dh_gencontrol:75 dh_installcatalogs:113 dh_installchangelogs:142
+#: dh_gencontrol:75 dh_installcatalogs:111 dh_installchangelogs:142
#: dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85
#: dh_installdocs:239 dh_installemacsen:111 dh_installexamples:105
-#: dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53
+#: dh_installinfo:105 dh_installinit:218 dh_installlogcheck:53
#: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:251
#: dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:270
#: dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225
#: dh_listpackages:31 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164
-#: dh_perl:154 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:45
-#: dh_testroot:28 dh_testversion:76 dh_undocumented:30 dh_usrlocal:116
+#: dh_perl:154 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:46
+#: dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
msgid "L<debhelper(7)>"
msgstr "L<debhelper(7)>"
@@ -1376,13 +1376,13 @@ msgstr "L<debhelper(7)>"
#: dh_gconf:96 dh_gencontrol:77 dh_installchangelogs:144 dh_installcron:65
#: dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241
#: dh_installemacsen:113 dh_installexamples:107 dh_installinfo:107
-#: dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201
+#: dh_installinit:220 dh_installlogrotate:54 dh_installmanpages:201
#: dh_installman:253 dh_installmenu:86 dh_installmime:89 dh_installmodules:120
#: dh_installpam:56 dh_install:272 dh_installppp:60 dh_installwm:111
#: dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:226
#: dh_md5sums:90 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80
-#: dh_shlibdeps:163 dh_strip:228 dh_suidregister:121 dh_testdir:47
-#: dh_testroot:30 dh_testversion:78 dh_undocumented:32 dh_usrlocal:118
+#: dh_shlibdeps:163 dh_strip:228 dh_suidregister:121 dh_testdir:48
+#: dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
msgid "This program is a part of debhelper."
msgstr "Ce programme fait partie de debhelper."
@@ -1840,10 +1840,10 @@ msgstr "B<dh_installcatalogs> [S<I<options de debhelper>>] [B<-n>]"
# type: textblock
#: dh_installcatalogs:20
+#, fuzzy
msgid ""
"dh_installcatalogs is a debhelper program that installs and registers SGML "
-"catalogs. (Note: it will be extended for XML catalog registration when xml-"
-"core is available.) It complies with the Debian XML/SGML policy."
+"catalogs. It complies with the Debian XML/SGML policy."
msgstr ""
"dh_installcatalogs est un programme de la suite debhelper chargé d'installer "
"et d'inscrire les catalogues SGML conformément à la Charte XML/SGML de "
@@ -1851,7 +1851,7 @@ msgstr ""
"dès que le socle xml sera disponible.)"
# type: textblock
-#: dh_installcatalogs:25
+#: dh_installcatalogs:23
msgid ""
"The file F<debian/I<package>.sgmlcatalogs> contains the catalogs to be "
"installed per package. Each line in that file should be of the form "
@@ -1867,7 +1867,7 @@ msgstr ""
"C<destination> doit commencer par F</usr/share/sgml/>."
# type: textblock
-#: dh_installcatalogs:32
+#: dh_installcatalogs:30
msgid ""
"Catalogs will be registered in a supercatalog, in F</etc/sgml/I<package>."
"cat>."
@@ -1876,7 +1876,7 @@ msgstr ""
"I<paquet>.cat>."
# type: textblock
-#: dh_installcatalogs:35
+#: dh_installcatalogs:33
#, fuzzy
msgid ""
"This command automatically adds maintainer script snippets for registering "
@@ -1894,14 +1894,14 @@ msgstr ""
"ajoutées aux scripts de maintenance du paquet."
# type: textblock
-#: dh_installcatalogs:41
+#: dh_installcatalogs:39
msgid ""
"A dependency on B<sgml-base> will be added to C<${misc:Depends}>, so be sure "
"your package uses that variable in F<debian/control>."
msgstr ""
# type: =item
-#: dh_installcatalogs:48 dh_installdebconf:54 dh_installdocs:60
+#: dh_installcatalogs:46 dh_installdebconf:54 dh_installdocs:60
#: dh_installemacsen:39 dh_installinfo:46 dh_installinit:37 dh_installmenu:38
#: dh_installmime:35 dh_installmodules:43 dh_installwm:42 dh_makeshlibs:62
#: dh_python:60 dh_scrollkeeper:36 dh_usrlocal:43
@@ -1909,15 +1909,15 @@ msgid "B<-n>, B<--noscripts>"
msgstr "B<-n>, B<--noscripts>"
# type: textblock
-#: dh_installcatalogs:50
+#: dh_installcatalogs:48
msgid "Do not modify F<postinst>/F<postrm>/F<prerm> scripts."
msgstr ""
"Empêche la modification des scripts de maintenance F<postinst>, F<postrm>, "
"F<prerm>."
# type: textblock
-#: dh_installcatalogs:56 dh_installdocs:93 dh_installemacsen:56
-#: dh_installinfo:59 dh_installinit:101 dh_installmime:43 dh_installmodules:58
+#: dh_installcatalogs:54 dh_installdocs:93 dh_installemacsen:56
+#: dh_installinfo:59 dh_installinit:112 dh_installmime:43 dh_installmodules:58
#: dh_installwm:55 dh_scrollkeeper:44 dh_usrlocal:51
#, fuzzy
msgid ""
@@ -1931,12 +1931,12 @@ msgstr ""
"maintenance du paquet."
# type: textblock
-#: dh_installcatalogs:115
+#: dh_installcatalogs:113
msgid "F</usr/share/doc/sgml-base-doc/>"
msgstr "F</usr/share/doc/sgml-base-doc/>"
# type: textblock
-#: dh_installcatalogs:119
+#: dh_installcatalogs:117
msgid "Adam Di Carlo <aph@debian.org>"
msgstr "Adam Di Carlo <aph@debian.org>"
@@ -2069,7 +2069,7 @@ msgstr ""
"debian/paquet.cron.d."
# type: =item
-#: dh_installcron:28 dh_installinit:72 dh_installlogrotate:26
+#: dh_installcron:28 dh_installinit:83 dh_installlogrotate:26
#: dh_installmodules:47 dh_installpam:28 dh_installppp:30
msgid "B<--name=>I<name>"
msgstr "B<--name=>I<nom>"
@@ -2788,9 +2788,10 @@ msgstr ""
# type: textblock
#: dh_installinit:14
+#, fuzzy
msgid ""
"B<dh_installinit> [S<I<debhelper options>>] [B<--name=>I<name>] [B<-n>] [B<-"
-"r>] [B<-d>] [S<B<--> I<params>>]"
+"R>] [B<-r>] [B<-d>] [S<B<--> I<params>>]"
msgstr ""
"B<dh_installinit> [S<I<options de debhelper>>] [B<--name=>I<nom>] [B<-n>] "
"[B<-r>] [B<-d>] [S<B<--> I<paramètres>>]"
@@ -2865,22 +2866,46 @@ msgstr ""
# type: =item
#: dh_installinit:48
-msgid "B<-r>, B<--no-restart-on-upgrade>"
+#, fuzzy
+msgid "B<-R>, B<--restart-after-upgrade>"
msgstr "B<-r>, B<--no-restart-on-upgrade>"
# type: textblock
#: dh_installinit:50
-msgid "Do not restart init script on upgrade."
+msgid ""
+"Do not stop the init script until after the package upgrade has been "
+"completed. This is different than the default behavior, which stops the "
+"script in the prerm, and starts it again in the postinst."
+msgstr ""
+
+# type: textblock
+#: dh_installinit:54
+msgid ""
+"This can be useful for daemons that should not have a possibly long downtime "
+"during upgrade. But you should make sure that the daemon will not get "
+"confused by the package being upgraded while it's running before using this "
+"option."
+msgstr ""
+
+# type: =item
+#: dh_installinit:59
+msgid "B<-r>, B<--no-restart-on-upgrade>"
+msgstr "B<-r>, B<--no-restart-on-upgrade>"
+
+# type: textblock
+#: dh_installinit:61
+#, fuzzy
+msgid "Do not stop init script on upgrade."
msgstr ""
"Empêche le redémarrage du script d'initialisation lors d'une mise à jour."
# type: =item
-#: dh_installinit:52
+#: dh_installinit:63
msgid "B<--no-start>"
msgstr "B<--no-start>"
# type: textblock
-#: dh_installinit:54
+#: dh_installinit:65
msgid ""
"Do not start the init script on install or upgrade, or stop it on removal. "
"Only call update-rc.d. Useful for rcS scripts."
@@ -2890,12 +2915,12 @@ msgstr ""
"un update-rc.d. Utile pour les scripts rcS."
# type: =item
-#: dh_installinit:57
+#: dh_installinit:68
msgid "B<-d>, B<--remove-d>"
msgstr "B<-d>, B<--remove-d>"
# type: textblock
-#: dh_installinit:59
+#: dh_installinit:70
msgid ""
"Remove trailing \"d\" from the name of the package, and use the result for "
"the filename the init script is installed as in etc/init.d/ , and the "
@@ -2910,12 +2935,12 @@ msgstr ""
"a priorité sur --init-script décrit ci-dessous."
# type: =item
-#: dh_installinit:65
+#: dh_installinit:76
msgid "B<-u>I<params> B<--update-rcd-params=>I<params>"
msgstr "B<-u>I<paramètres> B<--update-rcd-params=>I<paramètres>"
# type: textblock
-#: dh_installinit:69
+#: dh_installinit:80
msgid ""
"Pass \"params\" to L<update-rc.d(8)>. If not specified, \"defaults\" will be "
"passed to L<update-rc.d(8)>."
@@ -2924,7 +2949,7 @@ msgstr ""
"defaults »> sera passé à L<update-rc.d(8)>."
# type: textblock
-#: dh_installinit:74
+#: dh_installinit:85
msgid ""
"Install the init script (and default file) using the filename I<name> "
"instead of the default filename, which is the package name. When this "
@@ -2939,12 +2964,12 @@ msgstr ""
"et debian/paquet.default habituels."
# type: =item
-#: dh_installinit:80
+#: dh_installinit:91
msgid "B<--init-script=>I<scriptname>"
msgstr "B<--init-script=>I<nom-du-script>"
# type: textblock
-#: dh_installinit:82
+#: dh_installinit:93
msgid ""
"Use \"scriptname\" as the filename the init script is installed as in etc/"
"init.d/ (and also use it as the filename for the defaults file, if it is "
@@ -2961,17 +2986,17 @@ msgstr ""
"habituellement."
# type: textblock
-#: dh_installinit:89
+#: dh_installinit:100
msgid "This parameter is deprecated, use the --name parameter instead."
msgstr "Ce paramètre est déconseillé. Il vaut mieux utiliser --name."
# type: =item
-#: dh_installinit:91
+#: dh_installinit:102
msgid "B<--error-handler=>I<function>"
msgstr "B<--error-handler=>I<fonction>"
# type: textblock
-#: dh_installinit:93
+#: dh_installinit:104
msgid ""
"Call the named shell function if running the init script fails. The function "
"should be provided in the prerm and postinst scripts, before the #DEBHELPER# "