diff -Nru debhelper-8.0.0/autoscripts/postinst-apparmor debhelper-8.0.0ubuntu1/autoscripts/postinst-apparmor --- debhelper-8.0.0/autoscripts/postinst-apparmor 1970-01-01 02:00:00.000000000 +0200 +++ debhelper-8.0.0ubuntu1/autoscripts/postinst-apparmor 2010-08-07 19:46:11.000000000 +0300 @@ -0,0 +1,23 @@ +if [ "$1" = "configure" ]; then + APP_PROFILE=/etc/apparmor.d/#PROFILE# + if [ -f "$APP_PROFILE" ]; then + # Add the local/ include + LOCAL_APP_PROFILE=/etc/apparmor.d/local/#PROFILE# + + test -e "$LOCAL_APP_PROFILE" || { + tmp=`mktemp` + cat < "$tmp" +# Site-specific additions and overrides for #PROFILE#. +# For more details, please see /etc/apparmor.d/local/README. +EOM + mkdir `dirname $LOCAL_APP_PROFILE` 2>/dev/null || true + mv -f "$tmp" "$LOCAL_APP_PROFILE" + chmod 644 "$LOCAL_APP_PROFILE" + } + + # Reload the profile, including any abstraction updates + if aa-status --enabled 2>/dev/null; then + apparmor_parser -r -T -W "$APP_PROFILE" || true + fi + fi +fi diff -Nru debhelper-8.0.0/autoscripts/postinst-upstart debhelper-8.0.0ubuntu1/autoscripts/postinst-upstart --- debhelper-8.0.0/autoscripts/postinst-upstart 1970-01-01 02:00:00.000000000 +0200 +++ debhelper-8.0.0ubuntu1/autoscripts/postinst-upstart 2010-08-07 19:35:43.000000000 +0300 @@ -0,0 +1,4 @@ +if [ -e "/etc/init/#JOB#.conf" ]; then + # start fails if already running + start #JOB# || : +fi diff -Nru debhelper-8.0.0/autoscripts/postinst-upstart-replace debhelper-8.0.0ubuntu1/autoscripts/postinst-upstart-replace --- debhelper-8.0.0/autoscripts/postinst-upstart-replace 1970-01-01 02:00:00.000000000 +0200 +++ debhelper-8.0.0ubuntu1/autoscripts/postinst-upstart-replace 2010-08-07 19:35:43.000000000 +0300 @@ -0,0 +1 @@ +update-rc.d -f #SCRIPT# remove >/dev/null || #ERROR_HANDLER# diff -Nru debhelper-8.0.0/autoscripts/postinst-upstart-restart debhelper-8.0.0ubuntu1/autoscripts/postinst-upstart-restart --- debhelper-8.0.0/autoscripts/postinst-upstart-restart 1970-01-01 02:00:00.000000000 +0200 +++ debhelper-8.0.0ubuntu1/autoscripts/postinst-upstart-restart 2010-08-07 19:35:43.000000000 +0300 @@ -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 -Nru debhelper-8.0.0/autoscripts/postrm-apparmor debhelper-8.0.0ubuntu1/autoscripts/postrm-apparmor --- debhelper-8.0.0/autoscripts/postrm-apparmor 1970-01-01 02:00:00.000000000 +0200 +++ debhelper-8.0.0ubuntu1/autoscripts/postrm-apparmor 2010-08-07 19:43:16.000000000 +0300 @@ -0,0 +1,6 @@ +if [ "$1" = "purge" ]; then + rm -f "/etc/apparmor.d/disable/#PROFILE#" || true + rm -f "/etc/apparmor.d/force-complain/#PROFILE#" || true + rm -f "/etc/apparmor.d/local/#PROFILE#" || true + rmdir /etc/apparmor.d/local 2>/dev/null || true +fi diff -Nru debhelper-8.0.0/autoscripts/preinst-removeconffile debhelper-8.0.0ubuntu1/autoscripts/preinst-removeconffile --- debhelper-8.0.0/autoscripts/preinst-removeconffile 1970-01-01 02:00:00.000000000 +0200 +++ debhelper-8.0.0ubuntu1/autoscripts/preinst-removeconffile 2010-08-07 19:35:43.000000000 +0300 @@ -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 -Nru debhelper-8.0.0/autoscripts/prerm-upstart debhelper-8.0.0ubuntu1/autoscripts/prerm-upstart --- debhelper-8.0.0/autoscripts/prerm-upstart 1970-01-01 02:00:00.000000000 +0200 +++ debhelper-8.0.0ubuntu1/autoscripts/prerm-upstart 2010-08-07 19:35:43.000000000 +0300 @@ -0,0 +1,4 @@ +if [ -e "/etc/init/#JOB#.conf" ]; then + # stop fails if not running + stop #JOB# || : +fi diff -Nru debhelper-8.0.0/autoscripts/prerm-upstart-norestart debhelper-8.0.0ubuntu1/autoscripts/prerm-upstart-norestart --- debhelper-8.0.0/autoscripts/prerm-upstart-norestart 1970-01-01 02:00:00.000000000 +0200 +++ debhelper-8.0.0ubuntu1/autoscripts/prerm-upstart-norestart 2010-08-07 19:35:43.000000000 +0300 @@ -0,0 +1,4 @@ +if [ -e "/etc/init/#JOB#.conf" ] && [ "$1" = remove ]; then + # stop fails if not running + stop #JOB# || : +fi diff -Nru debhelper-8.0.0/debian/changelog debhelper-8.0.0ubuntu1/debian/changelog --- debhelper-8.0.0/debian/changelog 2010-08-07 18:36:54.000000000 +0300 +++ debhelper-8.0.0ubuntu1/debian/changelog 2010-08-07 19:49:01.000000000 +0300 @@ -1,3 +1,20 @@ +debhelper (8.0.0ubuntu1) maverick; urgency=low + + * Merge with Debian (LP: #614787); remaining 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: Change default init.d symlink priority to 40. + - dh_installchangelogs: Do not install upstream changelog in compat level + 7. This floods packages with huge upstream changelogs which take + precious CD space. + - dh_strip, dh_makeshlibs: use triplet-objdump, triplet-objcopy and + triplet-strip from cross-binutils when cross-compiling; Debian #412118. + - add dh_apparmor and autoscripts + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Sat, 07 Aug 2010 19:46:59 +0300 + debhelper (8.0.0) unstable; urgency=low [ Carsten Hey ] @@ -59,6 +76,55 @@ -- Joey Hess Wed, 16 Jun 2010 13:44:48 -0400 +debhelper (7.4.20ubuntu6) maverick; urgency=low + + * autoscripts/postinst-apparmor: don't 'echo' to stdout. As nice as it + looks, it doesn't play well with debconf and isn't translated. Thanks + to dhcp3 for pointing this out. + + -- Jamie Strandboge Fri, 06 Aug 2010 17:11:13 -0500 + +debhelper (7.4.20ubuntu5) maverick; urgency=low + + * autoscripts/postinst-apparmor: + - tweak logic slightly to be more efficient and add some comments + - chmod 644 the local include file + * dh_apparmor: add note about using -p + + -- Jamie Strandboge Fri, 06 Aug 2010 12:04:08 -0500 + +debhelper (7.4.20ubuntu4) maverick; urgency=low + + * add dh_apparmor and autoscripts + + -- Jamie Strandboge Fri, 06 Aug 2010 08:32:41 -0500 + +debhelper (7.4.20ubuntu3) maverick; urgency=low + + * dh_strip, dh_makeshlibs: use triplet-objdump, triplet-objcopy and + triplet-strip from cross-binutils when cross-compiling; Debian #412118. + + -- Loïc Minier Tue, 03 Aug 2010 16:36:12 -0400 + +debhelper (7.4.20ubuntu2) maverick; urgency=low + + * dh_installchangelogs: Do not install upstream changelog in compat level 7. + This floods packages with huge upstream changelogs which take precious CD + space. + + -- Martin Pitt Sun, 01 Aug 2010 21:07:12 +0200 + +debhelper (7.4.20ubuntu1) maverick; urgency=low + + * Merge with Debian (LP: #583352); remaining 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: Change default init.d symlink priority to 40. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Thu, 20 May 2010 14:37:56 +0300 + debhelper (7.4.20) unstable; urgency=low * Drop one more call to dpkg-architecture. Closes: #580837 @@ -70,6 +136,21 @@ -- Joey Hess Wed, 12 May 2010 20:06:02 -0400 +debhelper (7.4.19ubuntu1) maverick; urgency=low + + * Merge with Debian; remaining 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: Change default init.d symlink priority to 40. + * dh_installudev: Drop conffile migration code, it was only needed until + lucid. + * dh_gconf: Temporarily lower generated gconf dependency to a version which + we actually have. + + -- Martin Pitt Mon, 03 May 2010 11:22:01 +0200 + debhelper (7.4.19) unstable; urgency=low * Memoize architecture comparisons in samearch, and avoid calling @@ -116,6 +197,18 @@ -- Joey Hess Tue, 06 Apr 2010 22:06:50 -0400 +debhelper (7.4.15ubuntu1) lucid; urgency=low + + * Resynchronise with Debian. Remaining 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). + + -- Colin Watson Mon, 22 Feb 2010 12:46:04 +0000 + debhelper (7.4.15) unstable; urgency=low * The fix for #563557 caused some new trouble involving makefile @@ -131,6 +224,18 @@ -- Joey Hess Tue, 16 Feb 2010 14:47:10 -0500 +debhelper (7.4.13ubuntu1) lucid; urgency=low + + * Resynchronise with Debian. Remaining 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). + + -- Colin Watson Thu, 11 Feb 2010 19:02:31 +0000 + debhelper (7.4.13) unstable; urgency=low * dh_compress: Avoid compressing images in /usr/share/info. Closes: #567586 @@ -156,6 +261,18 @@ -- Joey Hess Sat, 30 Jan 2010 20:23:02 -0500 +debhelper (7.4.11ubuntu1) lucid; urgency=low + + * Merge with Debian; remaining 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). + + -- Matthias Klose Thu, 28 Jan 2010 10:44:11 +0100 + debhelper (7.4.11) unstable; urgency=low * dh(1): Minor rewording of documentation of override commands. @@ -172,6 +289,22 @@ -- Joey Hess Thu, 31 Dec 2009 11:32:34 -0500 +debhelper (7.4.10ubuntu1) lucid; urgency=low + + [ أحمد المحمودي (Ahmed El-Mahmoudy) ] + * Merge with Debian unstable (LP: #485956). 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). + + [ Daniel Holbach ] + * Port merge from 7.4.7 to 7.4.10. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Wed, 16 Dec 2009 09:01:54 +0100 + debhelper (7.4.10) unstable; urgency=low * Add --parallel option that can be used to enable parallel building @@ -259,6 +392,25 @@ -- Joey Hess Wed, 18 Nov 2009 14:44:21 -0500 +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 ] @@ -340,6 +492,54 @@ -- 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 @@ -414,6 +614,17 @@ -- 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 -Nru debhelper-8.0.0/debian/control debhelper-8.0.0ubuntu1/debian/control --- debhelper-8.0.0/debian/control 2010-08-07 18:40:02.000000000 +0300 +++ debhelper-8.0.0ubuntu1/debian/control 2010-08-07 19:35:43.000000000 +0300 @@ -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.9.0 Vcs-Git: git://git.debian.org/git/debhelper/debhelper.git diff -Nru debhelper-8.0.0/dh_apparmor debhelper-8.0.0ubuntu1/dh_apparmor --- debhelper-8.0.0/dh_apparmor 1970-01-01 02:00:00.000000000 +0200 +++ debhelper-8.0.0ubuntu1/dh_apparmor 2010-08-07 19:45:11.000000000 +0300 @@ -0,0 +1,72 @@ +#!/usr/bin/perl -w + +=head1 NAME + +dh_apparmor - reload AppArmor profile and create local include + +=cut + +use strict; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B B<--profile-name=>I + +=head1 DESCRIPTION + +dh_apparmor is a debhelper program that will create/remove the +/etc/apparmor.d/local/ include file in maintainer scripts. It +also reloads the specified AppArmor profile in postinst using: + +=over 4 + +apparmor_parser -r -W -T /etc/apparmor.d/ + +=back + +By using '-W -T' we ensure that any abstraction updates are also pulled in. + +=head1 OPTIONS + +=over 4 + +=item B<--profile-name=> + +Specify the profile name. + +=back + +=head1 NOTES + +Note that for packages that have multiple binary packages, you will want to +pass '-p' to dh_apparmor, otherwise dh_apparmor will add +AppArmor reload commands for all packages rather than just the one that +ships the profile. + +=cut + +init(options => { + "profile-name=s" => \$dh{PROFILE_NAME}, +}); + +foreach my $package (@{$dh{DOPACKAGES}}) { + if (! $dh{PROFILE_NAME}) { + error("Must specify --profile-name"); + } + my $pname = $dh{PROFILE_NAME}; + autoscript($package,"postinst","postinst-apparmor","s/#PROFILE#/$pname/"); + autoscript($package,"postrm","postrm-apparmor","s/#PROFILE#/$pname/"); +} + +=head1 SEE ALSO + +L + +This program is a part of debhelper. + +=head1 AUTHOR + +Jamie Strandboge + +=cut diff -Nru debhelper-8.0.0/dh_installchangelogs debhelper-8.0.0ubuntu1/dh_installchangelogs --- debhelper-8.0.0/dh_installchangelogs 2010-06-24 03:35:34.000000000 +0300 +++ debhelper-8.0.0ubuntu1/dh_installchangelogs 2010-08-07 19:39:05.000000000 +0300 @@ -18,9 +18,7 @@ dh_installchangelogs is a debhelper program that is responsible for installing changelogs into package build directories. -An upstream changelog file may be specified as an option. If none is -specified, it looks for files with names that seem likely to be changelogs. -(In compatibility level 7 and above.) +An upstream changelog file may be specified as an option. If there is an upstream changelog file, it will be be installed as usr/share/doc/package/changelog in the package build directory. If the @@ -83,20 +81,6 @@ my $upstream=shift; my $changelog_name="changelog.Debian"; if (! defined $upstream) { - if (! isnative($dh{MAINPACKAGE}) && !compat(6)) { - foreach my $dir (qw{. doc docs}) { - my @files=sort glob("$dir/*"); - foreach my $name (qw{changelog changes changelog.txt changes.txt history history.txt}) { - my @matches=grep { - lc basename($_) eq $name && -s $_ && ! excludefile($_) - } @files; - if (@matches) { - $upstream=shift @matches; - last; - } - } - } - } if (isnative($dh{MAINPACKAGE})) { $changelog_name='changelog'; } diff -Nru debhelper-8.0.0/dh_installinit debhelper-8.0.0ubuntu1/dh_installinit --- debhelper-8.0.0/dh_installinit 2010-06-24 03:35:34.000000000 +0300 +++ debhelper-8.0.0ubuntu1/dh_installinit 2010-08-07 19:35:43.000000000 +0300 @@ -122,6 +122,14 @@ 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-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,11 +229,8 @@ doit("install","-p","-m755",$init,"$tmp/etc/init.d/$script"); } - if ($job ne '' || $init ne '' || $dh{ONLYSCRIPTS}) { - if (-e "$tmp/etc/init/$jobfile.conf") { - $script=$jobfile; - } - + if ($init ne '' || ($dh{ONLYSCRIPTS} && ! -e "$tmp/etc/init/$jobfile.conf")) + { # 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". @@ -270,6 +278,43 @@ "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 @@ -284,4 +329,6 @@ Steve Langasek +Scott James Remnant + =cut diff -Nru debhelper-8.0.0/dh_installudev debhelper-8.0.0ubuntu1/dh_installudev --- debhelper-8.0.0/dh_installudev 2010-06-24 03:35:34.000000000 +0300 +++ debhelper-8.0.0ubuntu1/dh_installudev 2010-08-07 19:35:43.000000000 +0300 @@ -44,7 +44,7 @@ =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> @@ -73,7 +73,7 @@ } if (! defined $dh{PRIORITY}) { - $dh{PRIORITY}="60"; + $dh{PRIORITY}="40"; $old_priority="z60"; } if ($dh{PRIORITY}) { diff -Nru debhelper-8.0.0/dh_makeshlibs debhelper-8.0.0ubuntu1/dh_makeshlibs --- debhelper-8.0.0/dh_makeshlibs 2010-06-24 03:35:34.000000000 +0300 +++ debhelper-8.0.0ubuntu1/dh_makeshlibs 2010-08-07 19:41:20.000000000 +0300 @@ -121,6 +121,13 @@ "add-udeb=s" => \$dh{SHLIBS_UDEB}, }); +my $od = "objdump"; +# cross-compiling? +if (dpkg_architecture_value("DEB_BUILD_GNU_TYPE") + ne dpkg_architecture_value("DEB_HOST_GNU_TYPE")) { + $od=dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-objdump"; +} + foreach my $package (@{$dh{DOPACKAGES}}) { next if is_udeb($package); @@ -146,7 +153,7 @@ while () { my ($library, $major); push @lib_files, $_; - my $objdump=`objdump -p $_`; + my $objdump=`$od -p $_`; if ($objdump=~m/\s+SONAME\s+(.+)\.so\.(.+)/) { # proper soname format $library=$1; diff -Nru debhelper-8.0.0/dh_strip debhelper-8.0.0ubuntu1/dh_strip --- debhelper-8.0.0/dh_strip 2010-06-24 03:35:34.000000000 +0300 +++ debhelper-8.0.0ubuntu1/dh_strip 2010-08-07 19:40:09.000000000 +0300 @@ -86,6 +86,15 @@ exit; } +my $objcopy = "objcopy"; +my $strip = "strip"; +# cross-compiling? +if (dpkg_architecture_value("DEB_BUILD_GNU_TYPE") + ne dpkg_architecture_value("DEB_HOST_GNU_TYPE")) { + $objcopy=dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-objcopy"; + $strip=dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-strip"; +} + # I could just use `file $_[0]`, but this is safer sub get_file_type { my $file=shift; @@ -163,7 +172,7 @@ if (! -d $debug_dir) { doit("install", "-d", $debug_dir); } - doit("objcopy", "--only-keep-debug", $file, $debug_path); + doit($objcopy, "--only-keep-debug", $file, $debug_path); # No reason for this to be executable. doit("chmod", 644, $debug_path); return $debug_path; @@ -172,7 +181,7 @@ sub attach_debug { my $file=shift; my $debug_path=shift; - doit("objcopy", "--add-gnu-debuglink", $debug_path, $file); + doit($objcopy, "--add-gnu-debuglink", $debug_path, $file); } foreach my $package (@{$dh{DOPACKAGES}}) { @@ -207,20 +216,20 @@ my $debug_path = make_debug($_, $tmp, $debugtmp) if $keep_debug; # Note that all calls to strip on shared libs # *must* inclde the --strip-unneeded. - doit("strip","--remove-section=.comment", + doit($strip,"--remove-section=.comment", "--remove-section=.note","--strip-unneeded",$_); attach_debug($_, $debug_path) if defined $debug_path; } foreach (@executables) { my $debug_path = make_debug($_, $tmp, $debugtmp) if $keep_debug; - doit("strip","--remove-section=.comment", + doit($strip,"--remove-section=.comment", "--remove-section=.note",$_); attach_debug($_, $debug_path) if defined $debug_path; } foreach (@static_libs) { - doit("strip","--strip-debug",$_); + doit($strip,"--strip-debug",$_); } } diff -Nru debhelper-8.0.0/man/po4a/po/debhelper.pot debhelper-8.0.0ubuntu1/man/po4a/po/debhelper.pot --- debhelper-8.0.0/man/po4a/po/debhelper.pot 2010-08-07 18:37:01.000000000 +0300 +++ debhelper-8.0.0ubuntu1/man/po4a/po/debhelper.pot 2010-08-07 19:49:11.000000000 +0300 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-08-07 11:36-0300\n" +"POT-Creation-Date: 2010-08-07 19:49+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -509,7 +509,7 @@ msgstr "" #. type: =head1 -#: debhelper.pod:253 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:253 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 "" @@ -1087,7 +1087,7 @@ msgstr "" #. type: =head1 -#: debhelper.pod:611 dh:748 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:91 dh_clean:138 dh_compress:204 dh_desktop:31 dh_fixperms:129 dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:279 dh_installcatalogs:116 dh_installchangelogs:171 dh_installcron:77 dh_installdeb:108 dh_installdebconf:126 dh_installdirs:86 dh_installdocs:301 dh_installemacsen:124 dh_installexamples:106 dh_installifupdown:69 dh_installinfo:77 dh_installinit:275 dh_installlogcheck:66 dh_installlogrotate:50 dh_installman:258 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:87 dh_link:226 dh_lintian:57 dh_listpackages:29 dh_makeshlibs:243 dh_md5sums:90 dh_movefiles:170 dh_perl:146 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:171 dh_strip:227 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_undocumented:28 dh_usrlocal:114 +#: debhelper.pod:611 dh:748 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:91 dh_clean:138 dh_compress:204 dh_desktop:31 dh_fixperms:129 dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:279 dh_installcatalogs:116 dh_installchangelogs:155 dh_installcron:77 dh_installdeb:108 dh_installdebconf:126 dh_installdirs:86 dh_installdocs:301 dh_installemacsen:124 dh_installexamples:106 dh_installifupdown:69 dh_installinfo:77 dh_installinit:320 dh_installlogcheck:66 dh_installlogrotate:50 dh_installman:258 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:87 dh_link:226 dh_lintian:57 dh_listpackages:29 dh_makeshlibs:250 dh_md5sums:90 dh_movefiles:170 dh_perl:146 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:171 dh_strip:236 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_undocumented:28 dh_usrlocal:114 msgid "SEE ALSO" msgstr "" @@ -1112,12 +1112,12 @@ msgstr "" #. type: =head1 -#: debhelper.pod:625 dh:754 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:97 dh_clean:144 dh_compress:210 dh_desktop:37 dh_fixperms:135 dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:285 dh_installcatalogs:122 dh_installchangelogs:177 dh_installcron:83 dh_installdeb:114 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:307 dh_installemacsen:130 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:72 dh_installlogrotate:56 dh_installman:264 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:93 dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:249 dh_md5sums:96 dh_movefiles:176 dh_perl:152 dh_prep:66 dh_python:286 dh_scrollkeeper:34 dh_shlibdeps:177 dh_strip:233 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_undocumented:34 dh_usrlocal:120 +#: debhelper.pod:625 dh:754 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:97 dh_clean:144 dh_compress:210 dh_desktop:37 dh_fixperms:135 dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:285 dh_installcatalogs:122 dh_installchangelogs:161 dh_installcron:83 dh_installdeb:114 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:307 dh_installemacsen:130 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:72 dh_installlogrotate:56 dh_installman:264 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:93 dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:256 dh_md5sums:96 dh_movefiles:176 dh_perl:152 dh_prep:66 dh_python:286 dh_scrollkeeper:34 dh_shlibdeps:177 dh_strip:242 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_undocumented:34 dh_usrlocal:120 msgid "AUTHOR" msgstr "" #. type: textblock -#: debhelper.pod:627 dh:756 dh_auto_build:55 dh_auto_clean:56 dh_auto_configure:61 dh_auto_install:93 dh_auto_test:66 dh_builddeb:99 dh_clean:146 dh_compress:212 dh_fixperms:137 dh_gencontrol:90 dh_install:287 dh_installchangelogs:179 dh_installcron:85 dh_installdeb:116 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:309 dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:85 dh_installinit:283 dh_installlogrotate:58 dh_installman:266 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:95 dh_link:234 dh_listpackages:37 dh_makeshlibs:251 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:179 dh_strip:235 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_undocumented:36 +#: debhelper.pod:627 dh:756 dh_auto_build:55 dh_auto_clean:56 dh_auto_configure:61 dh_auto_install:93 dh_auto_test:66 dh_builddeb:99 dh_clean:146 dh_compress:212 dh_fixperms:137 dh_gencontrol:90 dh_install:287 dh_installchangelogs:163 dh_installcron:85 dh_installdeb:116 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:309 dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:85 dh_installinit:328 dh_installlogrotate:58 dh_installman:266 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:95 dh_link:234 dh_listpackages:37 dh_makeshlibs:258 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:179 dh_strip:244 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_undocumented:36 msgid "Joey Hess " msgstr "" @@ -1163,7 +1163,7 @@ msgstr "" #. type: =head1 -#: dh:33 dh_auto_build:28 dh_auto_clean:29 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:30 dh_bugfiles:50 dh_builddeb:21 dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:56 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:60 dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:48 dh_installlogrotate:22 dh_installman:60 dh_installmanpages:40 dh_installmenu:41 dh_installmime:41 dh_installmodules:44 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:51 dh_makeshlibs:38 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_python:39 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_usrlocal:39 +#: dh:33 dh_auto_build:28 dh_auto_clean:29 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:30 dh_bugfiles:50 dh_builddeb:21 dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:54 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:60 dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:48 dh_installlogrotate:22 dh_installman:60 dh_installmanpages:40 dh_installmenu:41 dh_installmime:41 dh_installmodules:44 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:51 dh_makeshlibs:38 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_python:39 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_usrlocal:39 msgid "OPTIONS" msgstr "" @@ -1598,12 +1598,12 @@ msgstr "" #. type: textblock -#: dh:750 dh_auto_build:49 dh_auto_clean:50 dh_auto_configure:55 dh_auto_install:87 dh_auto_test:60 dh_builddeb:93 dh_clean:140 dh_compress:206 dh_fixperms:131 dh_gconf:101 dh_gencontrol:84 dh_install:281 dh_installcatalogs:118 dh_installchangelogs:173 dh_installcron:79 dh_installdeb:110 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:303 dh_installemacsen:126 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:79 dh_installinit:277 dh_installlogcheck:68 dh_installlogrotate:52 dh_installman:260 dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_listpackages:31 dh_makeshlibs:245 dh_md5sums:92 dh_movefiles:172 dh_perl:148 dh_prep:62 dh_python:282 dh_strip:229 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_undocumented:30 dh_usrlocal:116 +#: dh:750 dh_auto_build:49 dh_auto_clean:50 dh_auto_configure:55 dh_auto_install:87 dh_auto_test:60 dh_builddeb:93 dh_clean:140 dh_compress:206 dh_fixperms:131 dh_gconf:101 dh_gencontrol:84 dh_install:281 dh_installcatalogs:118 dh_installchangelogs:157 dh_installcron:79 dh_installdeb:110 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:303 dh_installemacsen:126 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:79 dh_installinit:322 dh_installlogcheck:68 dh_installlogrotate:52 dh_installman:260 dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_listpackages:31 dh_makeshlibs:252 dh_md5sums:92 dh_movefiles:172 dh_perl:148 dh_prep:62 dh_python:282 dh_strip:238 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_undocumented:30 dh_usrlocal:116 msgid "L" msgstr "" #. type: textblock -#: dh:752 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:95 dh_clean:142 dh_compress:208 dh_desktop:35 dh_fixperms:133 dh_gconf:103 dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:175 dh_installcron:81 dh_installdeb:112 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:305 dh_installemacsen:128 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:81 dh_installinit:279 dh_installlogrotate:54 dh_installman:262 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:91 dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:247 dh_md5sums:94 dh_movefiles:174 dh_perl:150 dh_prep:64 dh_python:284 dh_scrollkeeper:32 dh_shlibdeps:175 dh_strip:231 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_undocumented:32 dh_usrlocal:118 +#: dh:752 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:95 dh_clean:142 dh_compress:208 dh_desktop:35 dh_fixperms:133 dh_gconf:103 dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:159 dh_installcron:81 dh_installdeb:112 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:305 dh_installemacsen:128 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:81 dh_installinit:324 dh_installlogrotate:54 dh_installman:262 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:91 dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:254 dh_md5sums:94 dh_movefiles:174 dh_perl:150 dh_prep:64 dh_python:284 dh_scrollkeeper:32 dh_shlibdeps:175 dh_strip:240 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_undocumented:32 dh_usrlocal:118 msgid "This program is a part of debhelper." msgstr "" @@ -1879,7 +1879,7 @@ msgstr "" #. type: =head1 -#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38 dh_installcatalogs:35 dh_installchangelogs:32 dh_installcron:21 dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:50 dh_installmenu:25 dh_installmime:25 dh_installmodules:29 dh_installpam:21 dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:39 dh_lintian:21 dh_makeshlibs:24 dh_movefiles:26 +#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38 dh_installcatalogs:35 dh_installchangelogs:30 dh_installcron:21 dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:50 dh_installmenu:25 dh_installmime:25 dh_installmodules:29 dh_installpam:21 dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:39 dh_lintian:21 dh_makeshlibs:24 dh_movefiles:26 msgid "FILES" msgstr "" @@ -2057,7 +2057,7 @@ msgstr "" #. type: =item -#: dh_clean:45 dh_installchangelogs:60 +#: dh_clean:45 dh_installchangelogs:58 msgid "B<-k>, B<--keep>" msgstr "" @@ -2501,7 +2501,7 @@ msgstr "" #. type: =item -#: dh_install:76 dh_installchangelogs:68 dh_installdocs:69 dh_installexamples:41 dh_link:60 dh_movefiles:50 +#: dh_install:76 dh_installchangelogs:66 dh_installdocs:69 dh_installexamples:41 dh_link:60 dh_movefiles:50 msgid "B<-Xitem>, B<--exclude=item>" msgstr "" @@ -2707,7 +2707,7 @@ msgstr "" #. type: textblock -#: dh_installcatalogs:61 dh_installdocs:116 dh_installemacsen:69 dh_installinit:135 dh_installmime:53 dh_installmodules:62 dh_installudev:57 dh_installwm:56 dh_usrlocal:51 +#: dh_installcatalogs:61 dh_installdocs:116 dh_installemacsen:69 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 " "between invocations of this command. Otherwise, it may cause multiple " @@ -2745,14 +2745,11 @@ #. type: textblock #: dh_installchangelogs:21 -msgid "" -"An upstream changelog file may be specified as an option. If none is " -"specified, it looks for files with names that seem likely to be changelogs. " -"(In compatibility level 7 and above.)" +msgid "An upstream changelog file may be specified as an option." msgstr "" #. type: textblock -#: dh_installchangelogs:25 +#: dh_installchangelogs:23 msgid "" "If there is an upstream changelog file, it will be be installed as " "usr/share/doc/package/changelog in the package build directory. If the " @@ -2763,41 +2760,41 @@ msgstr "" #. type: =item -#: dh_installchangelogs:36 +#: dh_installchangelogs:34 msgid "debian/changelog" msgstr "" #. type: =item -#: dh_installchangelogs:38 +#: dh_installchangelogs:36 msgid "debian/NEWS" msgstr "" #. type: =item -#: dh_installchangelogs:40 +#: dh_installchangelogs:38 msgid "debian/I.changelog" msgstr "" #. type: =item -#: dh_installchangelogs:42 +#: dh_installchangelogs:40 msgid "debian/I.NEWS" msgstr "" #. type: textblock -#: dh_installchangelogs:44 +#: dh_installchangelogs:42 msgid "" "Automatically installed into usr/share/doc/I/ in the package build " "directory." msgstr "" #. type: textblock -#: dh_installchangelogs:47 +#: dh_installchangelogs:45 msgid "" "Use the package specific name if I needs a different NEWS or " "changelog file." msgstr "" #. type: textblock -#: dh_installchangelogs:50 +#: dh_installchangelogs:48 msgid "" "The changelog file is installed with a name of changelog for native " "packages, and changelog.Debian for non-native packages. The NEWS file is " @@ -2805,7 +2802,7 @@ msgstr "" #. type: textblock -#: dh_installchangelogs:62 +#: dh_installchangelogs:60 msgid "" "Keep the original name of the upstream changelog. This will be accomplished " "by installing the upstream changelog as \"changelog\", and making a symlink " @@ -2815,19 +2812,19 @@ msgstr "" #. type: textblock -#: dh_installchangelogs:70 +#: dh_installchangelogs:68 msgid "" "Exclude upstream changelog files that contain \"item\" anywhere in their " "filename from being installed." msgstr "" #. type: =item -#: dh_installchangelogs:73 +#: dh_installchangelogs:71 msgid "I" msgstr "" #. type: textblock -#: dh_installchangelogs:75 +#: dh_installchangelogs:73 msgid "Install this file as the upstream changelog." msgstr "" @@ -3733,28 +3730,52 @@ #. 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:281 +#: dh_installinit:326 msgid "AUTHORS" msgstr "" #. type: textblock -#: dh_installinit:285 +#: dh_installinit:330 msgid "Steve Langasek " msgstr "" #. type: textblock +#: dh_installinit:332 +msgid "Scott James Remnant " +msgstr "" + +#. type: textblock #: dh_installlogcheck:5 msgid "dh_installlogcheck - install logcheck rulefiles into etc/logcheck/" msgstr "" @@ -4331,7 +4352,7 @@ #. 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 -Nru debhelper-8.0.0/man/po4a/po/es.po debhelper-8.0.0ubuntu1/man/po4a/po/es.po --- debhelper-8.0.0/man/po4a/po/es.po 2010-08-07 18:37:02.000000000 +0300 +++ debhelper-8.0.0ubuntu1/man/po4a/po/es.po 2010-08-07 19:49:11.000000000 +0300 @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-08-07 11:36-0300\n" +"POT-Creation-Date: 2010-08-07 19:49+0400\n" "PO-Revision-Date: 2005-09-18 00:11+0200\n" "Last-Translator: Rubén Porras Campo \n" "Language-Team: SPANISH \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: ENCODING\n" +"Language: \n" # type: =head1 #. type: =head1 @@ -712,7 +712,7 @@ # type: =head1 #. type: =head1 #: debhelper.pod:253 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 @@ -1522,17 +1522,17 @@ #: dh_auto_configure:53 dh_auto_install:85 dh_auto_test:58 dh_bugfiles:122 #: dh_builddeb:91 dh_clean:138 dh_compress:204 dh_desktop:31 dh_fixperms:129 #: dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:279 -#: dh_installcatalogs:116 dh_installchangelogs:171 dh_installcron:77 +#: dh_installcatalogs:116 dh_installchangelogs:155 dh_installcron:77 #: dh_installdeb:108 dh_installdebconf:126 dh_installdirs:86 #: dh_installdocs:301 dh_installemacsen:124 dh_installexamples:106 -#: dh_installifupdown:69 dh_installinfo:77 dh_installinit:275 +#: dh_installifupdown:69 dh_installinfo:77 dh_installinit:320 #: dh_installlogcheck:66 dh_installlogrotate:50 dh_installman:258 #: 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:87 dh_link:226 dh_lintian:57 -#: dh_listpackages:29 dh_makeshlibs:243 dh_md5sums:90 dh_movefiles:170 +#: dh_listpackages:29 dh_makeshlibs:250 dh_md5sums:90 dh_movefiles:170 #: dh_perl:146 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:171 -#: dh_strip:227 dh_suidregister:117 dh_testdir:44 dh_testroot:27 +#: dh_strip:236 dh_suidregister:117 dh_testdir:44 dh_testroot:27 #: dh_undocumented:28 dh_usrlocal:114 msgid "SEE ALSO" msgstr "VÉASE ADEMÁS" @@ -1567,16 +1567,16 @@ #: dh_auto_configure:59 dh_auto_install:91 dh_auto_test:64 dh_bugfiles:130 #: dh_builddeb:97 dh_clean:144 dh_compress:210 dh_desktop:37 dh_fixperms:135 #: dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:285 -#: dh_installcatalogs:122 dh_installchangelogs:177 dh_installcron:83 +#: dh_installcatalogs:122 dh_installchangelogs:161 dh_installcron:83 #: dh_installdeb:114 dh_installdebconf:132 dh_installdirs:92 #: dh_installdocs:307 dh_installemacsen:130 dh_installexamples:112 #: dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:72 #: dh_installlogrotate:56 dh_installman:264 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:93 -#: dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:249 +#: dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:256 #: dh_md5sums:96 dh_movefiles:176 dh_perl:152 dh_prep:66 dh_python:286 -#: dh_scrollkeeper:34 dh_shlibdeps:177 dh_strip:233 dh_suidregister:123 +#: dh_scrollkeeper:34 dh_shlibdeps:177 dh_strip:242 dh_suidregister:123 #: dh_testdir:50 dh_testroot:33 dh_undocumented:34 dh_usrlocal:120 msgid "AUTHOR" msgstr "AUTOR" @@ -1586,15 +1586,15 @@ #: debhelper.pod:627 dh:756 dh_auto_build:55 dh_auto_clean:56 #: dh_auto_configure:61 dh_auto_install:93 dh_auto_test:66 dh_builddeb:99 #: dh_clean:146 dh_compress:212 dh_fixperms:137 dh_gencontrol:90 -#: dh_install:287 dh_installchangelogs:179 dh_installcron:85 dh_installdeb:116 +#: dh_install:287 dh_installchangelogs:163 dh_installcron:85 dh_installdeb:116 #: dh_installdebconf:134 dh_installdirs:94 dh_installdocs:309 #: dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 -#: dh_installinfo:85 dh_installinit:283 dh_installlogrotate:58 +#: dh_installinfo:85 dh_installinit:328 dh_installlogrotate:58 #: dh_installman:266 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:95 dh_link:234 -#: dh_listpackages:37 dh_makeshlibs:251 dh_md5sums:98 dh_movefiles:178 -#: dh_prep:68 dh_shlibdeps:179 dh_strip:235 dh_suidregister:125 dh_testdir:52 +#: dh_listpackages:37 dh_makeshlibs:258 dh_md5sums:98 dh_movefiles:178 +#: dh_prep:68 dh_shlibdeps:179 dh_strip:244 dh_suidregister:125 dh_testdir:52 #: dh_testroot:35 dh_undocumented:36 msgid "Joey Hess " msgstr "Joey Hess " @@ -1645,7 +1645,7 @@ #: dh:33 dh_auto_build:28 dh_auto_clean:29 dh_auto_configure:31 #: dh_auto_install:43 dh_auto_test:30 dh_bugfiles:50 dh_builddeb:21 #: dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 -#: dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:56 +#: dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:54 #: dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:60 #: dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39 #: dh_installinfo:31 dh_installinit:48 dh_installlogrotate:22 dh_installman:60 @@ -2108,16 +2108,16 @@ #: dh:750 dh_auto_build:49 dh_auto_clean:50 dh_auto_configure:55 #: dh_auto_install:87 dh_auto_test:60 dh_builddeb:93 dh_clean:140 #: dh_compress:206 dh_fixperms:131 dh_gconf:101 dh_gencontrol:84 -#: dh_install:281 dh_installcatalogs:118 dh_installchangelogs:173 +#: dh_install:281 dh_installcatalogs:118 dh_installchangelogs:157 #: dh_installcron:79 dh_installdeb:110 dh_installdebconf:128 dh_installdirs:88 #: dh_installdocs:303 dh_installemacsen:126 dh_installexamples:108 -#: dh_installifupdown:71 dh_installinfo:79 dh_installinit:277 +#: dh_installifupdown:71 dh_installinfo:79 dh_installinit:322 #: dh_installlogcheck:68 dh_installlogrotate:52 dh_installman:260 #: dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 #: dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 -#: dh_installxfonts:89 dh_link:228 dh_listpackages:31 dh_makeshlibs:245 +#: dh_installxfonts:89 dh_link:228 dh_listpackages:31 dh_makeshlibs:252 #: dh_md5sums:92 dh_movefiles:172 dh_perl:148 dh_prep:62 dh_python:282 -#: dh_strip:229 dh_suidregister:119 dh_testdir:46 dh_testroot:29 +#: dh_strip:238 dh_suidregister:119 dh_testdir:46 dh_testroot:29 #: dh_undocumented:30 dh_usrlocal:116 msgid "L" msgstr "L" @@ -2127,16 +2127,16 @@ #: dh:752 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:95 #: dh_clean:142 dh_compress:208 dh_desktop:35 dh_fixperms:133 dh_gconf:103 -#: dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:175 +#: dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:159 #: dh_installcron:81 dh_installdeb:112 dh_installdebconf:130 dh_installdirs:90 #: dh_installdocs:305 dh_installemacsen:128 dh_installexamples:110 -#: dh_installifupdown:73 dh_installinfo:81 dh_installinit:279 +#: dh_installifupdown:73 dh_installinfo:81 dh_installinit:324 #: dh_installlogrotate:54 dh_installman:262 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:91 -#: dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:247 +#: dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:254 #: dh_md5sums:94 dh_movefiles:174 dh_perl:150 dh_prep:64 dh_python:284 -#: dh_scrollkeeper:32 dh_shlibdeps:175 dh_strip:231 dh_suidregister:121 +#: dh_scrollkeeper:32 dh_shlibdeps:175 dh_strip:240 dh_suidregister:121 #: dh_testdir:48 dh_testroot:31 dh_undocumented:32 dh_usrlocal:118 msgid "This program is a part of debhelper." msgstr "Este programa es parte de debhelper." @@ -2458,7 +2458,7 @@ #. type: =head1 #: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38 -#: dh_installcatalogs:35 dh_installchangelogs:32 dh_installcron:21 +#: dh_installcatalogs:35 dh_installchangelogs:30 dh_installcron:21 #: dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 #: dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 #: dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:50 @@ -2681,7 +2681,7 @@ # type: =item #. type: =item -#: dh_clean:45 dh_installchangelogs:60 +#: dh_clean:45 dh_installchangelogs:58 msgid "B<-k>, B<--keep>" msgstr "B<-k>, B<--keep>" @@ -3324,7 +3324,7 @@ # type: =item #. type: =item -#: dh_install:76 dh_installchangelogs:68 dh_installdocs:69 +#: dh_install:76 dh_installchangelogs:66 dh_installdocs:69 #: dh_installexamples:41 dh_link:60 dh_movefiles:50 msgid "B<-Xitem>, B<--exclude=item>" msgstr "B<-Xelemento>, B<--exclude=elemento>" @@ -3619,7 +3619,7 @@ # 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 #, fuzzy msgid "" @@ -3674,15 +3674,12 @@ #. type: textblock #: dh_installchangelogs:21 -msgid "" -"An upstream changelog file may be specified as an option. If none is " -"specified, it looks for files with names that seem likely to be changelogs. " -"(In compatibility level 7 and above.)" +msgid "An upstream changelog file may be specified as an option." msgstr "" # type: textblock #. type: textblock -#: dh_installchangelogs:25 +#: dh_installchangelogs:23 #, fuzzy msgid "" "If there is an upstream changelog file, it will be be installed as usr/share/" @@ -3700,28 +3697,28 @@ "changelog." #. type: =item -#: dh_installchangelogs:36 +#: dh_installchangelogs:34 msgid "debian/changelog" msgstr "" #. type: =item -#: dh_installchangelogs:38 +#: dh_installchangelogs:36 msgid "debian/NEWS" msgstr "" #. type: =item -#: dh_installchangelogs:40 +#: dh_installchangelogs:38 msgid "debian/I.changelog" msgstr "" #. type: =item -#: dh_installchangelogs:42 +#: dh_installchangelogs:40 msgid "debian/I.NEWS" msgstr "" # type: textblock #. type: textblock -#: dh_installchangelogs:44 +#: dh_installchangelogs:42 #, fuzzy msgid "" "Automatically installed into usr/share/doc/I/ in the package build " @@ -3731,14 +3728,14 @@ "paquete en el directorio de construcción del paquete." #. type: textblock -#: dh_installchangelogs:47 +#: dh_installchangelogs:45 msgid "" "Use the package specific name if I needs a different NEWS or " "changelog file." msgstr "" #. type: textblock -#: dh_installchangelogs:50 +#: dh_installchangelogs:48 msgid "" "The changelog file is installed with a name of changelog for native " "packages, and changelog.Debian for non-native packages. The NEWS file is " @@ -3747,7 +3744,7 @@ # type: textblock #. type: textblock -#: dh_installchangelogs:62 +#: dh_installchangelogs:60 msgid "" "Keep the original name of the upstream changelog. This will be accomplished " "by installing the upstream changelog as \"changelog\", and making a symlink " @@ -3765,7 +3762,7 @@ # type: textblock #. type: textblock -#: dh_installchangelogs:70 +#: dh_installchangelogs:68 #, fuzzy msgid "" "Exclude upstream changelog files that contain \"item\" anywhere in their " @@ -3776,13 +3773,13 @@ # type: =item #. type: =item -#: dh_installchangelogs:73 +#: dh_installchangelogs:71 msgid "I" msgstr "I" # type: textblock #. type: textblock -#: dh_installchangelogs:75 +#: dh_installchangelogs:73 msgid "Install this file as the upstream changelog." msgstr "" "Instala este fichero como el fichero de cambios del desarrollador principal." @@ -4987,12 +4984,34 @@ # 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# " @@ -5004,16 +5023,21 @@ # type: =head1 #. type: =head1 -#: dh_installinit:281 +#: dh_installinit:326 #, fuzzy msgid "AUTHORS" msgstr "AUTOR" #. type: textblock -#: dh_installinit:285 +#: dh_installinit:330 msgid "Steve Langasek " msgstr "" +#. type: textblock +#: dh_installinit:332 +msgid "Scott James Remnant " +msgstr "" + # type: textblock #. type: textblock #: dh_installlogcheck:5 @@ -5834,7 +5858,7 @@ #: 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 -Nru debhelper-8.0.0/man/po4a/po/fr.po debhelper-8.0.0ubuntu1/man/po4a/po/fr.po --- debhelper-8.0.0/man/po4a/po/fr.po 2010-08-07 18:37:02.000000000 +0300 +++ debhelper-8.0.0ubuntu1/man/po4a/po/fr.po 2010-08-07 19:49:12.000000000 +0300 @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: debhelper manpages\n" -"POT-Creation-Date: 2010-08-07 11:36-0300\n" +"POT-Creation-Date: 2010-08-07 19:49+0400\n" "PO-Revision-Date: 2010-02-18 21:31+0100\n" "Last-Translator: Valery Perrin \n" "Language-Team: French \n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "X-Generator: KBabel 1.9.1\n" # type: =head1 @@ -221,8 +221,8 @@ "changelog> et F, qui se trouvent dans tous les paquets, et " "pas seulement dans ceux qui emploient debhelper, d'autres fichiers peuvent " "servir à configurer le comportement des commandes spécifiques de debhelper. " -"Ces fichiers sont, en principe, nommés debian/paquet.toto (où « paquet » " -"est, bien sûr, à remplacer par le nom du paquet concerné)." +"Ces fichiers sont, en principe, nommés debian/paquet.toto (où « paquet » est, " +"bien sûr, à remplacer par le nom du paquet concerné)." # type: textblock #. type: textblock @@ -287,8 +287,8 @@ "indiquer divers types de fichiers. Documentation, fichiers d'exemples à " "installer, fichiers à déplacer et ainsi de suite. Lorsque cela se justifie, " "dans des cas comme ceux-ci, il est possible d'employer, dans ces fichiers, " -"les jokers (wildcard) standard de l'interpréteur de commandes (shell) " -"(« ? », « * » et « [..] »)." +"les jokers (wildcard) standard de l'interpréteur de commandes (shell) (« ? », " +"« * » et « [..] »)." # type: textblock #. type: textblock @@ -744,7 +744,7 @@ # type: =head1 #. type: =head1 #: debhelper.pod:253 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 @@ -957,12 +957,12 @@ "act on." msgstr "" "Parfois, il peut être souhaitable d'utiliser un autre répertoire temporaire. " -"Ceci est obtenu grâce au paramètre -P. Par exemple, « dh_installdocs -" -"Pdebian/tmp » utilisera debian/tmp comme répertoire temporaire. Nota : " -"L'usage de -P implique que les programmes de debhelper ne construisent qu'un " -"seul paquet à la fois. De ce fait, si le paquet source génère plusieurs " -"paquets binaires, il faudra employer également le paramètre -p pour préciser " -"l'unique paquet binaire à construire." +"Ceci est obtenu grâce au paramètre -P. Par exemple, « dh_installdocs -Pdebian/" +"tmp » utilisera debian/tmp comme répertoire temporaire. Nota : L'usage de -P " +"implique que les programmes de debhelper ne construisent qu'un seul paquet à " +"la fois. De ce fait, si le paquet source génère plusieurs paquets binaires, " +"il faudra employer également le paramètre -p pour préciser l'unique paquet " +"binaire à construire." # type: =head2 #. type: =head2 @@ -1420,9 +1420,8 @@ "dans debian/control, ainsi qu'une dépendance vers debhelper (>= 4.2) dans la " "ligne build-depend. Debhelper essayera de construire des udebs, conformément " "aux règles de l'installateur Debian, en suffixant les fichiers de paquets " -"générés avec « .udeb », en n'installant aucune documentation, en omettant " -"les scripts preinst, postrm et prerm ainsi que les scripts de configuration, " -"etc." +"générés avec « .udeb », en n'installant aucune documentation, en omettant les " +"scripts preinst, postrm et prerm ainsi que les scripts de configuration, etc." # type: =head2 #. type: =head2 @@ -1612,17 +1611,17 @@ #: dh_auto_configure:53 dh_auto_install:85 dh_auto_test:58 dh_bugfiles:122 #: dh_builddeb:91 dh_clean:138 dh_compress:204 dh_desktop:31 dh_fixperms:129 #: dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:279 -#: dh_installcatalogs:116 dh_installchangelogs:171 dh_installcron:77 +#: dh_installcatalogs:116 dh_installchangelogs:155 dh_installcron:77 #: dh_installdeb:108 dh_installdebconf:126 dh_installdirs:86 #: dh_installdocs:301 dh_installemacsen:124 dh_installexamples:106 -#: dh_installifupdown:69 dh_installinfo:77 dh_installinit:275 +#: dh_installifupdown:69 dh_installinfo:77 dh_installinit:320 #: dh_installlogcheck:66 dh_installlogrotate:50 dh_installman:258 #: 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:87 dh_link:226 dh_lintian:57 -#: dh_listpackages:29 dh_makeshlibs:243 dh_md5sums:90 dh_movefiles:170 +#: dh_listpackages:29 dh_makeshlibs:250 dh_md5sums:90 dh_movefiles:170 #: dh_perl:146 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:171 -#: dh_strip:227 dh_suidregister:117 dh_testdir:44 dh_testroot:27 +#: dh_strip:236 dh_suidregister:117 dh_testdir:44 dh_testroot:27 #: dh_undocumented:28 dh_usrlocal:114 msgid "SEE ALSO" msgstr "VOIR AUSSI" @@ -1658,16 +1657,16 @@ #: dh_auto_configure:59 dh_auto_install:91 dh_auto_test:64 dh_bugfiles:130 #: dh_builddeb:97 dh_clean:144 dh_compress:210 dh_desktop:37 dh_fixperms:135 #: dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:285 -#: dh_installcatalogs:122 dh_installchangelogs:177 dh_installcron:83 +#: dh_installcatalogs:122 dh_installchangelogs:161 dh_installcron:83 #: dh_installdeb:114 dh_installdebconf:132 dh_installdirs:92 #: dh_installdocs:307 dh_installemacsen:130 dh_installexamples:112 #: dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:72 #: dh_installlogrotate:56 dh_installman:264 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:93 -#: dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:249 +#: dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:256 #: dh_md5sums:96 dh_movefiles:176 dh_perl:152 dh_prep:66 dh_python:286 -#: dh_scrollkeeper:34 dh_shlibdeps:177 dh_strip:233 dh_suidregister:123 +#: dh_scrollkeeper:34 dh_shlibdeps:177 dh_strip:242 dh_suidregister:123 #: dh_testdir:50 dh_testroot:33 dh_undocumented:34 dh_usrlocal:120 msgid "AUTHOR" msgstr "AUTEUR" @@ -1677,15 +1676,15 @@ #: debhelper.pod:627 dh:756 dh_auto_build:55 dh_auto_clean:56 #: dh_auto_configure:61 dh_auto_install:93 dh_auto_test:66 dh_builddeb:99 #: dh_clean:146 dh_compress:212 dh_fixperms:137 dh_gencontrol:90 -#: dh_install:287 dh_installchangelogs:179 dh_installcron:85 dh_installdeb:116 +#: dh_install:287 dh_installchangelogs:163 dh_installcron:85 dh_installdeb:116 #: dh_installdebconf:134 dh_installdirs:94 dh_installdocs:309 #: dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 -#: dh_installinfo:85 dh_installinit:283 dh_installlogrotate:58 +#: dh_installinfo:85 dh_installinit:328 dh_installlogrotate:58 #: dh_installman:266 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:95 dh_link:234 -#: dh_listpackages:37 dh_makeshlibs:251 dh_md5sums:98 dh_movefiles:178 -#: dh_prep:68 dh_shlibdeps:179 dh_strip:235 dh_suidregister:125 dh_testdir:52 +#: dh_listpackages:37 dh_makeshlibs:258 dh_md5sums:98 dh_movefiles:178 +#: dh_prep:68 dh_shlibdeps:179 dh_strip:244 dh_suidregister:125 dh_testdir:52 #: dh_testroot:35 dh_undocumented:36 msgid "Joey Hess " msgstr "Joey Hess " @@ -1760,7 +1759,7 @@ #: dh:33 dh_auto_build:28 dh_auto_clean:29 dh_auto_configure:31 #: dh_auto_install:43 dh_auto_test:30 dh_bugfiles:50 dh_builddeb:21 #: dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 -#: dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:56 +#: dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:54 #: dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:60 #: dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39 #: dh_installinfo:31 dh_installinit:48 dh_installlogrotate:22 dh_installman:60 @@ -2383,16 +2382,16 @@ #: dh:750 dh_auto_build:49 dh_auto_clean:50 dh_auto_configure:55 #: dh_auto_install:87 dh_auto_test:60 dh_builddeb:93 dh_clean:140 #: dh_compress:206 dh_fixperms:131 dh_gconf:101 dh_gencontrol:84 -#: dh_install:281 dh_installcatalogs:118 dh_installchangelogs:173 +#: dh_install:281 dh_installcatalogs:118 dh_installchangelogs:157 #: dh_installcron:79 dh_installdeb:110 dh_installdebconf:128 dh_installdirs:88 #: dh_installdocs:303 dh_installemacsen:126 dh_installexamples:108 -#: dh_installifupdown:71 dh_installinfo:79 dh_installinit:277 +#: dh_installifupdown:71 dh_installinfo:79 dh_installinit:322 #: dh_installlogcheck:68 dh_installlogrotate:52 dh_installman:260 #: dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 #: dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 -#: dh_installxfonts:89 dh_link:228 dh_listpackages:31 dh_makeshlibs:245 +#: dh_installxfonts:89 dh_link:228 dh_listpackages:31 dh_makeshlibs:252 #: dh_md5sums:92 dh_movefiles:172 dh_perl:148 dh_prep:62 dh_python:282 -#: dh_strip:229 dh_suidregister:119 dh_testdir:46 dh_testroot:29 +#: dh_strip:238 dh_suidregister:119 dh_testdir:46 dh_testroot:29 #: dh_undocumented:30 dh_usrlocal:116 msgid "L" msgstr "L" @@ -2402,16 +2401,16 @@ #: dh:752 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:95 #: dh_clean:142 dh_compress:208 dh_desktop:35 dh_fixperms:133 dh_gconf:103 -#: dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:175 +#: dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:159 #: dh_installcron:81 dh_installdeb:112 dh_installdebconf:130 dh_installdirs:90 #: dh_installdocs:305 dh_installemacsen:128 dh_installexamples:110 -#: dh_installifupdown:73 dh_installinfo:81 dh_installinit:279 +#: dh_installifupdown:73 dh_installinfo:81 dh_installinit:324 #: dh_installlogrotate:54 dh_installman:262 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:91 -#: dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:247 +#: dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:254 #: dh_md5sums:94 dh_movefiles:174 dh_perl:150 dh_prep:64 dh_python:284 -#: dh_scrollkeeper:32 dh_shlibdeps:175 dh_strip:231 dh_suidregister:121 +#: dh_scrollkeeper:32 dh_shlibdeps:175 dh_strip:240 dh_suidregister:121 #: dh_testdir:48 dh_testroot:31 dh_undocumented:32 dh_usrlocal:118 msgid "This program is a part of debhelper." msgstr "Ce programme fait partie de debhelper." @@ -2767,8 +2766,8 @@ "automatiquement le jeu d'essai d'un paquet. Il le fait en lançant les " "commandes appropriées du processus de construction d'après le type du " "paquet. Par exemple, s'il y a un Makefile et qu'il contient un bloc « test » " -"ou « check » il exécutera make (ou MAKE si cette variable d'environnement " -"est définie). Si les tests produisent une erreur, la commande retourne une " +"ou « check » il exécutera make (ou MAKE si cette variable d'environnement est " +"définie). Si les tests produisent une erreur, la commande retourne une " "valeur non nulle. S'il n'y a pas de jeu de d'essai, la commande retourne " "zéro sans rien faire." @@ -2837,7 +2836,7 @@ # type: =head1 #. type: =head1 #: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38 -#: dh_installcatalogs:35 dh_installchangelogs:32 dh_installcron:21 +#: dh_installcatalogs:35 dh_installchangelogs:30 dh_installcron:21 #: dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 #: dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 #: dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:50 @@ -3059,8 +3058,8 @@ "It does not run \"make clean\" to clean up after the build process. Use " "L to do things like that." msgstr "" -"Il n'exécute pas un « make clean » pour faire le ménage après la " -"construction du paquet. Il faut utiliser L pour le faire." +"Il n'exécute pas un « make clean » pour faire le ménage après la construction " +"du paquet. Il faut utiliser L pour le faire." # type: textblock #. type: textblock @@ -3086,7 +3085,7 @@ # type: =item #. type: =item -#: dh_clean:45 dh_installchangelogs:60 +#: dh_clean:45 dh_installchangelogs:58 msgid "B<-k>, B<--keep>" msgstr "B<-k>, B<--keep>" @@ -3126,9 +3125,9 @@ "deleted, even if they would normally be deleted. You may use this option " "multiple times to build up a list of things to exclude." msgstr "" -"Conserve les fichiers qui contiennent « élément » n'importe où dans leur " -"nom, même s'ils auraient dû être normalement supprimés. Cette option peut " -"être employée plusieurs fois afin d'exclure de la suppression une liste " +"Conserve les fichiers qui contiennent « élément » n'importe où dans leur nom, " +"même s'ils auraient dû être normalement supprimés. Cette option peut être " +"employée plusieurs fois afin d'exclure de la suppression une liste " "d'éléments." # type: =item @@ -3765,7 +3764,7 @@ # type: =item #. type: =item -#: dh_install:76 dh_installchangelogs:68 dh_installdocs:69 +#: dh_install:76 dh_installchangelogs:66 dh_installdocs:69 #: dh_installexamples:41 dh_link:60 dh_movefiles:50 msgid "B<-Xitem>, B<--exclude=item>" msgstr "B<-Xélément>, B<--exclude=élément>" @@ -4065,7 +4064,7 @@ # 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 " @@ -4119,26 +4118,14 @@ "l'installation des journaux de suivi des modifications (changelog) dans le " "répertoire de construction du paquet." -# type: textblock #. type: textblock #: dh_installchangelogs:21 -#, fuzzy -#| msgid "" -#| "An upstream changelog file may be specified as an option. If none is " -#| "specified, a few common filenames are tried. (In compatibility level 7 " -#| "and above.)" -msgid "" -"An upstream changelog file may be specified as an option. If none is " -"specified, it looks for files with names that seem likely to be changelogs. " -"(In compatibility level 7 and above.)" +msgid "An upstream changelog file may be specified as an option." msgstr "" -"Un journal amont des modifications (upstream changelog) peut être indiqué. " -"Si rien n'est indiqué, quelques noms courants de fichiers sont essayés (à " -"partir de la version 7)." # type: textblock #. type: textblock -#: dh_installchangelogs:25 +#: dh_installchangelogs:23 msgid "" "If there is an upstream changelog file, it will be be installed as usr/share/" "doc/package/changelog in the package build directory. If the changelog is a " @@ -4154,31 +4141,31 @@ # type: =item #. type: =item -#: dh_installchangelogs:36 +#: dh_installchangelogs:34 msgid "debian/changelog" msgstr "debian/changelog" # type: =item #. type: =item -#: dh_installchangelogs:38 +#: dh_installchangelogs:36 msgid "debian/NEWS" msgstr "debian/NEWS" # type: =item #. type: =item -#: dh_installchangelogs:40 +#: dh_installchangelogs:38 msgid "debian/I.changelog" msgstr "debian/I.changelog" # type: =item #. type: =item -#: dh_installchangelogs:42 +#: dh_installchangelogs:40 msgid "debian/I.NEWS" msgstr "debian/I.NEWS" # type: textblock #. type: textblock -#: dh_installchangelogs:44 +#: dh_installchangelogs:42 msgid "" "Automatically installed into usr/share/doc/I/ in the package build " "directory." @@ -4188,7 +4175,7 @@ # type: textblock #. type: textblock -#: dh_installchangelogs:47 +#: dh_installchangelogs:45 msgid "" "Use the package specific name if I needs a different NEWS or " "changelog file." @@ -4198,7 +4185,7 @@ # type: textblock #. type: textblock -#: dh_installchangelogs:50 +#: dh_installchangelogs:48 msgid "" "The changelog file is installed with a name of changelog for native " "packages, and changelog.Debian for non-native packages. The NEWS file is " @@ -4210,7 +4197,7 @@ # type: textblock #. type: textblock -#: dh_installchangelogs:62 +#: dh_installchangelogs:60 msgid "" "Keep the original name of the upstream changelog. This will be accomplished " "by installing the upstream changelog as \"changelog\", and making a symlink " @@ -4220,30 +4207,29 @@ msgstr "" "Conserve le nom original du journal amont. Ce résultat est obtenu en " "installant le journal amont sous le nom « changelog » et en créant un lien " -"symbolique portant le nom d'origine et pointant sur le fichier " -"« changelog ». Cela peut être utile si le journal amont porte un nom " -"inhabituel ou si d'autres éléments de documentation du paquet se réfèrent à " -"ce fichier." +"symbolique portant le nom d'origine et pointant sur le fichier « changelog ». " +"Cela peut être utile si le journal amont porte un nom inhabituel ou si " +"d'autres éléments de documentation du paquet se réfèrent à ce fichier." # type: textblock #. type: textblock -#: dh_installchangelogs:70 +#: dh_installchangelogs:68 msgid "" "Exclude upstream changelog files that contain \"item\" anywhere in their " "filename from being installed." msgstr "" -"Exclut du traitement les journaux amonts qui comportent « élément » " -"n'importe où dans leur nom." +"Exclut du traitement les journaux amonts qui comportent « élément » n'importe " +"où dans leur nom." # type: =item #. type: =item -#: dh_installchangelogs:73 +#: dh_installchangelogs:71 msgid "I" msgstr "I" # type: textblock #. type: textblock -#: dh_installchangelogs:75 +#: dh_installchangelogs:73 msgid "Install this file as the upstream changelog." msgstr "" "Installe ce fichier en tant que journal amont de suivi des modifications." @@ -4851,8 +4837,8 @@ "before calling dh_installdocs.)" msgstr "" "(Une autre méthode, pour réaliser la même chose, qui reste toujours " -"possible, est de faire du répertoire de documentation un lien symbolique " -"« en l'air » avant l'appel à dh_installdocs.)" +"possible, est de faire du répertoire de documentation un lien symbolique « en " +"l'air » avant l'appel à dh_installdocs.)" # type: textblock #. type: textblock @@ -5029,8 +5015,8 @@ "\", alternatives include \"xemacs\" and \"emacs20\"." msgstr "" "Fixe la « saveur » dans laquelle le fichier site-start.d sera installé. La " -"valeur par défaut est « emacs ». Les autres valeurs possibles sont " -"« xemacs » et « emacs20 »." +"valeur par défaut est « emacs ». Les autres valeurs possibles sont « xemacs » " +"et « emacs20 »." # type: textblock #. type: textblock @@ -5492,8 +5478,8 @@ "and if so will install it as the init script in preference to the files it " "normally installs." msgstr "" -"Utilise « nom-du-script » en tant que nom du script init dans etc/init.d/ " -"et, si besoin est, comme nom du fichier « defaults ». Avec ce paramètre " +"Utilise « nom-du-script » en tant que nom du script init dans etc/init.d/ et, " +"si besoin est, comme nom du fichier « defaults ». Avec ce paramètre " "dh_installinit cherche dans le répertoire debian/ un fichier du genre " "« paquet.nom-du-script » et, s'il le trouve, l'installe en tant que script " "init à la place des fichiers qu'il installe habituellement." @@ -5511,12 +5497,34 @@ # 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# " @@ -5528,16 +5536,21 @@ # type: =head1 #. type: =head1 -#: dh_installinit:281 +#: dh_installinit:326 msgid "AUTHORS" msgstr "AUTEURS" # type: textblock #. type: textblock -#: dh_installinit:285 +#: dh_installinit:330 msgid "Steve Langasek " msgstr "Steve Langasek " +#. type: textblock +#: dh_installinit:332 +msgid "Scott James Remnant " +msgstr "" + # type: textblock #. type: textblock #: dh_installlogcheck:5 @@ -5699,10 +5712,9 @@ "de la page et en déduit la destination. Si la ligne .TH est correctement " "renseignée, les pages de manuel seront installées dans la bonne section avec " "le nom adéquat. Ce mécanisme fonctionne également pour les pages comportant " -"des sous-sections, telle que « 3perl », qui sera placé en « man3 » et " -"portera l'extension « .3perl ». Si la ligne .TH est erronée ou absente, le " -"programme peut faire une mauvaise déduction, basée sur l'extension du " -"fichier." +"des sous-sections, telle que « 3perl », qui sera placé en « man3 » et portera " +"l'extension « .3perl ». Si la ligne .TH est erronée ou absente, le programme " +"peut faire une mauvaise déduction, basée sur l'extension du fichier." # type: textblock #. type: textblock @@ -5738,8 +5750,7 @@ "dh_installman installe une page de manuel dans un répertoire tel que /usr/" "share/man/pl/man1/ c'est parce que le programme possède un nom comme « toto." "pl » et que dh_installman pense que la page de manuel est traduite en " -"polonais (pl). Il suffit d'utiliser « language=C » pour lever cette " -"ambiguïté." +"polonais (pl). Il suffit d'utiliser « language=C » pour lever cette ambiguïté." # type: textblock #. type: textblock @@ -6378,7 +6389,9 @@ # 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." @@ -6663,9 +6676,9 @@ "Do not correct symlinks that contain \"item\" anywhere in their filename " "from being corrected to comply with debian policy." msgstr "" -"Ne corrige pas les liens symboliques qui comportent « élément », n'importe " -"où dans leur nom, alors qu'ils auraient dû l'être pour se conformer à la " -"charte Debian." +"Ne corrige pas les liens symboliques qui comportent « élément », n'importe où " +"dans leur nom, alors qu'ils auraient dû l'être pour se conformer à la charte " +"Debian." # type: =item #. type: =item @@ -6731,8 +6744,8 @@ msgid "" "dh_lintian - install lintian override files into package build directories" msgstr "" -"dh_lintian - installe les fichiers « override » de lintian dans le " -"répertoire de construction du paquet" +"dh_lintian - installe les fichiers « override » de lintian dans le répertoire " +"de construction du paquet" # type: textblock #. type: textblock @@ -7295,8 +7308,8 @@ msgstr "" "Le programme examine les scripts et les modules Perl du paquet, et exploite " "cette information pour produire une dépendance vers perl ou perlapi. La " -"substitution a lieu dans le fichier « control » du paquet, à l'emplacement " -"où est indiqué « ${perl:Depends} »." +"substitution a lieu dans le fichier « control » du paquet, à l'emplacement où " +"est indiqué « ${perl:Depends} »." # type: textblock #. type: textblock @@ -7462,8 +7475,8 @@ "Python-Version control file field exists." msgstr "" "Notez bien que ce programme est obsolète. Il faut utiliser « dh_pysupport » " -"ou « dh_pycentral » à la place. Ce programme ne fera rien si le champ " -"« debian/pycompat » ou « Python-Version » existe dans le fichier « control »." +"ou « dh_pycentral » à la place. Ce programme ne fera rien si le champ « debian/" +"pycompat » ou « Python-Version » existe dans le fichier « control »." # type: textblock #. type: textblock @@ -8119,8 +8132,8 @@ msgstr "" "Ce programme est utilisé pour créer des liens symboliques vers la page de " "manuel « undocumented.7 » lorsque la page de manuel du paquet n'existe pas. " -"La Charte Debian désapprouve l'utilisation de « undocumented.7 ». De ce " -"fait, ce programme ne fait rien et de doit pas être utilisé." +"La Charte Debian désapprouve l'utilisation de « undocumented.7 ». De ce fait, " +"ce programme ne fait rien et de doit pas être utilisé." # type: textblock #. type: textblock @@ -8208,6 +8221,21 @@ msgid "Andrew Stribblehill " msgstr "Andrew Stribblehill " +# type: textblock +#, fuzzy +#~| msgid "" +#~| "An upstream changelog file may be specified as an option. If none is " +#~| "specified, a few common filenames are tried. (In compatibility level 7 " +#~| "and above.)" +#~ msgid "" +#~ "An upstream changelog file may be specified as an option. If none is " +#~ "specified, it looks for files with names that seem likely to be " +#~ "changelogs. (In compatibility level 7 and above.)" +#~ msgstr "" +#~ "Un journal amont des modifications (upstream changelog) peut être " +#~ "indiqué. Si rien n'est indiqué, quelques noms courants de fichiers sont " +#~ "essayés (à partir de la version 7)." + # type: =item #~ msgid "V1" #~ msgstr "V1" @@ -8320,6 +8348,16 @@ # type: textblock #~ msgid "" +#~ "An upstream changelog file may be specified as an option. If none is " +#~ "specified, a few common filenames are tried. (In compatibility level 7 " +#~ "and above.)" +#~ msgstr "" +#~ "Un journal amont des modifications (upstream changelog) peut être " +#~ "indiqué. Si rien n'est indiqué, quelques noms courants de fichiers sont " +#~ "essayés (à partir de la version 7)." + +# type: textblock +#~ msgid "" #~ "It automatically generates the postinst and prerm fragments needed to " #~ "register and unregister the schemas in usr/share/gconf/schemas, using " #~ "gconf-schemas." @@ -8337,10 +8375,9 @@ #~ "defaults." #~ msgstr "" #~ "Ce fichier sera installé dans le répertoire de construction du paquet " -#~ "sous usr/share/gconf/defaults/10_paquet où le mot « paquet » sera " -#~ "remplacé par le nom du paquet. Certaines parties des scripts de " -#~ "maintenance postinst et postrm seront produites pour exécuter update-" -#~ "gconf-defaults." +#~ "sous usr/share/gconf/defaults/10_paquet où le mot « paquet » sera remplacé " +#~ "par le nom du paquet. Certaines parties des scripts de maintenance " +#~ "postinst et postrm seront produites pour exécuter update-gconf-defaults." # type: =head1 #~ msgid "COMMAND SPECIFICATION"