diff -pruN 7.4.3/autoscripts/postinst-upstart 7.4.3ubuntu2/autoscripts/postinst-upstart --- 7.4.3/autoscripts/postinst-upstart 1970-01-01 01:00:00.000000000 +0100 +++ 7.4.3ubuntu2/autoscripts/postinst-upstart 2009-10-30 12:58:39.000000000 +0000 @@ -0,0 +1,4 @@ +if [ -e "/etc/init/#JOB#.conf" ]; then + # start fails if already running + start #JOB# || : +fi diff -pruN 7.4.3/autoscripts/postinst-upstart-replace 7.4.3ubuntu2/autoscripts/postinst-upstart-replace --- 7.4.3/autoscripts/postinst-upstart-replace 1970-01-01 01:00:00.000000000 +0100 +++ 7.4.3ubuntu2/autoscripts/postinst-upstart-replace 2009-10-30 12:58:39.000000000 +0000 @@ -0,0 +1 @@ +update-rc.d -f #SCRIPT# remove >/dev/null || #ERROR_HANDLER# diff -pruN 7.4.3/autoscripts/postinst-upstart-restart 7.4.3ubuntu2/autoscripts/postinst-upstart-restart --- 7.4.3/autoscripts/postinst-upstart-restart 1970-01-01 01:00:00.000000000 +0100 +++ 7.4.3ubuntu2/autoscripts/postinst-upstart-restart 2009-10-30 12:58:39.000000000 +0000 @@ -0,0 +1,8 @@ +if [ -x "/etc/init.d/#JOB#" ]; then + if [ -n "$2" ]; then + _dh_action=restart + else + _dh_action=start + fi + invoke-rc.d #JOB# $_dh_action || #ERROR_HANDLER# +fi diff -pruN 7.4.3/autoscripts/preinst-removeconffile 7.4.3ubuntu2/autoscripts/preinst-removeconffile --- 7.4.3/autoscripts/preinst-removeconffile 1970-01-01 01:00:00.000000000 +0100 +++ 7.4.3ubuntu2/autoscripts/preinst-removeconffile 2009-10-30 12:58:39.000000000 +0000 @@ -0,0 +1,12 @@ +if [ "$1" = install ] || [ "$1" = upgrade ]; then + if [ -e "#OLD#" ] && [ ! -L "#OLD#" ]; then + if [ "`md5sum \"#OLD#\" | sed -e \"s/ .*//\"`" != \ + "`dpkg-query -W -f='${Conffiles}' #PACKAGE# | sed -n -e \"\\\\' #OLD# '{s/ obsolete$//;s/.* //p}\"`" ] + then + echo "Obsolete conffile #OLD# has been modified by you, renaming to .dpkg-bak" + mv -f "#OLD#" "#OLD#.dpkg-bak" + else + rm -f "#OLD#" + fi + fi +fi diff -pruN 7.4.3/autoscripts/prerm-upstart 7.4.3ubuntu2/autoscripts/prerm-upstart --- 7.4.3/autoscripts/prerm-upstart 1970-01-01 01:00:00.000000000 +0100 +++ 7.4.3ubuntu2/autoscripts/prerm-upstart 2009-10-30 12:58:39.000000000 +0000 @@ -0,0 +1,4 @@ +if [ -e "/etc/init/#JOB#.conf" ]; then + # stop fails if not running + stop #JOB# || : +fi diff -pruN 7.4.3/autoscripts/prerm-upstart-norestart 7.4.3ubuntu2/autoscripts/prerm-upstart-norestart --- 7.4.3/autoscripts/prerm-upstart-norestart 1970-01-01 01:00:00.000000000 +0100 +++ 7.4.3ubuntu2/autoscripts/prerm-upstart-norestart 2009-10-30 12:58:39.000000000 +0000 @@ -0,0 +1,4 @@ +if [ -e "/etc/init/#JOB#.conf" ] && [ "$1" = remove ]; then + # stop fails if not running + stop #JOB# || : +fi diff -pruN 7.4.3/debian/changelog 7.4.3ubuntu2/debian/changelog --- 7.4.3/debian/changelog 2009-10-01 19:47:15.000000000 +0100 +++ 7.4.3ubuntu2/debian/changelog 2009-11-02 12:02:39.000000000 +0000 @@ -1,3 +1,22 @@ +debhelper (7.4.3ubuntu2) lucid; urgency=low + + * dh_installinit: Fix merge error which caused init.d-autoscripts to be + run for upstartified packages. (LP: #470326) + + -- Martin Pitt Mon, 02 Nov 2009 13:01:48 +0100 + +debhelper (7.4.3ubuntu1) lucid; urgency=low + + * Merge with Debian unstable. Remaining Ubuntu changes: + - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes. + - Add various autoscripts for above: postinst-upstart, + postinst-upstart-replace, postinst-upstart-restart, + prerm-upstart, prerm-upstart-norestart, preinst-removeconffile. + - dh_installudev: Handle conffile migration from old Ubuntu defaults + (needed until after the next LTS release). + + -- Martin Pitt Fri, 30 Oct 2009 14:11:17 +0100 + debhelper (7.4.3) unstable; urgency=low [ Valery Perrin ] @@ -79,6 +98,54 @@ debhelper (7.3.16) unstable; urgency=low -- Joey Hess Wed, 26 Aug 2009 17:10:53 -0400 +debhelper (7.3.15ubuntu3) karmic; urgency=low + + * dh_installinit: + - Create the upstart-job symlink even when --upstart-only is called, + since this simplifies implementation of... + - --restart-after-upgrade: we can't use the upstart 'restart' command here + because this will give wrong behavior if we're adding a new job to an + existing package; instead just use the standard invoke-rc.d snippet, + which (combined with the above) will at least give us compatibility + with policy-rc.d for preventing stopped jobs from starting on upgrade. + (N.B.: prerm scripts could also safely reuse the invoke-rc.d handling + instead of calling 'stop' directly, but leaving this alone for now + because the current behavior is only minorly buggy.) + - Drop unnecessary UPSTART_ONLY check; --upstart-only should never be set + without having an upstart job so this is redundant. + - postinst-reboot-required is never the right snippet to include here. + - Merge in the final changes to the upstartification as accepted into + debhelper upstream, dropping the --onlyscripts-upstart option from + the documentation but mapping it to --onlyscripts for compatibility in + karmic. + * autoscript/postinst-upstart: typo fix. + + -- Steve Langasek Wed, 30 Sep 2009 13:57:14 -0700 + +debhelper (7.3.15ubuntu2) karmic; urgency=low + + FFE LP: #427356. + + * dh_installinit: handle upstart job files in preference over init + scripts, supplying appropriate maintainer scripts to stop, start or + restart the jobs over upgrades. + - currently unlike init scripts, these accept failures because Upstart + considers "start when already running" failure. + * dh_installinit: --upstart-only will not include maintainer script code + to replace an init script with an upstart job, otherwise a compatibilty + symlink to /lib/init/upstart-job is left in its place + + -- Scott James Remnant Tue, 15 Sep 2009 03:32:13 +0100 + +debhelper (7.3.15ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - dh_installudev: Default priority is now 40 by default. + - dh_installudev: Handle conffile migration from old Ubuntu defaults + (needed until after the next LTS release). + + -- Colin Watson Tue, 25 Aug 2009 11:10:18 +0100 + debhelper (7.3.15) unstable; urgency=low * dh_installudev: Install rules files into new location @@ -153,6 +220,17 @@ debhelper (7.3.9) unstable; urgency=low -- Joey Hess Sat, 01 Aug 2009 15:59:07 -0400 +debhelper (7.3.8ubuntu1) karmic; urgency=low + + * Merge with Debian unstable (LP: #404561). Remaining Ubuntu changes: + - dh_installudev: Default priority is now 40 by default, the target + directory is /lib/udev/rules.d, and rules use '-' as separator instead of + '_'. Remove files from /etc/udev/rules.d unless they are user modified; + if modified and of default priority, take care to rename. + This should eventually go to Debian as well, see Debian #491117. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Sat, 25 Jul 2009 17:17:24 +0300 + debhelper (7.3.8) unstable; urgency=low * Fix t/override_target to use ./run. Closes: #538315 diff -pruN 7.4.3/debian/control 7.4.3ubuntu2/debian/control --- 7.4.3/debian/control 2009-09-28 02:22:27.000000000 +0100 +++ 7.4.3ubuntu2/debian/control 2009-10-30 12:58:39.000000000 +0000 @@ -1,7 +1,8 @@ Source: debhelper Section: devel Priority: optional -Maintainer: Joey Hess +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Joey Hess Build-Depends: po4a (>= 0.24), man-db (>= 2.5.1), file (>= 3.23) Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/debhelper/debhelper.git diff -pruN 7.4.3/dh_installinit 7.4.3ubuntu2/dh_installinit --- 7.4.3/dh_installinit 2009-09-28 02:22:27.000000000 +0100 +++ 7.4.3ubuntu2/dh_installinit 2009-11-02 12:01:42.000000000 +0000 @@ -122,6 +122,14 @@ preference to the files it normally inst This parameter is deprecated, use the --name parameter instead. This parameter will be ignored completely for upstart jobs. +=item B<--upstart-only> + +Only install an upstart job file, and do not include maintainer script +code to replace an init script with that upstart job. + +This parameter is intended for use when the "package.upstart" file is +new and only to be used on Upstart-based systems. + =item B<--error-handler=>I Call the named shell function if running the init script fails. The @@ -146,6 +154,9 @@ init(options => { "init-script=s" => \$dh{INIT_SCRIPT}, "update-rcd-params=s", => \$dh{U_PARAMS}, "remove-d" => \$dh{D_FLAG}, + "O" => \$dh{ONLYSCRIPTS}, + "onlyscripts-upstart" => \$dh{ONLYSCRIPTS}, + "upstart-only" => \$dh{UPSTART_ONLY}, }); foreach my $package (@{$dh{DOPACKAGES}}) { @@ -218,12 +229,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) doit("install","-p","-m755",$init,"$tmp/etc/init.d/$script"); } - if ($job ne '' || $init ne '' || $dh{ONLYSCRIPTS}) + if ($init ne '' || ($dh{ONLYSCRIPTS} && ! -e "$tmp/etc/init/$jobfile.conf")) { - if (-e "$tmp/etc/init/$jobfile.conf") { - $script=$jobfile; - } - # This is set by the -u "foo" command line switch, it's # the parameters to pass to update-rc.d. If not set, # we have to say "defaults". @@ -271,6 +278,43 @@ foreach my $package (@{$dh{DOPACKAGES}}) "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/"); } } + + if ($job ne '' || ($dh{ONLYSCRIPTS} && -e "$tmp/etc/init/$jobfile.conf")) + { + if (! $dh{NOSCRIPTS}) { + if (! $dh{NO_START}) { + if ($dh{RESTART_AFTER_UPGRADE}) { + # restart (or start if new install) job + autoscript($package,"postinst", "postinst-upstart-restart", + "s/#JOB#/$jobfile/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/"); + } + else { + # start script + autoscript($package,"postinst", "postinst-upstart", + "s/#JOB#/$jobfile/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/"); + } + + if ($dh{R_FLAG} || $dh{RESTART_AFTER_UPGRADE}) { + # stops script only on remove + autoscript($package,"prerm","prerm-upstart-norestart", + "s/#JOB#/$jobfile/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/"); + } + else { + # always stops script + autoscript($package,"prerm","prerm-upstart", + "s/#JOB#/$jobfile/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/"); + } + } + + if (! $dh{UPSTART_ONLY}) { + $script=$jobfile; + autoscript($package,"preinst", "preinst-removeconffile", + "s!#OLD#!/etc/init.d/$script!g;s!#PACKAGE#!$package!g"); + autoscript($package,"postinst", "postinst-upstart-replace", + "s/#SCRIPT#/$script/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/"); + } + } + } } =head1 SEE ALSO @@ -282,7 +326,7 @@ This program is a part of debhelper. =head1 AUTHORS Joey Hess - Steve Langasek +Scott James Remnant =cut diff -pruN 7.4.3/dh_installudev 7.4.3ubuntu2/dh_installudev --- 7.4.3/dh_installudev 2009-09-28 02:22:27.000000000 +0100 +++ 7.4.3ubuntu2/dh_installudev 2009-10-30 12:59:17.000000000 +0000 @@ -44,7 +44,7 @@ debian/I.udev. =item B<--priority=>I -Sets the priority string of the rules.d symlink. Default is 60. +Sets the priority string of the rules.d symlink. Default is 40. =item B<-n>, B<--noscripts> @@ -66,6 +66,7 @@ init(); # we need to calculate that old value to handle # conffile moves correctly. my $old_priority=$dh{PRIORITY}; +my $old_ubuntu_priority=$dh{PRIORITY}; # In case a caller still uses the `z` prefix, remove it. if (defined $dh{PRIORITY}) { @@ -73,12 +74,14 @@ if (defined $dh{PRIORITY}) { } if (! defined $dh{PRIORITY}) { - $dh{PRIORITY}="60"; + $dh{PRIORITY}="40"; $old_priority="z60"; + $old_ubuntu_priority="50"; } if ($dh{PRIORITY}) { $dh{PRIORITY}.="-"; $old_priority.="_"; + $old_ubuntu_priority.="-"; } foreach my $package (@{$dh{DOPACKAGES}}) { @@ -108,6 +111,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) $rule=~s/^\/lib/\/etc/; autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$rule!g;s!#PACKAGE#!$package!g"); autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$rule!g"); + if ($old_ubuntu_priority ne $old_priority) { + $old="/etc/udev/rules.d/$old_ubuntu_priority$filename"; + autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$rule!g;s!#PACKAGE#!$package!g"); + if ($old_ubuntu_priority ne $dh{PRIORITY}) { + autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$rule!g"); + } + } } } } diff -pruN 7.4.3/man/po4a/po/debhelper.pot 7.4.3ubuntu2/man/po4a/po/debhelper.pot --- 7.4.3/man/po4a/po/debhelper.pot 2009-10-01 19:21:19.000000000 +0100 +++ 7.4.3ubuntu2/man/po4a/po/debhelper.pot 2009-11-02 12:02:47.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-10-01 14:21-0300\n" +"POT-Creation-Date: 2009-11-02 13:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -440,7 +440,7 @@ msgid "" msgstr "" #. type: =head1 -#: debhelper.pod:217 dh_auto_test:44 dh_installcatalogs:59 dh_installdocs:110 dh_installemacsen:67 dh_installexamples:53 dh_installinit:133 dh_installman:81 dh_installmime:51 dh_installmodules:60 dh_installudev:55 dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49 +#: debhelper.pod:217 dh_auto_test:44 dh_installcatalogs:59 dh_installdocs:110 dh_installemacsen:67 dh_installexamples:53 dh_installinit:141 dh_installman:81 dh_installmime:51 dh_installmodules:60 dh_installudev:55 dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49 msgid "NOTES" msgstr "" @@ -981,7 +981,7 @@ msgid "" msgstr "" #. type: =head1 -#: debhelper.pod:546 dh:604 dh_auto_build:47 dh_auto_clean:48 dh_auto_configure:53 dh_auto_install:85 dh_auto_test:58 dh_bugfiles:122 dh_builddeb:88 dh_clean:138 dh_compress:200 dh_desktop:31 dh_fixperms:122 dh_gconf:110 dh_gencontrol:79 dh_icons:65 dh_install:274 dh_installcatalogs:116 dh_installchangelogs:169 dh_installcron:77 dh_installdeb:108 dh_installdebconf:129 dh_installdirs:86 dh_installdocs:298 dh_installemacsen:124 dh_installexamples:106 dh_installifupdown:69 dh_installinfo:77 dh_installinit:276 dh_installlogcheck:66 dh_installlogrotate:50 dh_installman:253 dh_installmanpages:197 dh_installmenu:87 dh_installmime:95 dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:115 dh_installwm:108 dh_installxfonts:86 dh_link:226 dh_lintian:57 dh_listpackages:29 dh_makeshlibs:237 dh_md5sums:89 dh_movefiles:170 dh_perl:147 dh_prep:60 dh_python:282 dh_scrollkeeper:28 dh_shlibdeps:168 dh_strip:227 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114 +#: debhelper.pod:546 dh:604 dh_auto_build:47 dh_auto_clean:48 dh_auto_configure:53 dh_auto_install:85 dh_auto_test:58 dh_bugfiles:122 dh_builddeb:88 dh_clean:138 dh_compress:200 dh_desktop:31 dh_fixperms:122 dh_gconf:110 dh_gencontrol:79 dh_icons:65 dh_install:274 dh_installcatalogs:116 dh_installchangelogs:169 dh_installcron:77 dh_installdeb:108 dh_installdebconf:129 dh_installdirs:86 dh_installdocs:298 dh_installemacsen:124 dh_installexamples:106 dh_installifupdown:69 dh_installinfo:77 dh_installinit:320 dh_installlogcheck:66 dh_installlogrotate:50 dh_installman:253 dh_installmanpages:197 dh_installmenu:87 dh_installmime:95 dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:125 dh_installwm:108 dh_installxfonts:86 dh_link:226 dh_lintian:57 dh_listpackages:29 dh_makeshlibs:237 dh_md5sums:89 dh_movefiles:170 dh_perl:147 dh_prep:60 dh_python:282 dh_scrollkeeper:28 dh_shlibdeps:168 dh_strip:227 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114 msgid "SEE ALSO" msgstr "" @@ -1006,12 +1006,12 @@ msgid "Debhelper web site." msgstr "" #. type: =head1 -#: debhelper.pod:560 dh:610 dh_auto_build:53 dh_auto_clean:54 dh_auto_configure:59 dh_auto_install:91 dh_auto_test:64 dh_bugfiles:130 dh_builddeb:94 dh_clean:144 dh_compress:206 dh_desktop:37 dh_fixperms:128 dh_gconf:116 dh_gencontrol:85 dh_icons:71 dh_install:280 dh_installcatalogs:122 dh_installchangelogs:175 dh_installcron:83 dh_installdeb:114 dh_installdebconf:135 dh_installdirs:92 dh_installdocs:304 dh_installemacsen:130 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:72 dh_installlogrotate:56 dh_installman:259 dh_installmanpages:203 dh_installmenu:95 dh_installmime:101 dh_installmodules:130 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:92 dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:243 dh_md5sums:95 dh_movefiles:176 dh_perl:153 dh_prep:66 dh_python:288 dh_scrollkeeper:34 dh_shlibdeps:174 dh_strip:233 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81 dh_undocumented:34 dh_usrlocal:120 +#: debhelper.pod:560 dh:610 dh_auto_build:53 dh_auto_clean:54 dh_auto_configure:59 dh_auto_install:91 dh_auto_test:64 dh_bugfiles:130 dh_builddeb:94 dh_clean:144 dh_compress:206 dh_desktop:37 dh_fixperms:128 dh_gconf:116 dh_gencontrol:85 dh_icons:71 dh_install:280 dh_installcatalogs:122 dh_installchangelogs:175 dh_installcron:83 dh_installdeb:114 dh_installdebconf:135 dh_installdirs:92 dh_installdocs:304 dh_installemacsen:130 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:72 dh_installlogrotate:56 dh_installman:259 dh_installmanpages:203 dh_installmenu:95 dh_installmime:101 dh_installmodules:130 dh_installpam:65 dh_installppp:71 dh_installudev:131 dh_installwm:114 dh_installxfonts:92 dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:243 dh_md5sums:95 dh_movefiles:176 dh_perl:153 dh_prep:66 dh_python:288 dh_scrollkeeper:34 dh_shlibdeps:174 dh_strip:233 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:562 dh:612 dh_auto_build:55 dh_auto_clean:56 dh_auto_configure:61 dh_auto_install:93 dh_auto_test:66 dh_builddeb:96 dh_clean:146 dh_compress:208 dh_fixperms:130 dh_gencontrol:87 dh_install:282 dh_installchangelogs:177 dh_installcron:85 dh_installdeb:116 dh_installdebconf:137 dh_installdirs:94 dh_installdocs:306 dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:85 dh_installinit:284 dh_installlogrotate:58 dh_installman:261 dh_installmanpages:205 dh_installmenu:97 dh_installmime:103 dh_installmodules:132 dh_installpam:67 dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:94 dh_link:234 dh_listpackages:37 dh_makeshlibs:245 dh_md5sums:97 dh_movefiles:178 dh_prep:68 dh_shlibdeps:176 dh_strip:235 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_testversion:83 dh_undocumented:36 +#: debhelper.pod:562 dh:612 dh_auto_build:55 dh_auto_clean:56 dh_auto_configure:61 dh_auto_install:93 dh_auto_test:66 dh_builddeb:96 dh_clean:146 dh_compress:208 dh_fixperms:130 dh_gencontrol:87 dh_install:282 dh_installchangelogs:177 dh_installcron:85 dh_installdeb:116 dh_installdebconf:137 dh_installdirs:94 dh_installdocs:306 dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:85 dh_installlogrotate:58 dh_installman:261 dh_installmanpages:205 dh_installmenu:97 dh_installmime:103 dh_installmodules:132 dh_installpam:67 dh_installppp:73 dh_installudev:133 dh_installwm:116 dh_installxfonts:94 dh_link:234 dh_listpackages:37 dh_makeshlibs:245 dh_md5sums:97 dh_movefiles:178 dh_prep:68 dh_shlibdeps:176 dh_strip:235 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_testversion:83 dh_undocumented:36 msgid "Joey Hess " msgstr "" @@ -1336,12 +1336,12 @@ msgid "" msgstr "" #. type: textblock -#: dh:606 dh_auto_build:49 dh_auto_clean:50 dh_auto_configure:55 dh_auto_install:87 dh_auto_test:60 dh_builddeb:90 dh_clean:140 dh_compress:202 dh_fixperms:124 dh_gconf:112 dh_gencontrol:81 dh_install:276 dh_installcatalogs:118 dh_installchangelogs:171 dh_installcron:79 dh_installdeb:110 dh_installdebconf:131 dh_installdirs:88 dh_installdocs:300 dh_installemacsen:126 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:79 dh_installinit:278 dh_installlogcheck:68 dh_installlogrotate:52 dh_installman:255 dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:88 dh_link:228 dh_listpackages:31 dh_makeshlibs:239 dh_md5sums:91 dh_movefiles:172 dh_perl:149 dh_prep:62 dh_python:284 dh_strip:229 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116 +#: dh:606 dh_auto_build:49 dh_auto_clean:50 dh_auto_configure:55 dh_auto_install:87 dh_auto_test:60 dh_builddeb:90 dh_clean:140 dh_compress:202 dh_fixperms:124 dh_gconf:112 dh_gencontrol:81 dh_install:276 dh_installcatalogs:118 dh_installchangelogs:171 dh_installcron:79 dh_installdeb:110 dh_installdebconf:131 dh_installdirs:88 dh_installdocs:300 dh_installemacsen:126 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:79 dh_installinit:322 dh_installlogcheck:68 dh_installlogrotate:52 dh_installman:255 dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 dh_installpam:61 dh_installppp:67 dh_installudev:127 dh_installwm:110 dh_installxfonts:88 dh_link:228 dh_listpackages:31 dh_makeshlibs:239 dh_md5sums:91 dh_movefiles:172 dh_perl:149 dh_prep:62 dh_python:284 dh_strip:229 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116 msgid "L" msgstr "" #. type: textblock -#: dh:608 dh_auto_build:51 dh_auto_clean:52 dh_auto_configure:57 dh_auto_install:89 dh_auto_test:62 dh_bugfiles:128 dh_builddeb:92 dh_clean:142 dh_compress:204 dh_desktop:35 dh_fixperms:126 dh_gconf:114 dh_gencontrol:83 dh_icons:69 dh_install:278 dh_installchangelogs:173 dh_installcron:81 dh_installdeb:112 dh_installdebconf:133 dh_installdirs:90 dh_installdocs:302 dh_installemacsen:128 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:81 dh_installinit:280 dh_installlogrotate:54 dh_installman:257 dh_installmanpages:201 dh_installmenu:93 dh_installmime:99 dh_installmodules:128 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:90 dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:241 dh_md5sums:93 dh_movefiles:174 dh_perl:151 dh_prep:64 dh_python:286 dh_scrollkeeper:32 dh_shlibdeps:172 dh_strip:231 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118 +#: dh:608 dh_auto_build:51 dh_auto_clean:52 dh_auto_configure:57 dh_auto_install:89 dh_auto_test:62 dh_bugfiles:128 dh_builddeb:92 dh_clean:142 dh_compress:204 dh_desktop:35 dh_fixperms:126 dh_gconf:114 dh_gencontrol:83 dh_icons:69 dh_install:278 dh_installchangelogs:173 dh_installcron:81 dh_installdeb:112 dh_installdebconf:133 dh_installdirs:90 dh_installdocs:302 dh_installemacsen:128 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:81 dh_installinit:324 dh_installlogrotate:54 dh_installman:257 dh_installmanpages:201 dh_installmenu:93 dh_installmime:99 dh_installmodules:128 dh_installpam:63 dh_installppp:69 dh_installudev:129 dh_installwm:112 dh_installxfonts:90 dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:241 dh_md5sums:93 dh_movefiles:174 dh_perl:151 dh_prep:64 dh_python:286 dh_scrollkeeper:32 dh_shlibdeps:172 dh_strip:231 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 "" @@ -2445,7 +2445,7 @@ msgid "Do not modify F/F should be called " "between invocations of this command. Otherwise, it may cause multiple " @@ -3471,25 +3471,46 @@ msgstr "" #. type: =item #: dh_installinit:125 -msgid "B<--error-handler=>I" +msgid "B<--upstart-only>" msgstr "" #. type: textblock #: dh_installinit:127 msgid "" +"Only install an upstart job file, and do not include maintainer script code " +"to replace an init script with that upstart job." +msgstr "" + +#. type: textblock +#: dh_installinit:130 +msgid "" +"This parameter is intended for use when the \"package.upstart\" file is new " +"and only to be used on Upstart-based systems." +msgstr "" + +#. type: =item +#: dh_installinit:133 +msgid "B<--error-handler=>I" +msgstr "" + +#. type: textblock +#: dh_installinit:135 +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# " "token." msgstr "" #. type: =head1 -#: dh_installinit:282 +#: dh_installinit:326 msgid "AUTHORS" msgstr "" #. type: textblock -#: dh_installinit:286 -msgid "Steve Langasek " +#: dh_installinit:328 +msgid "" +"Joey Hess Steve Langasek " +"Scott James Remnant " msgstr "" #. type: textblock @@ -4069,7 +4090,7 @@ msgstr "" #. type: textblock #: dh_installudev:47 -msgid "Sets the priority string of the rules.d symlink. Default is 60." +msgid "Sets the priority string of the rules.d symlink. Default is 40." msgstr "" #. type: textblock diff -pruN 7.4.3/man/po4a/po/es.po 7.4.3ubuntu2/man/po4a/po/es.po --- 7.4.3/man/po4a/po/es.po 2009-10-01 19:21:58.000000000 +0100 +++ 7.4.3ubuntu2/man/po4a/po/es.po 2009-11-02 12:02:48.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-10-01 14:21-0300\n" +"POT-Creation-Date: 2009-11-02 13:02+0100\n" "PO-Revision-Date: 2005-09-18 00:11+0200\n" "Last-Translator: Rubén Porras Campo \n" "Language-Team: SPANISH \n" @@ -627,7 +627,7 @@ msgstr "" # type: =head1 #. type: =head1 #: debhelper.pod:217 dh_auto_test:44 dh_installcatalogs:59 dh_installdocs:110 -#: dh_installemacsen:67 dh_installexamples:53 dh_installinit:133 +#: dh_installemacsen:67 dh_installexamples:53 dh_installinit:141 #: dh_installman:81 dh_installmime:51 dh_installmodules:60 dh_installudev:55 #: dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68 #: dh_usrlocal:49 @@ -1401,10 +1401,10 @@ msgstr "" #: dh_installcatalogs:116 dh_installchangelogs:169 dh_installcron:77 #: dh_installdeb:108 dh_installdebconf:129 dh_installdirs:86 #: dh_installdocs:298 dh_installemacsen:124 dh_installexamples:106 -#: dh_installifupdown:69 dh_installinfo:77 dh_installinit:276 +#: dh_installifupdown:69 dh_installinfo:77 dh_installinit:320 #: dh_installlogcheck:66 dh_installlogrotate:50 dh_installman:253 #: dh_installmanpages:197 dh_installmenu:87 dh_installmime:95 -#: dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:115 +#: dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:125 #: dh_installwm:108 dh_installxfonts:86 dh_link:226 dh_lintian:57 #: dh_listpackages:29 dh_makeshlibs:237 dh_md5sums:89 dh_movefiles:170 #: dh_perl:147 dh_prep:60 dh_python:282 dh_scrollkeeper:28 dh_shlibdeps:168 @@ -1449,7 +1449,7 @@ msgstr "Web de Debhelper." #: dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:72 #: dh_installlogrotate:56 dh_installman:259 dh_installmanpages:203 #: dh_installmenu:95 dh_installmime:101 dh_installmodules:130 dh_installpam:65 -#: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:92 +#: dh_installppp:71 dh_installudev:131 dh_installwm:114 dh_installxfonts:92 #: dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:243 #: dh_md5sums:95 dh_movefiles:176 dh_perl:153 dh_prep:66 dh_python:288 #: dh_scrollkeeper:34 dh_shlibdeps:174 dh_strip:233 dh_suidregister:123 @@ -1466,12 +1466,12 @@ msgstr "AUTOR" #: dh_install:282 dh_installchangelogs:177 dh_installcron:85 dh_installdeb:116 #: dh_installdebconf:137 dh_installdirs:94 dh_installdocs:306 #: dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 -#: dh_installinfo:85 dh_installinit:284 dh_installlogrotate:58 -#: dh_installman:261 dh_installmanpages:205 dh_installmenu:97 -#: dh_installmime:103 dh_installmodules:132 dh_installpam:67 dh_installppp:73 -#: dh_installudev:123 dh_installwm:116 dh_installxfonts:94 dh_link:234 -#: dh_listpackages:37 dh_makeshlibs:245 dh_md5sums:97 dh_movefiles:178 -#: dh_prep:68 dh_shlibdeps:176 dh_strip:235 dh_suidregister:125 dh_testdir:52 +#: dh_installinfo:85 dh_installlogrotate:58 dh_installman:261 +#: dh_installmanpages:205 dh_installmenu:97 dh_installmime:103 +#: dh_installmodules:132 dh_installpam:67 dh_installppp:73 dh_installudev:133 +#: dh_installwm:116 dh_installxfonts:94 dh_link:234 dh_listpackages:37 +#: dh_makeshlibs:245 dh_md5sums:97 dh_movefiles:178 dh_prep:68 +#: dh_shlibdeps:176 dh_strip:235 dh_suidregister:125 dh_testdir:52 #: dh_testroot:35 dh_testversion:83 dh_undocumented:36 msgid "Joey Hess " msgstr "Joey Hess " @@ -1831,10 +1831,10 @@ msgstr "" #: dh_install:276 dh_installcatalogs:118 dh_installchangelogs:171 #: dh_installcron:79 dh_installdeb:110 dh_installdebconf:131 dh_installdirs:88 #: dh_installdocs:300 dh_installemacsen:126 dh_installexamples:108 -#: dh_installifupdown:71 dh_installinfo:79 dh_installinit:278 +#: dh_installifupdown:71 dh_installinfo:79 dh_installinit:322 #: dh_installlogcheck:68 dh_installlogrotate:52 dh_installman:255 #: dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 -#: dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 +#: dh_installpam:61 dh_installppp:67 dh_installudev:127 dh_installwm:110 #: dh_installxfonts:88 dh_link:228 dh_listpackages:31 dh_makeshlibs:239 #: dh_md5sums:91 dh_movefiles:172 dh_perl:149 dh_prep:62 dh_python:284 #: dh_strip:229 dh_suidregister:119 dh_testdir:46 dh_testroot:29 @@ -1850,10 +1850,10 @@ msgstr "L" #: dh_gencontrol:83 dh_icons:69 dh_install:278 dh_installchangelogs:173 #: dh_installcron:81 dh_installdeb:112 dh_installdebconf:133 dh_installdirs:90 #: dh_installdocs:302 dh_installemacsen:128 dh_installexamples:110 -#: dh_installifupdown:73 dh_installinfo:81 dh_installinit:280 +#: dh_installifupdown:73 dh_installinfo:81 dh_installinit:324 #: dh_installlogrotate:54 dh_installman:257 dh_installmanpages:201 #: dh_installmenu:93 dh_installmime:99 dh_installmodules:128 dh_installpam:63 -#: dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:90 +#: dh_installppp:69 dh_installudev:129 dh_installwm:112 dh_installxfonts:90 #: dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:241 #: dh_md5sums:93 dh_movefiles:174 dh_perl:151 dh_prep:64 dh_python:286 #: dh_scrollkeeper:32 dh_shlibdeps:172 dh_strip:231 dh_suidregister:121 @@ -3336,7 +3336,7 @@ msgstr "No modifica los scripts de F" +msgid "B<--upstart-only>" +msgstr "B<--no-start>" + +#. type: textblock +#: dh_installinit:127 +msgid "" +"Only install an upstart job file, and do not include maintainer script code " +"to replace an init script with that upstart job." +msgstr "" + +#. type: textblock +#: dh_installinit:130 +msgid "" +"This parameter is intended for use when the \"package.upstart\" file is new " +"and only to be used on Upstart-based systems." +msgstr "" + +# type: =item +#. type: =item +#: dh_installinit:133 msgid "B<--error-handler=>I" msgstr "B<--error-handler=>I" # type: textblock #. type: textblock -#: dh_installinit:127 +#: dh_installinit:135 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# " @@ -4722,14 +4744,16 @@ msgstr "" # type: =head1 #. type: =head1 -#: dh_installinit:282 +#: dh_installinit:326 #, fuzzy msgid "AUTHORS" msgstr "AUTOR" #. type: textblock -#: dh_installinit:286 -msgid "Steve Langasek " +#: dh_installinit:328 +msgid "" +"Joey Hess Steve Langasek " +"Scott James Remnant " msgstr "" # type: textblock @@ -5545,7 +5569,7 @@ msgstr "B<--priority=>I" #: dh_installudev:47 #, fuzzy #| msgid "Sets the priority number of a site-start.d file. Default is 50." -msgid "Sets the priority string of the rules.d symlink. Default is 60." +msgid "Sets the priority string of the rules.d symlink. Default is 40." msgstr "" "Establece el número de prioridad de un fichero site-start.d. 50 es el número " "predeterminado." diff -pruN 7.4.3/man/po4a/po/fr.po 7.4.3ubuntu2/man/po4a/po/fr.po --- 7.4.3/man/po4a/po/fr.po 2009-10-01 19:47:16.000000000 +0100 +++ 7.4.3ubuntu2/man/po4a/po/fr.po 2009-11-02 12:02:48.000000000 +0000 @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: debhelper manpages\n" -"POT-Creation-Date: 2009-10-01 14:21-0300\n" +"POT-Creation-Date: 2009-11-02 13:02+0100\n" "PO-Revision-Date: 2006-11-19 20:50+0100\n" "Last-Translator: Valery Perrin \n" "Language-Team: French \n" @@ -670,7 +670,7 @@ msgstr "" # type: =head1 #. type: =head1 #: debhelper.pod:217 dh_auto_test:44 dh_installcatalogs:59 dh_installdocs:110 -#: dh_installemacsen:67 dh_installexamples:53 dh_installinit:133 +#: dh_installemacsen:67 dh_installexamples:53 dh_installinit:141 #: dh_installman:81 dh_installmime:51 dh_installmodules:60 dh_installudev:55 #: dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68 #: dh_usrlocal:49 @@ -1479,10 +1479,10 @@ msgstr "" #: dh_installcatalogs:116 dh_installchangelogs:169 dh_installcron:77 #: dh_installdeb:108 dh_installdebconf:129 dh_installdirs:86 #: dh_installdocs:298 dh_installemacsen:124 dh_installexamples:106 -#: dh_installifupdown:69 dh_installinfo:77 dh_installinit:276 +#: dh_installifupdown:69 dh_installinfo:77 dh_installinit:320 #: dh_installlogcheck:66 dh_installlogrotate:50 dh_installman:253 #: dh_installmanpages:197 dh_installmenu:87 dh_installmime:95 -#: dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:115 +#: dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:125 #: dh_installwm:108 dh_installxfonts:86 dh_link:226 dh_lintian:57 #: dh_listpackages:29 dh_makeshlibs:237 dh_md5sums:89 dh_movefiles:170 #: dh_perl:147 dh_prep:60 dh_python:282 dh_scrollkeeper:28 dh_shlibdeps:168 @@ -1528,7 +1528,7 @@ msgstr "Le site internet de debhelper." #: dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:72 #: dh_installlogrotate:56 dh_installman:259 dh_installmanpages:203 #: dh_installmenu:95 dh_installmime:101 dh_installmodules:130 dh_installpam:65 -#: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:92 +#: dh_installppp:71 dh_installudev:131 dh_installwm:114 dh_installxfonts:92 #: dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:243 #: dh_md5sums:95 dh_movefiles:176 dh_perl:153 dh_prep:66 dh_python:288 #: dh_scrollkeeper:34 dh_shlibdeps:174 dh_strip:233 dh_suidregister:123 @@ -1545,12 +1545,12 @@ msgstr "AUTEUR" #: dh_install:282 dh_installchangelogs:177 dh_installcron:85 dh_installdeb:116 #: dh_installdebconf:137 dh_installdirs:94 dh_installdocs:306 #: dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 -#: dh_installinfo:85 dh_installinit:284 dh_installlogrotate:58 -#: dh_installman:261 dh_installmanpages:205 dh_installmenu:97 -#: dh_installmime:103 dh_installmodules:132 dh_installpam:67 dh_installppp:73 -#: dh_installudev:123 dh_installwm:116 dh_installxfonts:94 dh_link:234 -#: dh_listpackages:37 dh_makeshlibs:245 dh_md5sums:97 dh_movefiles:178 -#: dh_prep:68 dh_shlibdeps:176 dh_strip:235 dh_suidregister:125 dh_testdir:52 +#: dh_installinfo:85 dh_installlogrotate:58 dh_installman:261 +#: dh_installmanpages:205 dh_installmenu:97 dh_installmime:103 +#: dh_installmodules:132 dh_installpam:67 dh_installppp:73 dh_installudev:133 +#: dh_installwm:116 dh_installxfonts:94 dh_link:234 dh_listpackages:37 +#: dh_makeshlibs:245 dh_md5sums:97 dh_movefiles:178 dh_prep:68 +#: dh_shlibdeps:176 dh_strip:235 dh_suidregister:125 dh_testdir:52 #: dh_testroot:35 dh_testversion:83 dh_undocumented:36 msgid "Joey Hess " msgstr "Joey Hess " @@ -2041,10 +2041,10 @@ msgstr "" #: dh_install:276 dh_installcatalogs:118 dh_installchangelogs:171 #: dh_installcron:79 dh_installdeb:110 dh_installdebconf:131 dh_installdirs:88 #: dh_installdocs:300 dh_installemacsen:126 dh_installexamples:108 -#: dh_installifupdown:71 dh_installinfo:79 dh_installinit:278 +#: dh_installifupdown:71 dh_installinfo:79 dh_installinit:322 #: dh_installlogcheck:68 dh_installlogrotate:52 dh_installman:255 #: dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 -#: dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 +#: dh_installpam:61 dh_installppp:67 dh_installudev:127 dh_installwm:110 #: dh_installxfonts:88 dh_link:228 dh_listpackages:31 dh_makeshlibs:239 #: dh_md5sums:91 dh_movefiles:172 dh_perl:149 dh_prep:62 dh_python:284 #: dh_strip:229 dh_suidregister:119 dh_testdir:46 dh_testroot:29 @@ -2060,10 +2060,10 @@ msgstr "L" #: dh_gencontrol:83 dh_icons:69 dh_install:278 dh_installchangelogs:173 #: dh_installcron:81 dh_installdeb:112 dh_installdebconf:133 dh_installdirs:90 #: dh_installdocs:302 dh_installemacsen:128 dh_installexamples:110 -#: dh_installifupdown:73 dh_installinfo:81 dh_installinit:280 +#: dh_installifupdown:73 dh_installinfo:81 dh_installinit:324 #: dh_installlogrotate:54 dh_installman:257 dh_installmanpages:201 #: dh_installmenu:93 dh_installmime:99 dh_installmodules:128 dh_installpam:63 -#: dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:90 +#: dh_installppp:69 dh_installudev:129 dh_installwm:112 dh_installxfonts:90 #: dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:241 #: dh_md5sums:93 dh_movefiles:174 dh_perl:151 dh_prep:64 dh_python:286 #: dh_scrollkeeper:32 dh_shlibdeps:172 dh_strip:231 dh_suidregister:121 @@ -3699,7 +3699,7 @@ msgstr "" # type: textblock #. type: textblock #: dh_installcatalogs:61 dh_installdocs:116 dh_installemacsen:69 -#: dh_installinit:135 dh_installmime:53 dh_installmodules:62 dh_installudev:57 +#: dh_installinit:143 dh_installmime:53 dh_installmodules:62 dh_installudev:57 #: dh_installwm:56 dh_usrlocal:51 msgid "" "Note that this command is not idempotent. L should be called " @@ -5132,12 +5132,34 @@ msgstr "" # type: =item #. type: =item #: dh_installinit:125 +#, fuzzy +#| msgid "B<--no-start>" +msgid "B<--upstart-only>" +msgstr "B<--no-start>" + +#. type: textblock +#: dh_installinit:127 +msgid "" +"Only install an upstart job file, and do not include maintainer script code " +"to replace an init script with that upstart job." +msgstr "" + +#. type: textblock +#: dh_installinit:130 +msgid "" +"This parameter is intended for use when the \"package.upstart\" file is new " +"and only to be used on Upstart-based systems." +msgstr "" + +# type: =item +#. type: =item +#: dh_installinit:133 msgid "B<--error-handler=>I" msgstr "B<--error-handler=>I" # type: textblock #. type: textblock -#: dh_installinit:127 +#: dh_installinit:135 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# " @@ -5149,15 +5171,16 @@ msgstr "" # type: =head1 #. type: =head1 -#: dh_installinit:282 +#: dh_installinit:326 msgid "AUTHORS" msgstr "AUTEURS" -# type: textblock #. type: textblock -#: dh_installinit:286 -msgid "Steve Langasek " -msgstr "Steve Langasek " +#: dh_installinit:328 +msgid "" +"Joey Hess Steve Langasek " +"Scott James Remnant " +msgstr "" # type: textblock #. type: textblock @@ -5996,7 +6019,9 @@ msgstr "B<--priority=>I" # type: textblock #. type: textblock #: dh_installudev:47 -msgid "Sets the priority string of the rules.d symlink. Default is 60." +#, fuzzy +#| msgid "Sets the priority string of the rules.d symlink. Default is 60." +msgid "Sets the priority string of the rules.d symlink. Default is 40." msgstr "" "Fixe la priorité du lien symbolique des rules.d. La valeur par défaut est 60." @@ -7918,3 +7943,7 @@ msgstr "Charte Debian, version 2.2" #: dh_usrlocal:122 msgid "Andrew Stribblehill " msgstr "Andrew Stribblehill " + +# type: textblock +#~ msgid "Steve Langasek " +#~ msgstr "Steve Langasek "