From 3ccdc50eabcdcea497fec06c481bce39f8fa32b4 Mon Sep 17 00:00:00 2001 From: joeyh Date: Fri, 9 Jun 2006 21:20:31 +0000 Subject: [PATCH] r1929: * dh_installmodules: depmod -a is no longer run during boot, so if a module package is installed for a kernel other than the running kernel, just running depmod -a in the postinst is no longer sufficient. Instead, run depmod -a -F /boot/System.map- The kernel version is guessed at based on the path to the modules in the package. Closes: #301424 * Note: behavior change due to the above: The mere existence of a debian/package.modules file will no longer make dh_installmodules add code to maintainer scripts. * Untested. --- autoscripts/postinst-modules | 4 +- autoscripts/postrm-modules | 4 +- debian/changelog | 15 ++++++++ dh_installmodules | 38 ++++++++++++------- man/po4a/po/debhelper.pot | 44 +++++++++++----------- man/po4a/po/es.po | 69 ++++++++++++++++++++-------------- man/po4a/po/fr.po | 72 +++++++++++++++++++++--------------- 7 files changed, 151 insertions(+), 95 deletions(-) diff --git a/autoscripts/postinst-modules b/autoscripts/postinst-modules index 11c206b..0460eaa 100644 --- a/autoscripts/postinst-modules +++ b/autoscripts/postinst-modules @@ -2,5 +2,7 @@ if [ "$1" = "configure" ]; then if [ -x "`which update-modules 2>/dev/null`" ]; then update-modules >/dev/null || [ "$?" = 3 ] fi - depmod -a || true + if [ -e /boot/System.map-#KVERS# ]; then + depmod -a -F /boot/System.map-#KVERS# #KVERS# || true + fi fi diff --git a/autoscripts/postrm-modules b/autoscripts/postrm-modules index bcacb9f..d710791 100644 --- a/autoscripts/postrm-modules +++ b/autoscripts/postrm-modules @@ -1,4 +1,6 @@ if [ -x "`which update-modules 2>/dev/null`" ]; then update-modules >/dev/null || [ "$?" = 3 ] fi -depmod -a || true +if [ -e /boot/System.map-#KVERS# ]; then + depmod -a -F /boot/System.map-#KVERS# #KVERS# || true +fi diff --git a/debian/changelog b/debian/changelog index 7f514ae..2e2d542 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +debhelper (5.0.37) UNRELEASED; urgency=low + + * dh_installmodules: depmod -a is no longer run during boot, so if a module + package is installed for a kernel other than the running kernel, just + running depmod -a in the postinst is no longer sufficient. Instead, run + depmod -a -F /boot/System.map- + The kernel version is guessed at based on the path to the modules in the + package. Closes: #301424 + * Note: behavior change due to the above: The mere existence of a + debian/package.modules file will no longer make dh_installmodules add code + to maintainer scripts. + * Untested. + + -- Joey Hess Fri, 9 Jun 2006 16:47:44 -0400 + debhelper (5.0.36) unstable; urgency=low [ Valery Perrin ] diff --git a/dh_installmodules b/dh_installmodules index 282d52c..be2efad 100755 --- a/dh_installmodules +++ b/dh_installmodules @@ -26,11 +26,10 @@ modutils. Files named debian/package.modprobe will be installed in etc/modprobe.d/package in the package build directory, to be used by module-init-tools's version of modprobe. -Then postinst and postrm commands are automatically generated to register -the modules when the package is installed. See L for an -explanation of how this works. Note that this will be done for any -package this program acts on which has either a package.modules or -has .o or .ko files in /lib/modules. +Kernel modules are searched for in the package build directory and if +found, postinst and postrm commands are automatically generated to +run depmod and register the modules when the package is installed. See +L for an explanation of how this works. =head1 OPTIONS @@ -59,14 +58,26 @@ instances of the same text to be added to maintainer scripts. init(); -# Returns true if there are any .o or .ko files in the passed directory. +# Looks for kernel modules in the passed directory. If any are found, +# returns the kernel version (or versions) that the modules seem to be for. sub find_kernel_modules { my $searchdir=shift; - my @results=(); + my %versions; return unless -d $searchdir; - find(sub { push @results, $_ if /\.k?o$/ }, $searchdir); - return @results > 0; + find(sub { + if (/\.k?o$/) { + my $kvers=$File::Find::dir=~m!lib/modules/([^/]+)/!; + if (! defined $kvers || ! length $kvers) { + warning("Cannot determine kernel version for module $File::Find::name"); + } + else { + $versions{$kvers}=1; + } + } + }, $searchdir); + + return keys %versions; } foreach my $package (@{$dh{DOPACKAGES}}) { @@ -92,10 +103,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) { doit("install","-m","0644",$modprobe_file,"$tmp/etc/modprobe.d/".pkgfilename($package)); } - if (! $dh{NOSCRIPTS} && - ($modutils_file || find_kernel_modules("$tmp/lib/modules"))) { - autoscript($package,"postinst","postinst-modules","s/#PACKAGE#/$package/"); - autoscript($package,"postrm","postrm-modules","s/#PACKAGE#/$package/"); + if (! $dh{NOSCRIPTS}) { + foreach my $kvers (find_kernel_modules("$tmp/lib/modules")) { + autoscript($package,"postinst","postinst-modules","s/#KVERS#/$kvers/"); + autoscript($package,"postrm","postrm-modules","s/#KVERS#/$kvers/"); + } } } diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot index 7894efe..0b3f5e3 100644 --- a/man/po4a/po/debhelper.pot +++ b/man/po4a/po/debhelper.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-05-10 20:20-0400\n" +"POT-Creation-Date: 2006-06-09 17:10-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,12 +54,12 @@ msgid "" msgstr "" # type: =head1 -#: dh_installpam:24 dh_installemacsen:34 dh_installinfo:36 dh_strip:35 dh_installppp:26 dh_compress:38 dh_md5sums:28 dh_installexamples:29 dh_installcron:24 dh_installinit:33 dh_usrlocal:38 dh_gconf:34 dh_installmodules:35 dh_installmenu:33 dh_installlogrotate:22 dh_clean:25 dh_testversion:34 dh_testdir:23 dh_shlibdeps:26 dh_scrollkeeper:31 dh_installdirs:32 dh_link:48 dh_installdebconf:49 dh_installmime:30 dh_installwm:30 dh_builddeb:21 dh_gencontrol:26 dh_install:43 dh_makeshlibs:24 dh_perl:28 dh_fixperms:31 dh_installman:53 dh_movefiles:32 dh_installchangelogs:40 dh_python:35 dh_installdocs:51 dh_installcatalogs:42 dh_installmanpages:40 +#: dh_installpam:24 dh_installemacsen:34 dh_installinfo:36 dh_strip:35 dh_installppp:26 dh_compress:38 dh_md5sums:28 dh_installexamples:29 dh_installcron:24 dh_installinit:33 dh_usrlocal:38 dh_gconf:34 dh_installmodules:34 dh_installmenu:33 dh_installlogrotate:22 dh_clean:25 dh_testversion:34 dh_testdir:23 dh_shlibdeps:26 dh_scrollkeeper:31 dh_installdirs:32 dh_link:48 dh_installdebconf:49 dh_installmime:30 dh_installwm:30 dh_builddeb:21 dh_gencontrol:26 dh_install:43 dh_makeshlibs:24 dh_perl:28 dh_fixperms:31 dh_installman:53 dh_movefiles:32 dh_installchangelogs:40 dh_python:35 dh_installdocs:51 dh_installcatalogs:42 dh_installmanpages:40 msgid "OPTIONS" msgstr "" # type: =item -#: dh_installpam:28 dh_installppp:30 dh_installcron:28 dh_installinit:72 dh_installmodules:43 dh_installlogrotate:26 +#: dh_installpam:28 dh_installppp:30 dh_installcron:28 dh_installinit:72 dh_installmodules:42 dh_installlogrotate:26 msgid "B<--name=>I" msgstr "" @@ -72,27 +72,27 @@ msgid "" msgstr "" # type: =head1 -#: dh_installpam:52 dh_installemacsen:108 dh_installinfo:122 dh_strip:215 dh_installppp:56 dh_compress:189 dh_md5sums:86 dh_installexamples:102 dh_installcron:61 dh_installinit:197 dh_usrlocal:113 dh_gconf:90 dh_installmodules:102 dh_installmenu:79 dh_installlogrotate:50 debhelper.pod:437 dh_clean:106 dh_undocumented:28 dh_testversion:74 dh_testdir:43 dh_shlibdeps:150 dh_scrollkeeper:75 dh_installdirs:87 dh_link:212 dh_installdebconf:117 dh_installmime:84 dh_installwm:94 dh_installdeb:93 dh_builddeb:78 dh_gencontrol:73 dh_install:251 dh_makeshlibs:200 dh_perl:140 dh_fixperms:107 dh_listpackages:28 dh_installman:229 dh_testroot:26 dh_movefiles:162 dh_desktop:43 dh_suidregister:117 dh_installchangelogs:125 dh_python:266 dh_installdocs:233 dh_installcatalogs:109 dh_installmanpages:197 dh_installxfonts:85 dh_installlogcheck:51 +#: dh_installpam:52 dh_installemacsen:108 dh_installinfo:122 dh_strip:215 dh_installppp:56 dh_compress:189 dh_md5sums:86 dh_installexamples:102 dh_installcron:61 dh_installinit:197 dh_usrlocal:113 dh_gconf:90 dh_installmodules:114 dh_installmenu:79 dh_installlogrotate:50 debhelper.pod:437 dh_clean:106 dh_undocumented:28 dh_testversion:74 dh_testdir:43 dh_shlibdeps:150 dh_scrollkeeper:75 dh_installdirs:87 dh_link:212 dh_installdebconf:117 dh_installmime:84 dh_installwm:94 dh_installdeb:93 dh_builddeb:78 dh_gencontrol:73 dh_install:251 dh_makeshlibs:200 dh_perl:140 dh_fixperms:107 dh_listpackages:28 dh_installman:229 dh_testroot:26 dh_movefiles:162 dh_desktop:43 dh_suidregister:117 dh_installchangelogs:125 dh_python:266 dh_installdocs:233 dh_installcatalogs:109 dh_installmanpages:197 dh_installxfonts:85 dh_installlogcheck:51 msgid "SEE ALSO" msgstr "" # type: textblock -#: dh_installpam:54 dh_installemacsen:110 dh_installinfo:124 dh_strip:217 dh_installppp:58 dh_compress:191 dh_md5sums:88 dh_installexamples:104 dh_installcron:63 dh_installinit:199 dh_usrlocal:115 dh_gconf:92 dh_installmodules:104 dh_installlogrotate:52 dh_clean:108 dh_undocumented:30 dh_testversion:76 dh_testdir:45 dh_installdirs:89 dh_link:214 dh_installdebconf:119 dh_installmime:86 dh_installwm:96 dh_installdeb:95 dh_builddeb:80 dh_gencontrol:75 dh_install:253 dh_makeshlibs:202 dh_perl:142 dh_fixperms:109 dh_listpackages:30 dh_installman:231 dh_testroot:28 dh_movefiles:164 dh_suidregister:119 dh_installchangelogs:127 dh_python:268 dh_installdocs:235 dh_installcatalogs:111 dh_installmanpages:199 dh_installxfonts:87 dh_installlogcheck:53 +#: dh_installpam:54 dh_installemacsen:110 dh_installinfo:124 dh_strip:217 dh_installppp:58 dh_compress:191 dh_md5sums:88 dh_installexamples:104 dh_installcron:63 dh_installinit:199 dh_usrlocal:115 dh_gconf:92 dh_installmodules:116 dh_installlogrotate:52 dh_clean:108 dh_undocumented:30 dh_testversion:76 dh_testdir:45 dh_installdirs:89 dh_link:214 dh_installdebconf:119 dh_installmime:86 dh_installwm:96 dh_installdeb:95 dh_builddeb:80 dh_gencontrol:75 dh_install:253 dh_makeshlibs:202 dh_perl:142 dh_fixperms:109 dh_listpackages:30 dh_installman:231 dh_testroot:28 dh_movefiles:164 dh_suidregister:119 dh_installchangelogs:127 dh_python:268 dh_installdocs:235 dh_installcatalogs:111 dh_installmanpages:199 dh_installxfonts:87 dh_installlogcheck:53 msgid "L" msgstr "" # type: textblock -#: dh_installpam:56 dh_installemacsen:112 dh_installinfo:126 dh_strip:219 dh_installppp:60 dh_compress:193 dh_md5sums:90 dh_installexamples:106 dh_installcron:65 dh_installinit:201 dh_usrlocal:117 dh_gconf:94 dh_installmodules:106 dh_installmenu:85 dh_installlogrotate:54 dh_clean:110 dh_undocumented:32 dh_testversion:78 dh_testdir:47 dh_shlibdeps:154 dh_scrollkeeper:79 dh_installdirs:91 dh_link:216 dh_installdebconf:121 dh_installmime:88 dh_installwm:98 dh_installdeb:97 dh_builddeb:82 dh_gencontrol:77 dh_install:255 dh_makeshlibs:204 dh_perl:144 dh_fixperms:111 dh_listpackages:32 dh_installman:233 dh_testroot:30 dh_movefiles:166 dh_desktop:47 dh_suidregister:121 dh_installchangelogs:129 dh_python:270 dh_installdocs:237 dh_installmanpages:201 dh_installxfonts:89 +#: dh_installpam:56 dh_installemacsen:112 dh_installinfo:126 dh_strip:219 dh_installppp:60 dh_compress:193 dh_md5sums:90 dh_installexamples:106 dh_installcron:65 dh_installinit:201 dh_usrlocal:117 dh_gconf:94 dh_installmodules:118 dh_installmenu:85 dh_installlogrotate:54 dh_clean:110 dh_undocumented:32 dh_testversion:78 dh_testdir:47 dh_shlibdeps:154 dh_scrollkeeper:79 dh_installdirs:91 dh_link:216 dh_installdebconf:121 dh_installmime:88 dh_installwm:98 dh_installdeb:97 dh_builddeb:82 dh_gencontrol:77 dh_install:255 dh_makeshlibs:204 dh_perl:144 dh_fixperms:111 dh_listpackages:32 dh_installman:233 dh_testroot:30 dh_movefiles:166 dh_desktop:47 dh_suidregister:121 dh_installchangelogs:129 dh_python:270 dh_installdocs:237 dh_installmanpages:201 dh_installxfonts:89 msgid "This program is a part of debhelper." msgstr "" # type: =head1 -#: dh_installpam:58 dh_installemacsen:114 dh_installinfo:128 dh_strip:221 dh_installppp:62 dh_compress:195 dh_md5sums:92 dh_installexamples:108 dh_installcron:67 dh_installinit:203 dh_usrlocal:119 dh_gconf:96 dh_installmodules:108 dh_installmenu:87 dh_installlogrotate:56 debhelper.pod:451 dh_clean:112 dh_undocumented:34 dh_testversion:80 dh_testdir:49 dh_shlibdeps:156 dh_scrollkeeper:81 dh_installdirs:93 dh_link:218 dh_installdebconf:123 dh_installmime:90 dh_installwm:100 dh_installdeb:99 dh_builddeb:84 dh_gencontrol:79 dh_install:257 dh_makeshlibs:206 dh_perl:146 dh_fixperms:113 dh_listpackages:34 dh_installman:235 dh_testroot:32 dh_movefiles:168 dh_desktop:49 dh_suidregister:123 dh_installchangelogs:131 dh_python:272 dh_installdocs:239 dh_installcatalogs:115 dh_installmanpages:203 dh_installxfonts:91 dh_installlogcheck:57 +#: dh_installpam:58 dh_installemacsen:114 dh_installinfo:128 dh_strip:221 dh_installppp:62 dh_compress:195 dh_md5sums:92 dh_installexamples:108 dh_installcron:67 dh_installinit:203 dh_usrlocal:119 dh_gconf:96 dh_installmodules:120 dh_installmenu:87 dh_installlogrotate:56 debhelper.pod:451 dh_clean:112 dh_undocumented:34 dh_testversion:80 dh_testdir:49 dh_shlibdeps:156 dh_scrollkeeper:81 dh_installdirs:93 dh_link:218 dh_installdebconf:123 dh_installmime:90 dh_installwm:100 dh_installdeb:99 dh_builddeb:84 dh_gencontrol:79 dh_install:257 dh_makeshlibs:206 dh_perl:146 dh_fixperms:113 dh_listpackages:34 dh_installman:235 dh_testroot:32 dh_movefiles:168 dh_desktop:49 dh_suidregister:123 dh_installchangelogs:131 dh_python:272 dh_installdocs:239 dh_installcatalogs:115 dh_installmanpages:203 dh_installxfonts:91 dh_installlogcheck:57 msgid "AUTHOR" msgstr "" # type: textblock -#: dh_installpam:60 dh_installemacsen:116 dh_installinfo:130 dh_strip:223 dh_installppp:64 dh_compress:197 dh_md5sums:94 dh_installexamples:110 dh_installcron:69 dh_installinit:205 dh_installmodules:110 dh_installmenu:89 dh_installlogrotate:58 debhelper.pod:453 dh_clean:114 dh_undocumented:36 dh_testversion:82 dh_testdir:51 dh_shlibdeps:158 dh_installdirs:95 dh_link:220 dh_installdebconf:125 dh_installmime:92 dh_installwm:102 dh_installdeb:101 dh_builddeb:86 dh_gencontrol:81 dh_install:259 dh_makeshlibs:208 dh_fixperms:115 dh_listpackages:36 dh_installman:237 dh_testroot:34 dh_movefiles:170 dh_suidregister:125 dh_installchangelogs:133 dh_installdocs:241 dh_installmanpages:205 dh_installxfonts:93 +#: dh_installpam:60 dh_installemacsen:116 dh_installinfo:130 dh_strip:223 dh_installppp:64 dh_compress:197 dh_md5sums:94 dh_installexamples:110 dh_installcron:69 dh_installinit:205 dh_installmodules:122 dh_installmenu:89 dh_installlogrotate:58 debhelper.pod:453 dh_clean:114 dh_undocumented:36 dh_testversion:82 dh_testdir:51 dh_shlibdeps:158 dh_installdirs:95 dh_link:220 dh_installdebconf:125 dh_installmime:92 dh_installwm:102 dh_installdeb:101 dh_builddeb:86 dh_gencontrol:81 dh_install:259 dh_makeshlibs:208 dh_fixperms:115 dh_listpackages:36 dh_installman:237 dh_testroot:34 dh_movefiles:170 dh_suidregister:125 dh_installchangelogs:133 dh_installdocs:241 dh_installmanpages:205 dh_installxfonts:93 msgid "Joey Hess " msgstr "" @@ -136,7 +136,7 @@ msgid "" msgstr "" # type: =item -#: dh_installemacsen:38 dh_installinfo:45 dh_installinit:37 dh_usrlocal:42 dh_installmodules:39 dh_installmenu:37 dh_scrollkeeper:35 dh_installdebconf:53 dh_installmime:34 dh_installwm:40 dh_makeshlibs:58 dh_python:56 dh_installdocs:60 dh_installcatalogs:46 +#: dh_installemacsen:38 dh_installinfo:45 dh_installinit:37 dh_usrlocal:42 dh_installmodules:38 dh_installmenu:37 dh_scrollkeeper:35 dh_installdebconf:53 dh_installmime:34 dh_installwm:40 dh_makeshlibs:58 dh_python:56 dh_installdocs:60 dh_installcatalogs:46 msgid "B<-n>, B<--noscripts>" msgstr "" @@ -168,12 +168,12 @@ msgid "" msgstr "" # type: =head1 -#: dh_installemacsen:53 dh_installinfo:56 dh_strip:68 dh_installexamples:50 dh_installinit:99 dh_usrlocal:48 dh_installmodules:52 debhelper.pod:158 dh_scrollkeeper:41 dh_installmime:40 dh_installwm:49 dh_installman:74 dh_movefiles:58 dh_installdocs:87 dh_installcatalogs:52 dh_installxfonts:36 +#: dh_installemacsen:53 dh_installinfo:56 dh_strip:68 dh_installexamples:50 dh_installinit:99 dh_usrlocal:48 dh_installmodules:51 debhelper.pod:158 dh_scrollkeeper:41 dh_installmime:40 dh_installwm:49 dh_installman:74 dh_movefiles:58 dh_installdocs:87 dh_installcatalogs:52 dh_installxfonts:36 msgid "NOTES" msgstr "" # type: textblock -#: dh_installemacsen:55 dh_installinfo:58 dh_installinit:101 dh_usrlocal:50 dh_installmodules:54 dh_scrollkeeper:43 dh_installmime:42 dh_installwm:51 dh_installcatalogs:54 +#: dh_installemacsen:55 dh_installinfo:58 dh_installinit:101 dh_usrlocal:50 dh_installmodules:53 dh_scrollkeeper:43 dh_installmime:42 dh_installwm:51 dh_installcatalogs:54 msgid "" "Note that this command is not idempotent. \"dh_clean -k\" should be called " "between invocations of this command. Otherwise, it may cause multiple " @@ -902,7 +902,7 @@ msgstr "" #: dh_installmodules:20 msgid "" "dh_installmodules is a debhelper program that is responsible for registering " -"kernel modules with modutils." +"kernel modules." msgstr "" # type: textblock @@ -918,25 +918,23 @@ msgstr "" # type: textblock #: dh_installmodules:29 msgid "" -"Then postinst and postrm commands are automatically generated to register " -"the modules when the package is installed. See L for an " -"explanation of how this works. Note that this will be done for any package " -"this program acts on which has either a package.modules file, or has .o or " -".ko files in /lib/modules." +"Kernel modules are searched for in the package build directory and if found, " +"postinst and postrm commands are automatically generated to run depmod and " +"register the modules when the package is installed. See L " +"for an explanation of how this works." msgstr "" # type: textblock -#: dh_installmodules:41 dh_installmenu:39 dh_installmime:36 dh_makeshlibs:60 dh_python:58 +#: dh_installmodules:40 dh_installmenu:39 dh_installmime:36 dh_makeshlibs:60 dh_python:58 msgid "Do not modify postinst/postrm scripts." msgstr "" # type: textblock -#: dh_installmodules:45 +#: dh_installmodules:44 msgid "" -"Use \"name\" as the filename the modules file is installed in " -"etc/modutils/. When this parameter is used, dh_installmodules looks for and " -"installs files named debian/package.name.modules instead of the usual " -"debian/package.modules." +"When this parameter is used, dh_installmodules looks for and installs files " +"named debian/package.name.modules and debian/package.name.modprobe instead " +"of the usual debian/package.modules and debian/package.modprobe" msgstr "" # type: textblock diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po index 727a65d..bd91b9b 100644 --- a/man/po4a/po/es.po +++ b/man/po4a/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-05-10 20:20-0400\n" +"POT-Creation-Date: 2006-06-09 17:10-0400\n" "PO-Revision-Date: 2005-09-18 00:11+0200\n" "Last-Translator: Rubén Porras Campo \n" "Language-Team: SPANISH \n" @@ -96,7 +96,7 @@ msgstr "" #: dh_installpam:24 dh_installemacsen:34 dh_installinfo:36 dh_strip:35 #: dh_installppp:26 dh_compress:38 dh_md5sums:28 dh_installexamples:29 #: dh_installcron:24 dh_installinit:33 dh_usrlocal:38 dh_gconf:34 -#: dh_installmodules:35 dh_installmenu:33 dh_installlogrotate:22 dh_clean:25 +#: dh_installmodules:34 dh_installmenu:33 dh_installlogrotate:22 dh_clean:25 #: dh_testversion:34 dh_testdir:23 dh_shlibdeps:26 dh_scrollkeeper:31 #: dh_installdirs:32 dh_link:48 dh_installdebconf:49 dh_installmime:30 #: dh_installwm:30 dh_builddeb:21 dh_gencontrol:26 dh_install:43 @@ -108,7 +108,7 @@ msgstr "OPCIONES" # type: =item #: dh_installpam:28 dh_installppp:30 dh_installcron:28 dh_installinit:72 -#: dh_installmodules:43 dh_installlogrotate:26 +#: dh_installmodules:42 dh_installlogrotate:26 msgid "B<--name=>I" msgstr "B<--name=>I" @@ -127,7 +127,7 @@ msgstr "" #: dh_installpam:52 dh_installemacsen:108 dh_installinfo:122 dh_strip:215 #: dh_installppp:56 dh_compress:189 dh_md5sums:86 dh_installexamples:102 #: dh_installcron:61 dh_installinit:197 dh_usrlocal:113 dh_gconf:90 -#: dh_installmodules:102 dh_installmenu:79 dh_installlogrotate:50 +#: dh_installmodules:114 dh_installmenu:79 dh_installlogrotate:50 #: debhelper.pod:437 dh_clean:106 dh_undocumented:28 dh_testversion:74 #: dh_testdir:43 dh_shlibdeps:150 dh_scrollkeeper:75 dh_installdirs:87 #: dh_link:212 dh_installdebconf:117 dh_installmime:84 dh_installwm:94 @@ -144,7 +144,7 @@ msgstr "V #: dh_installpam:54 dh_installemacsen:110 dh_installinfo:124 dh_strip:217 #: dh_installppp:58 dh_compress:191 dh_md5sums:88 dh_installexamples:104 #: dh_installcron:63 dh_installinit:199 dh_usrlocal:115 dh_gconf:92 -#: dh_installmodules:104 dh_installlogrotate:52 dh_clean:108 +#: dh_installmodules:116 dh_installlogrotate:52 dh_clean:108 #: dh_undocumented:30 dh_testversion:76 dh_testdir:45 dh_installdirs:89 #: dh_link:214 dh_installdebconf:119 dh_installmime:86 dh_installwm:96 #: dh_installdeb:95 dh_builddeb:80 dh_gencontrol:75 dh_install:253 @@ -160,7 +160,7 @@ msgstr "L" #: dh_installpam:56 dh_installemacsen:112 dh_installinfo:126 dh_strip:219 #: dh_installppp:60 dh_compress:193 dh_md5sums:90 dh_installexamples:106 #: dh_installcron:65 dh_installinit:201 dh_usrlocal:117 dh_gconf:94 -#: dh_installmodules:106 dh_installmenu:85 dh_installlogrotate:54 dh_clean:110 +#: dh_installmodules:118 dh_installmenu:85 dh_installlogrotate:54 dh_clean:110 #: dh_undocumented:32 dh_testversion:78 dh_testdir:47 dh_shlibdeps:154 #: dh_scrollkeeper:79 dh_installdirs:91 dh_link:216 dh_installdebconf:121 #: dh_installmime:88 dh_installwm:98 dh_installdeb:97 dh_builddeb:82 @@ -175,7 +175,7 @@ msgstr "Este programa es parte de debhelper." #: dh_installpam:58 dh_installemacsen:114 dh_installinfo:128 dh_strip:221 #: dh_installppp:62 dh_compress:195 dh_md5sums:92 dh_installexamples:108 #: dh_installcron:67 dh_installinit:203 dh_usrlocal:119 dh_gconf:96 -#: dh_installmodules:108 dh_installmenu:87 dh_installlogrotate:56 +#: dh_installmodules:120 dh_installmenu:87 dh_installlogrotate:56 #: debhelper.pod:451 dh_clean:112 dh_undocumented:34 dh_testversion:80 #: dh_testdir:49 dh_shlibdeps:156 dh_scrollkeeper:81 dh_installdirs:93 #: dh_link:218 dh_installdebconf:123 dh_installmime:90 dh_installwm:100 @@ -191,7 +191,7 @@ msgstr "AUTOR" # type: textblock #: dh_installpam:60 dh_installemacsen:116 dh_installinfo:130 dh_strip:223 #: dh_installppp:64 dh_compress:197 dh_md5sums:94 dh_installexamples:110 -#: dh_installcron:69 dh_installinit:205 dh_installmodules:110 +#: dh_installcron:69 dh_installinit:205 dh_installmodules:122 #: dh_installmenu:89 dh_installlogrotate:58 debhelper.pod:453 dh_clean:114 #: dh_undocumented:36 dh_testversion:82 dh_testdir:51 dh_shlibdeps:158 #: dh_installdirs:95 dh_link:220 dh_installdebconf:125 dh_installmime:92 @@ -258,7 +258,7 @@ msgstr "" # type: =item #: dh_installemacsen:38 dh_installinfo:45 dh_installinit:37 dh_usrlocal:42 -#: dh_installmodules:39 dh_installmenu:37 dh_scrollkeeper:35 +#: dh_installmodules:38 dh_installmenu:37 dh_scrollkeeper:35 #: dh_installdebconf:53 dh_installmime:34 dh_installwm:40 dh_makeshlibs:58 #: dh_python:56 dh_installdocs:60 dh_installcatalogs:46 msgid "B<-n>, B<--noscripts>" @@ -297,7 +297,7 @@ msgstr "" # type: =head1 #: dh_installemacsen:53 dh_installinfo:56 dh_strip:68 dh_installexamples:50 -#: dh_installinit:99 dh_usrlocal:48 dh_installmodules:52 debhelper.pod:158 +#: dh_installinit:99 dh_usrlocal:48 dh_installmodules:51 debhelper.pod:158 #: dh_scrollkeeper:41 dh_installmime:40 dh_installwm:49 dh_installman:74 #: dh_movefiles:58 dh_installdocs:87 dh_installcatalogs:52 dh_installxfonts:36 msgid "NOTES" @@ -305,7 +305,7 @@ msgstr "NOTAS" # type: textblock #: dh_installemacsen:55 dh_installinfo:58 dh_installinit:101 dh_usrlocal:50 -#: dh_installmodules:54 dh_scrollkeeper:43 dh_installmime:42 dh_installwm:51 +#: dh_installmodules:53 dh_scrollkeeper:43 dh_installmime:42 dh_installwm:51 #: dh_installcatalogs:54 msgid "" "Note that this command is not idempotent. \"dh_clean -k\" should be called " @@ -1248,9 +1248,10 @@ msgstr "" # type: textblock #: dh_installmodules:20 +#, fuzzy msgid "" "dh_installmodules is a debhelper program that is responsible for registering " -"kernel modules with modutils." +"kernel modules." msgstr "" "dh_installmodules es un programa de debhelper responsable de registrar " "módulos del núcleo con modutils." @@ -1272,33 +1273,30 @@ msgstr "" # type: textblock #: dh_installmodules:29 +#, fuzzy msgid "" -"Then postinst and postrm commands are automatically generated to register " -"the modules when the package is installed. See L for an " -"explanation of how this works. Note that this will be done for any package " -"this program acts on which has either a package.modules file, or has .o or ." -"ko files in /lib/modules." +"Kernel modules are searched for in the package build directory and if found, " +"postinst and postrm commands are automatically generated to run depmod and " +"register the modules when the package is installed. See L " +"for an explanation of how this works." msgstr "" -"Las órdenes de postinst y postrm necesarias se generan automáticamente para " -"registrar los módulos cuando se instale el paquete. Lea L " -"para una explicación acerca de como funciona esto. Dese cuenta de que esto " -"se realizará para todos los paquetes sobre los que actúe este programa que " -"tengan el fichero paquete.modules, o tengan ficheros .o o .ko en /lib/" -"modules." +"Además genera automáticamente las ordenes de postinst y postrm necesarias " +"para interaccionar con el paquete menu de Debian. Lea L " +"para una explicación acerca de como funciona esto." # type: textblock -#: dh_installmodules:41 dh_installmenu:39 dh_installmime:36 dh_makeshlibs:60 +#: dh_installmodules:40 dh_installmenu:39 dh_installmime:36 dh_makeshlibs:60 #: dh_python:58 msgid "Do not modify postinst/postrm scripts." msgstr "No modifica los scripts postinst/postrm." # type: textblock -#: dh_installmodules:45 +#: dh_installmodules:44 +#, fuzzy msgid "" -"Use \"name\" as the filename the modules file is installed in etc/modutils/. " "When this parameter is used, dh_installmodules looks for and installs files " -"named debian/package.name.modules instead of the usual debian/package." -"modules." +"named debian/package.name.modules and debian/package.name.modprobe instead " +"of the usual debian/package.modules and debian/package.modprobe" msgstr "" "Usa \"nombre\" para el fichero de módulos instalado en etc/modutils/. Cuando " "se usa este parámetro, dh_installmodules busca e instala ficheros llamados " @@ -5248,6 +5246,21 @@ msgstr "" msgid "Jon Middleton " msgstr "Jon Middleton " +# type: textblock +#~ msgid "" +#~ "Then postinst and postrm commands are automatically generated to register " +#~ "the modules when the package is installed. See L for an " +#~ "explanation of how this works. Note that this will be done for any " +#~ "package this program acts on which has either a package.modules file, or " +#~ "has .o or .ko files in /lib/modules." +#~ msgstr "" +#~ "Las órdenes de postinst y postrm necesarias se generan automáticamente " +#~ "para registrar los módulos cuando se instale el paquete. Lea " +#~ "L para una explicación acerca de como funciona esto. " +#~ "Dese cuenta de que esto se realizará para todos los paquetes sobre los " +#~ "que actúe este programa que tengan el fichero paquete.modules, o tengan " +#~ "ficheros .o o .ko en /lib/modules." + # type: textblock #~ msgid "" #~ "Debconf also supports localized template files, and this program has some " diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po index c4c2fd2..1c29c79 100644 --- a/man/po4a/po/fr.po +++ b/man/po4a/po/fr.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: debhelper manpages\n" -"POT-Creation-Date: 2006-05-10 20:20-0400\n" +"POT-Creation-Date: 2006-06-09 17:10-0400\n" "PO-Revision-Date: 2006-05-11 21:43+0200\n" "Last-Translator: Valery Perrin \n" "Language-Team: French \n" @@ -95,7 +95,7 @@ msgstr "" #: dh_installpam:24 dh_installemacsen:34 dh_installinfo:36 dh_strip:35 #: dh_installppp:26 dh_compress:38 dh_md5sums:28 dh_installexamples:29 #: dh_installcron:24 dh_installinit:33 dh_usrlocal:38 dh_gconf:34 -#: dh_installmodules:35 dh_installmenu:33 dh_installlogrotate:22 dh_clean:25 +#: dh_installmodules:34 dh_installmenu:33 dh_installlogrotate:22 dh_clean:25 #: dh_testversion:34 dh_testdir:23 dh_shlibdeps:26 dh_scrollkeeper:31 #: dh_installdirs:32 dh_link:48 dh_installdebconf:49 dh_installmime:30 #: dh_installwm:30 dh_builddeb:21 dh_gencontrol:26 dh_install:43 @@ -107,7 +107,7 @@ msgstr "OPTIONS" # type: =item #: dh_installpam:28 dh_installppp:30 dh_installcron:28 dh_installinit:72 -#: dh_installmodules:43 dh_installlogrotate:26 +#: dh_installmodules:42 dh_installlogrotate:26 msgid "B<--name=>I" msgstr "B<--name=>I" @@ -126,7 +126,7 @@ msgstr "" #: dh_installpam:52 dh_installemacsen:108 dh_installinfo:122 dh_strip:215 #: dh_installppp:56 dh_compress:189 dh_md5sums:86 dh_installexamples:102 #: dh_installcron:61 dh_installinit:197 dh_usrlocal:113 dh_gconf:90 -#: dh_installmodules:102 dh_installmenu:79 dh_installlogrotate:50 +#: dh_installmodules:114 dh_installmenu:79 dh_installlogrotate:50 #: debhelper.pod:437 dh_clean:106 dh_undocumented:28 dh_testversion:74 #: dh_testdir:43 dh_shlibdeps:150 dh_scrollkeeper:75 dh_installdirs:87 #: dh_link:212 dh_installdebconf:117 dh_installmime:84 dh_installwm:94 @@ -143,7 +143,7 @@ msgstr "VOIR AUSSI" #: dh_installpam:54 dh_installemacsen:110 dh_installinfo:124 dh_strip:217 #: dh_installppp:58 dh_compress:191 dh_md5sums:88 dh_installexamples:104 #: dh_installcron:63 dh_installinit:199 dh_usrlocal:115 dh_gconf:92 -#: dh_installmodules:104 dh_installlogrotate:52 dh_clean:108 +#: dh_installmodules:116 dh_installlogrotate:52 dh_clean:108 #: dh_undocumented:30 dh_testversion:76 dh_testdir:45 dh_installdirs:89 #: dh_link:214 dh_installdebconf:119 dh_installmime:86 dh_installwm:96 #: dh_installdeb:95 dh_builddeb:80 dh_gencontrol:75 dh_install:253 @@ -159,7 +159,7 @@ msgstr "L" #: dh_installpam:56 dh_installemacsen:112 dh_installinfo:126 dh_strip:219 #: dh_installppp:60 dh_compress:193 dh_md5sums:90 dh_installexamples:106 #: dh_installcron:65 dh_installinit:201 dh_usrlocal:117 dh_gconf:94 -#: dh_installmodules:106 dh_installmenu:85 dh_installlogrotate:54 dh_clean:110 +#: dh_installmodules:118 dh_installmenu:85 dh_installlogrotate:54 dh_clean:110 #: dh_undocumented:32 dh_testversion:78 dh_testdir:47 dh_shlibdeps:154 #: dh_scrollkeeper:79 dh_installdirs:91 dh_link:216 dh_installdebconf:121 #: dh_installmime:88 dh_installwm:98 dh_installdeb:97 dh_builddeb:82 @@ -174,7 +174,7 @@ msgstr "Ce programme fait partie de debhelper." #: dh_installpam:58 dh_installemacsen:114 dh_installinfo:128 dh_strip:221 #: dh_installppp:62 dh_compress:195 dh_md5sums:92 dh_installexamples:108 #: dh_installcron:67 dh_installinit:203 dh_usrlocal:119 dh_gconf:96 -#: dh_installmodules:108 dh_installmenu:87 dh_installlogrotate:56 +#: dh_installmodules:120 dh_installmenu:87 dh_installlogrotate:56 #: debhelper.pod:451 dh_clean:112 dh_undocumented:34 dh_testversion:80 #: dh_testdir:49 dh_shlibdeps:156 dh_scrollkeeper:81 dh_installdirs:93 #: dh_link:218 dh_installdebconf:123 dh_installmime:90 dh_installwm:100 @@ -190,7 +190,7 @@ msgstr "AUTEUR" # type: textblock #: dh_installpam:60 dh_installemacsen:116 dh_installinfo:130 dh_strip:223 #: dh_installppp:64 dh_compress:197 dh_md5sums:94 dh_installexamples:110 -#: dh_installcron:69 dh_installinit:205 dh_installmodules:110 +#: dh_installcron:69 dh_installinit:205 dh_installmodules:122 #: dh_installmenu:89 dh_installlogrotate:58 debhelper.pod:453 dh_clean:114 #: dh_undocumented:36 dh_testversion:82 dh_testdir:51 dh_shlibdeps:158 #: dh_installdirs:95 dh_link:220 dh_installdebconf:125 dh_installmime:92 @@ -259,7 +259,7 @@ msgstr "" # type: =item #: dh_installemacsen:38 dh_installinfo:45 dh_installinit:37 dh_usrlocal:42 -#: dh_installmodules:39 dh_installmenu:37 dh_scrollkeeper:35 +#: dh_installmodules:38 dh_installmenu:37 dh_scrollkeeper:35 #: dh_installdebconf:53 dh_installmime:34 dh_installwm:40 dh_makeshlibs:58 #: dh_python:56 dh_installdocs:60 dh_installcatalogs:46 msgid "B<-n>, B<--noscripts>" @@ -299,7 +299,7 @@ msgstr "" # type: =head1 #: dh_installemacsen:53 dh_installinfo:56 dh_strip:68 dh_installexamples:50 -#: dh_installinit:99 dh_usrlocal:48 dh_installmodules:52 debhelper.pod:158 +#: dh_installinit:99 dh_usrlocal:48 dh_installmodules:51 debhelper.pod:158 #: dh_scrollkeeper:41 dh_installmime:40 dh_installwm:49 dh_installman:74 #: dh_movefiles:58 dh_installdocs:87 dh_installcatalogs:52 dh_installxfonts:36 msgid "NOTES" @@ -307,7 +307,7 @@ msgstr "REMARQUES" # type: textblock #: dh_installemacsen:55 dh_installinfo:58 dh_installinit:101 dh_usrlocal:50 -#: dh_installmodules:54 dh_scrollkeeper:43 dh_installmime:42 dh_installwm:51 +#: dh_installmodules:53 dh_scrollkeeper:43 dh_installmime:42 dh_installwm:51 #: dh_installcatalogs:54 msgid "" "Note that this command is not idempotent. \"dh_clean -k\" should be called " @@ -1286,9 +1286,10 @@ msgstr "" # type: textblock #: dh_installmodules:20 +#, fuzzy msgid "" "dh_installmodules is a debhelper program that is responsible for registering " -"kernel modules with modutils." +"kernel modules." msgstr "" "dh_installmodules est le programme de la suite debhelper chargé de " "l'inscription des modules du noyau avec modutils." @@ -1310,34 +1311,31 @@ msgstr "" # type: textblock #: dh_installmodules:29 +#, fuzzy msgid "" -"Then postinst and postrm commands are automatically generated to register " -"the modules when the package is installed. See L for an " -"explanation of how this works. Note that this will be done for any package " -"this program acts on which has either a package.modules file, or has .o or ." -"ko files in /lib/modules." +"Kernel modules are searched for in the package build directory and if found, " +"postinst and postrm commands are automatically generated to run depmod and " +"register the modules when the package is installed. See L " +"for an explanation of how this works." msgstr "" -"dh_installmodules produit les lignes de code des scripts de maintenance " -"postinst et postrm nécessaires à l'inscription des modules lors de " -"l'installation du paquet. Consulter L pour obtenir une " -"explication sur le mécanisme d'insertion de lignes de code dans les scripts " -"de maintenance du paquet. S Cela sera réalisé pour tous les paquets " -"construits qui possèdent un fichier paquet.module ou un fichier .o ou .ko " -"dans /lib/modules." +"De plus, il produit automatiquement les lignes de code des scripts de " +"maintenance postinst et postrm nécessaires à l'interfaçage avec le paquet " +"menu. Consulter L pour obtenir une explication sur le " +"mécanisme d'insertion de lignes de code." # type: textblock -#: dh_installmodules:41 dh_installmenu:39 dh_installmime:36 dh_makeshlibs:60 +#: dh_installmodules:40 dh_installmenu:39 dh_installmime:36 dh_makeshlibs:60 #: dh_python:58 msgid "Do not modify postinst/postrm scripts." msgstr "Empêche la modification des scripts de maintenance postinst et postrm." # type: textblock -#: dh_installmodules:45 +#: dh_installmodules:44 +#, fuzzy msgid "" -"Use \"name\" as the filename the modules file is installed in etc/modutils/. " "When this parameter is used, dh_installmodules looks for and installs files " -"named debian/package.name.modules instead of the usual debian/package." -"modules." +"named debian/package.name.modules and debian/package.name.modprobe instead " +"of the usual debian/package.modules and debian/package.modprobe" msgstr "" "Utilise S<« nom »> pour nommer le fichier de modules installé dans etc/" "modutils/. Quand ce paramètre est utilisé, dh_installmodules cherche et " @@ -5369,3 +5367,19 @@ msgstr "" #: dh_installlogcheck:59 msgid "Jon Middleton " msgstr "Jon Middleton " + +# type: textblock +#~ msgid "" +#~ "Then postinst and postrm commands are automatically generated to register " +#~ "the modules when the package is installed. See L for an " +#~ "explanation of how this works. Note that this will be done for any " +#~ "package this program acts on which has either a package.modules file, or " +#~ "has .o or .ko files in /lib/modules." +#~ msgstr "" +#~ "dh_installmodules produit les lignes de code des scripts de maintenance " +#~ "postinst et postrm nécessaires à l'inscription des modules lors de " +#~ "l'installation du paquet. Consulter L pour obtenir une " +#~ "explication sur le mécanisme d'insertion de lignes de code dans les " +#~ "scripts de maintenance du paquet. S Cela sera réalisé pour tous " +#~ "les paquets construits qui possèdent un fichier paquet.module ou un " +#~ "fichier .o ou .ko dans /lib/modules." -- 2.39.2