diff -Nru debhelper-9.20131127ubuntu2/debian/changelog debhelper-9.20131227ubuntu1/debian/changelog --- debhelper-9.20131127ubuntu2/debian/changelog 2013-12-09 17:13:45.000000000 +0000 +++ debhelper-9.20131227ubuntu1/debian/changelog 2014-02-19 14:18:57.000000000 +0000 @@ -1,3 +1,47 @@ +debhelper (9.20131227ubuntu1) trusty; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Depend on dh-apparmor. + - dh_installinit, autoscripts/postinst-upstart-replace: Prefer upstart + jobs where they exist. + - autoscripts/preinst-upstart-compatibility: Handle upgrades from older + versions that created the /lib/init/upstart-job symlink. + - autoscripts/postinst-init*: Only call update-rc.d when there's no + upstart job. + - autoscripts/*-init*: Test for /etc/init/*.conf where necessary. + - dh_installinit: Add no-op --upstart-only option for compatibility. + - dh_installudev: Change default rules.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. + - preserve the change that adds versioned dependency on sysv-rc to + support precise->trusty upgrades. + + -- Dimitri John Ledkov Wed, 19 Feb 2014 14:18:57 +0000 + +debhelper (9.20131227) unstable; urgency=medium + + [ Guillem Jover ] + * dh_shlibdeps: Use new dpkg-shlibdeps -l option instead of LD_LIBRARY_PATH + Closes: #717505 + * Depend on dpkg-dev (>= 1.17.0), the version that introduced + dpkg-shlibdeps -l option. + + -- Joey Hess Fri, 27 Dec 2013 21:52:53 -0400 + +debhelper (9.20131213) unstable; urgency=low + + [ Joey Hess ] + * cmake: Configure with -DCMAKE_BUILD_TYPE=None + Closes: #701233 + + [ Andreas Beckmann ] + * dh_installdeb: Add support for dpkg-maintscript-helper commands + symlink_to_dir and dir_to_symlink that were added in dpkg 1.17.2. + Closes: #731723 + + -- Joey Hess Fri, 13 Dec 2013 14:46:26 -0400 + debhelper (9.20131127ubuntu2) trusty; urgency=low * Revert 9.20131110 diff -Nru debhelper-9.20131127ubuntu2/debian/control debhelper-9.20131227ubuntu1/debian/control --- debhelper-9.20131127ubuntu2/debian/control 2013-12-09 12:02:34.000000000 +0000 +++ debhelper-9.20131227ubuntu1/debian/control 2014-02-19 14:17:30.000000000 +0000 @@ -5,14 +5,14 @@ XSBC-Original-Maintainer: Debhelper Maintainers Uploaders: Joey Hess Build-Depends: po4a (>= 0.24) -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Git: git://git.debian.org/git/debhelper/debhelper.git Vcs-Browser: http://git.debian.org/?p=debhelper/debhelper.git;a=summary Homepage: http://kitenet.net/~joey/code/debhelper/ Package: debhelper Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.16.2), binutils, po-debconf, man-db (>= 2.5.1-1), dh-apparmor +Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.17.0), binutils, po-debconf, man-db (>= 2.5.1-1), dh-apparmor Suggests: dh-make Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6), automake (<< 1.11.2) Multi-Arch: foreign diff -Nru debhelper-9.20131127ubuntu2/Debian/Debhelper/Buildsystem/cmake.pm debhelper-9.20131227ubuntu1/Debian/Debhelper/Buildsystem/cmake.pm --- debhelper-9.20131127ubuntu2/Debian/Debhelper/Buildsystem/cmake.pm 2013-07-01 11:34:53.000000000 +0000 +++ debhelper-9.20131227ubuntu1/Debian/Debhelper/Buildsystem/cmake.pm 2014-02-19 13:48:00.000000000 +0000 @@ -43,7 +43,7 @@ # Standard set of cmake flags push @flags, "-DCMAKE_INSTALL_PREFIX=/usr"; push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON"; - push @flags, "-DCMAKE_BUILD_TYPE=RelWithDebInfo"; + push @flags, "-DCMAKE_BUILD_TYPE=None"; # CMake doesn't respect CPPFLAGS, see #653916. if ($ENV{CPPFLAGS} && ! compat(8)) { diff -Nru debhelper-9.20131127ubuntu2/dh_installdeb debhelper-9.20131227ubuntu1/dh_installdeb --- debhelper-9.20131127ubuntu2/dh_installdeb 2013-07-01 11:34:53.000000000 +0000 +++ debhelper-9.20131227ubuntu1/dh_installdeb 2014-02-19 13:48:00.000000000 +0000 @@ -69,6 +69,8 @@ my %maintscript_predeps = ( "rm_conffile" => "", "mv_conffile" => "", + "symlink_to_dir" => "1.17.5", + "dir_to_symlink" => "1.17.5", ); foreach my $package (@{$dh{DOPACKAGES}}) { diff -Nru debhelper-9.20131127ubuntu2/dh_installudev debhelper-9.20131227ubuntu1/dh_installudev --- debhelper-9.20131127ubuntu2/dh_installudev 2013-07-01 11:34:53.000000000 +0000 +++ debhelper-9.20131227ubuntu1/dh_installudev 2014-02-19 14:17:56.000000000 +0000 @@ -44,7 +44,7 @@ =item B<--priority=>I -Sets the priority string of the F symlink. Default is 40. +Sets the priority the file. Default is 40. =item B<-n>, B<--noscripts> diff -Nru debhelper-9.20131127ubuntu2/dh_shlibdeps debhelper-9.20131227ubuntu1/dh_shlibdeps --- debhelper-9.20131127ubuntu2/dh_shlibdeps 2013-07-01 11:34:53.000000000 +0000 +++ debhelper-9.20131227ubuntu1/dh_shlibdeps 2014-02-19 13:48:00.000000000 +0000 @@ -48,8 +48,9 @@ With recent versions of B, this option is generally not needed. -Before B is run, B will have added to it the -specified directory (or directories -- separate with colons). With recent +It tells B (via its B<-l> parameter), to look for private +package libraries in the specified directory (or directories -- separate +with colons). With recent versions of B, this is mostly only useful for packages that build multiple flavors of the same library, or other situations where the library is installed into a directory not on the regular library search @@ -94,23 +95,6 @@ "l=s", => \$dh{L_PARAMS}, }); -if ($dh{L_PARAMS}) { - my @paths=(); - # Add to existing paths, if set. - push @paths, $ENV{'LD_LIBRARY_PATH'} - if exists $ENV{'LD_LIBRARY_PATH'}; - foreach (split(/:/, $dh{L_PARAMS})) { - # Force the path absolute. - if (m:^/:) { - push @paths, $_; - } - else { - push @paths, "/$_"; - } - } - $dh{L_PARAMS}=join(':', @paths); -} - if (defined $dh{V_FLAG}) { warning("You probably wanted to pass -V to dh_makeshlibs, it has no effect on dh_shlibdeps"); } @@ -152,23 +136,16 @@ push @opts, "-tudeb" if is_udeb($package); - my $ld_library_path_orig=$ENV{LD_LIBRARY_PATH}; if ($dh{L_PARAMS}) { - $ENV{LD_LIBRARY_PATH}=$dh{L_PARAMS}; - verbose_print("LD_LIBRARY_PATH=$dh{L_PARAMS}"); + foreach (split(/:/, $dh{L_PARAMS})) { + # Force the path absolute. + my $libdir = m:^/: ? $_ : "/$_"; + push @opts, "-l$libdir"; + } } doit("dpkg-shlibdeps","-Tdebian/${ext}substvars", @opts,@{$dh{U_PARAMS}},@filelist); - - if ($dh{L_PARAMS}) { - if (defined $ld_library_path_orig) { - $ENV{LD_LIBRARY_PATH}=$ld_library_path_orig; - } - else { - delete $ENV{LD_LIBRARY_PATH}; - } - } } } diff -Nru debhelper-9.20131127ubuntu2/man/po4a/po/debhelper.pot debhelper-9.20131227ubuntu1/man/po4a/po/debhelper.pot --- debhelper-9.20131127ubuntu2/man/po4a/po/debhelper.pot 2013-12-09 17:14:04.000000000 +0000 +++ debhelper-9.20131227ubuntu1/man/po4a/po/debhelper.pot 2014-02-19 14:18:16.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2013-12-09 17:14+0000\n" +"POT-Creation-Date: 2014-02-19 14:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1192,7 +1192,7 @@ msgstr "" #. type: =head1 -#: debhelper.pod:683 dh:969 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124 dh_builddeb:124 dh_clean:142 dh_compress:210 dh_desktop:31 dh_fixperms:127 dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260 dh_installcatalogs:122 dh_installchangelogs:224 dh_installcron:79 dh_installdeb:140 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:334 dh_installemacsen:141 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:77 dh_installinit:343 dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 dh_installmanpages:197 dh_installmenu:89 dh_installmime:63 dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59 dh_listpackages:30 dh_makeshlibs:258 dh_md5sums:90 dh_movefiles:170 dh_perl:148 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:175 dh_strip:242 dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28 dh_usrlocal:116 +#: debhelper.pod:683 dh:969 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124 dh_builddeb:124 dh_clean:142 dh_compress:210 dh_desktop:31 dh_fixperms:127 dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260 dh_installcatalogs:122 dh_installchangelogs:224 dh_installcron:79 dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:334 dh_installemacsen:141 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:77 dh_installinit:343 dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 dh_installmanpages:197 dh_installmenu:89 dh_installmime:63 dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59 dh_listpackages:30 dh_makeshlibs:258 dh_md5sums:90 dh_movefiles:170 dh_perl:148 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:242 dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28 dh_usrlocal:116 msgid "SEE ALSO" msgstr "" @@ -1217,12 +1217,12 @@ msgstr "" #. type: =head1 -#: debhelper.pod:697 dh:975 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132 dh_builddeb:130 dh_clean:148 dh_compress:216 dh_desktop:37 dh_fixperms:133 dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266 dh_installcatalogs:128 dh_installchangelogs:230 dh_installcron:85 dh_installdeb:146 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:340 dh_installemacsen:148 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86 dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203 dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67 dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:264 dh_md5sums:96 dh_movefiles:176 dh_perl:154 dh_prep:66 dh_scrollkeeper:34 dh_shlibdeps:181 dh_strip:248 dh_suidregister:123 dh_testdir:59 dh_testroot:33 dh_undocumented:34 dh_usrlocal:122 +#: debhelper.pod:697 dh:975 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132 dh_builddeb:130 dh_clean:148 dh_compress:216 dh_desktop:37 dh_fixperms:133 dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266 dh_installcatalogs:128 dh_installchangelogs:230 dh_installcron:85 dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:340 dh_installemacsen:148 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86 dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203 dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67 dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:264 dh_md5sums:96 dh_movefiles:176 dh_perl:154 dh_prep:66 dh_scrollkeeper:34 dh_shlibdeps:158 dh_strip:248 dh_suidregister:123 dh_testdir:59 dh_testroot:33 dh_undocumented:34 dh_usrlocal:122 msgid "AUTHOR" msgstr "" #. type: textblock -#: debhelper.pod:699 dh:977 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 dh_clean:150 dh_compress:218 dh_fixperms:135 dh_gencontrol:90 dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:148 dh_installdebconf:136 dh_installdirs:96 dh_installdocs:342 dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79 dh_installinfo:85 dh_installinit:351 dh_installlogrotate:60 dh_installman:271 dh_installmanpages:205 dh_installmenu:99 dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75 dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236 dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:183 dh_strip:250 dh_suidregister:125 dh_testdir:61 dh_testroot:35 dh_undocumented:36 +#: debhelper.pod:699 dh:977 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 dh_clean:150 dh_compress:218 dh_fixperms:135 dh_gencontrol:90 dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:150 dh_installdebconf:136 dh_installdirs:96 dh_installdocs:342 dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79 dh_installinfo:85 dh_installinit:351 dh_installlogrotate:60 dh_installman:271 dh_installmanpages:205 dh_installmenu:99 dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75 dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236 dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:160 dh_strip:250 dh_suidregister:125 dh_testdir:61 dh_testroot:35 dh_undocumented:36 msgid "Joey Hess " msgstr "" @@ -1339,7 +1339,7 @@ msgstr "" #. type: =head1 -#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:69 +#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:70 msgid "EXAMPLES" msgstr "" @@ -1746,12 +1746,12 @@ msgstr "" #. type: textblock -#: dh:971 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144 dh_compress:212 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84 dh_install:262 dh_installcatalogs:124 dh_installchangelogs:226 dh_installcron:81 dh_installdeb:142 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:336 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:79 dh_installinit:345 dh_installlogcheck:82 dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199 dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230 dh_listpackages:32 dh_makeshlibs:260 dh_md5sums:92 dh_movefiles:172 dh_perl:150 dh_prep:62 dh_strip:244 dh_suidregister:119 dh_testdir:55 dh_testroot:29 dh_undocumented:30 dh_usrlocal:118 +#: dh:971 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144 dh_compress:212 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84 dh_install:262 dh_installcatalogs:124 dh_installchangelogs:226 dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:336 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:79 dh_installinit:345 dh_installlogcheck:82 dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199 dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230 dh_listpackages:32 dh_makeshlibs:260 dh_md5sums:92 dh_movefiles:172 dh_perl:150 dh_prep:62 dh_strip:244 dh_suidregister:119 dh_testdir:55 dh_testroot:29 dh_undocumented:30 dh_usrlocal:118 msgid "L" msgstr "" #. type: textblock -#: dh:973 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 dh_clean:146 dh_compress:214 dh_desktop:35 dh_fixperms:131 dh_gconf:105 dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:228 dh_installcron:83 dh_installdeb:144 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:338 dh_installemacsen:146 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:81 dh_installinit:347 dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201 dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:262 dh_md5sums:94 dh_movefiles:174 dh_perl:152 dh_prep:64 dh_scrollkeeper:32 dh_shlibdeps:179 dh_strip:246 dh_suidregister:121 dh_testdir:57 dh_testroot:31 dh_undocumented:32 dh_usrlocal:120 +#: dh:973 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 dh_clean:146 dh_compress:214 dh_desktop:35 dh_fixperms:131 dh_gconf:105 dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:228 dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:338 dh_installemacsen:146 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:81 dh_installinit:347 dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201 dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:262 dh_md5sums:94 dh_movefiles:174 dh_perl:152 dh_prep:64 dh_scrollkeeper:32 dh_shlibdeps:156 dh_strip:246 dh_suidregister:121 dh_testdir:57 dh_testroot:31 dh_undocumented:32 dh_usrlocal:120 msgid "This program is a part of debhelper." msgstr "" @@ -4539,7 +4539,7 @@ #. type: textblock #: dh_installudev:47 -msgid "Sets the priority string of the F symlink. Default is 40." +msgid "Sets the priority the file. Default is 40." msgstr "" #. type: textblock @@ -5383,28 +5383,28 @@ #. type: textblock #: dh_shlibdeps:51 msgid "" -"Before B is run, B will have added to it " -"the specified directory (or directories -- separate with colons). With " -"recent versions of B, this is mostly only useful for " -"packages that build multiple flavors of the same library, or other " -"situations where the library is installed into a directory not on the " +"It tells B (via its B<-l> parameter), to look for private " +"package libraries in the specified directory (or directories -- separate " +"with colons). With recent versions of B, this is mostly only " +"useful for packages that build multiple flavors of the same library, or " +"other situations where the library is installed into a directory not on the " "regular library search path." msgstr "" #. type: =item -#: dh_shlibdeps:58 +#: dh_shlibdeps:59 msgid "B<-L>I, B<--libpackage=>I" msgstr "" #. type: textblock -#: dh_shlibdeps:60 +#: dh_shlibdeps:61 msgid "" "With recent versions of B, this option is generally not " "needed, unless your package builds multiple flavors of the same library." msgstr "" #. type: textblock -#: dh_shlibdeps:63 +#: dh_shlibdeps:64 msgid "" "It tells B (via its B<-S> parameter) to look first in the " "package build directory for the specified package, when searching for " @@ -5412,7 +5412,7 @@ msgstr "" #. type: textblock -#: dh_shlibdeps:71 +#: dh_shlibdeps:72 msgid "" "Suppose that your source package produces libfoo1, libfoo-dev, and " "libfoo-bin binary packages. libfoo-bin links against libfoo1, and should " @@ -5421,7 +5421,7 @@ msgstr "" #. type: verbatim -#: dh_shlibdeps:75 +#: dh_shlibdeps:76 #, no-wrap msgid "" "\tdh_makeshlibs\n" @@ -5430,7 +5430,7 @@ msgstr "" #. type: textblock -#: dh_shlibdeps:78 +#: dh_shlibdeps:79 msgid "" "This will have the effect of generating automatically a shlibs file for " "libfoo1, and using that file and the libfoo1 library in the " @@ -5439,7 +5439,7 @@ msgstr "" #. type: textblock -#: dh_shlibdeps:83 +#: dh_shlibdeps:84 msgid "" "If a libbar1 package is also produced, that is an alternate build of libfoo, " "and is installed into F, you can make libfoo-bin depend on " @@ -5447,7 +5447,7 @@ msgstr "" #. type: verbatim -#: dh_shlibdeps:87 +#: dh_shlibdeps:88 #, no-wrap msgid "" "\tdh_shlibdeps -Llibbar1 -l/usr/lib/bar\n" @@ -5455,7 +5455,7 @@ msgstr "" #. type: textblock -#: dh_shlibdeps:177 +#: dh_shlibdeps:154 msgid "L, L" msgstr "" diff -Nru debhelper-9.20131127ubuntu2/man/po4a/po/de.po debhelper-9.20131227ubuntu1/man/po4a/po/de.po --- debhelper-9.20131127ubuntu2/man/po4a/po/de.po 2013-12-09 17:14:04.000000000 +0000 +++ debhelper-9.20131227ubuntu1/man/po4a/po/de.po 2014-02-19 14:18:16.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: debhelper 9.20120909\n" "Report-Msgid-Bugs-To: debhelper@packages.debian.org\n" -"POT-Creation-Date: 2013-12-09 17:14+0000\n" +"POT-Creation-Date: 2014-02-19 14:18+0000\n" "PO-Revision-Date: 2012-10-22 22:00+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -1613,7 +1613,7 @@ #: dh_builddeb:124 dh_clean:142 dh_compress:210 dh_desktop:31 dh_fixperms:127 #: dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260 #: dh_installcatalogs:122 dh_installchangelogs:224 dh_installcron:79 -#: dh_installdeb:140 dh_installdebconf:128 dh_installdirs:88 +#: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88 #: dh_installdocs:334 dh_installemacsen:141 dh_installexamples:108 #: dh_installifupdown:71 dh_installinfo:77 dh_installinit:343 #: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 @@ -1621,7 +1621,7 @@ #: dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117 #: dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59 #: dh_listpackages:30 dh_makeshlibs:258 dh_md5sums:90 dh_movefiles:170 -#: dh_perl:148 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:175 dh_strip:242 +#: dh_perl:148 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:242 #: dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28 #: dh_usrlocal:116 msgid "SEE ALSO" @@ -1655,7 +1655,7 @@ #: dh_builddeb:130 dh_clean:148 dh_compress:216 dh_desktop:37 dh_fixperms:133 #: dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266 #: dh_installcatalogs:128 dh_installchangelogs:230 dh_installcron:85 -#: dh_installdeb:146 dh_installdebconf:134 dh_installdirs:94 +#: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94 #: dh_installdocs:340 dh_installemacsen:148 dh_installexamples:114 #: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86 #: dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203 @@ -1663,7 +1663,7 @@ #: dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 #: dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:264 #: dh_md5sums:96 dh_movefiles:176 dh_perl:154 dh_prep:66 dh_scrollkeeper:34 -#: dh_shlibdeps:181 dh_strip:248 dh_suidregister:123 dh_testdir:59 +#: dh_shlibdeps:158 dh_strip:248 dh_suidregister:123 dh_testdir:59 #: dh_testroot:33 dh_undocumented:34 dh_usrlocal:122 msgid "AUTHOR" msgstr "AUTOR" @@ -1672,7 +1672,7 @@ #: debhelper.pod:699 dh:977 dh_auto_build:55 dh_auto_clean:58 #: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 #: dh_clean:150 dh_compress:218 dh_fixperms:135 dh_gencontrol:90 -#: dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:148 +#: dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:150 #: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:342 #: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79 #: dh_installinfo:85 dh_installinit:351 dh_installlogrotate:60 @@ -1680,7 +1680,7 @@ #: dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75 #: dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236 #: dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 -#: dh_prep:68 dh_shlibdeps:183 dh_strip:250 dh_suidregister:125 dh_testdir:61 +#: dh_prep:68 dh_shlibdeps:160 dh_strip:250 dh_suidregister:125 dh_testdir:61 #: dh_testroot:35 dh_undocumented:36 msgid "Joey Hess " msgstr "Joey Hess " @@ -1854,7 +1854,7 @@ "oder B<-N> sowie spezialisiertere Optionen zu setzen." #. type: =head1 -#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:69 +#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:70 msgid "EXAMPLES" msgstr "BEISPIELE" @@ -2406,7 +2406,7 @@ #: dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144 #: dh_compress:212 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84 #: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:226 -#: dh_installcron:81 dh_installdeb:142 dh_installdebconf:130 dh_installdirs:90 +#: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90 #: dh_installdocs:336 dh_installexamples:110 dh_installifupdown:73 #: dh_installinfo:79 dh_installinit:345 dh_installlogcheck:82 #: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199 @@ -2423,7 +2423,7 @@ #: dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 #: dh_clean:146 dh_compress:214 dh_desktop:35 dh_fixperms:131 dh_gconf:105 #: dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:228 -#: dh_installcron:83 dh_installdeb:144 dh_installdebconf:132 dh_installdirs:92 +#: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92 #: dh_installdocs:338 dh_installemacsen:146 dh_installexamples:112 #: dh_installifupdown:75 dh_installinfo:81 dh_installinit:347 #: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201 @@ -2431,7 +2431,7 @@ #: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 #: dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:262 #: dh_md5sums:94 dh_movefiles:174 dh_perl:152 dh_prep:64 dh_scrollkeeper:32 -#: dh_shlibdeps:179 dh_strip:246 dh_suidregister:121 dh_testdir:57 +#: dh_shlibdeps:156 dh_strip:246 dh_suidregister:121 dh_testdir:57 #: dh_testroot:31 dh_undocumented:32 dh_usrlocal:120 msgid "This program is a part of debhelper." msgstr "Dieses Programm ist Teil von Debhelper." @@ -6000,11 +6000,10 @@ #. type: textblock #: dh_installudev:47 #, fuzzy -#| msgid "Sets the priority string of the F symlink. Default is 60." -msgid "Sets the priority string of the F symlink. Default is 40." +#| msgid "Sets the priority number of a F file. Default is 50." +msgid "Sets the priority the file. Default is 40." msgstr "" -"setzt die Prioritätszeichenkette des symbolischen F-Verweises. " -"Vorgabe ist 60." +"setzt die Prioritätsnummer einer F-Datei. Vorgabe ist 50." #. type: textblock #: dh_installudev:51 @@ -7112,12 +7111,20 @@ #. type: textblock #: dh_shlibdeps:51 -msgid "" -"Before B is run, B will have added to it " -"the specified directory (or directories -- separate with colons). With " -"recent versions of B, this is mostly only useful for " -"packages that build multiple flavors of the same library, or other " -"situations where the library is installed into a directory not on the " +#, fuzzy +#| msgid "" +#| "Before B is run, B will have added to it " +#| "the specified directory (or directories -- separate with colons). With " +#| "recent versions of B, this is mostly only useful for " +#| "packages that build multiple flavors of the same library, or other " +#| "situations where the library is installed into a directory not on the " +#| "regular library search path." +msgid "" +"It tells B (via its B<-l> parameter), to look for private " +"package libraries in the specified directory (or directories -- separate " +"with colons). With recent versions of B, this is mostly only " +"useful for packages that build multiple flavors of the same library, or " +"other situations where the library is installed into a directory not on the " "regular library search path." msgstr "" "Bevor B ausgeführt wird, wird B das " @@ -7129,12 +7136,12 @@ "Bibliothekssuchpfad liegt." #. type: =item -#: dh_shlibdeps:58 +#: dh_shlibdeps:59 msgid "B<-L>I, B<--libpackage=>I" msgstr "B<-L>I, B<--libpackage=>I" #. type: textblock -#: dh_shlibdeps:60 +#: dh_shlibdeps:61 msgid "" "With recent versions of B, this option is generally not " "needed, unless your package builds multiple flavors of the same library." @@ -7144,7 +7151,7 @@ "Geschmacksrichtungen der gleichen Bibliothek." #. type: textblock -#: dh_shlibdeps:63 +#: dh_shlibdeps:64 msgid "" "It tells B (via its B<-S> parameter) to look first in the " "package build directory for the specified package, when searching for " @@ -7155,7 +7162,7 @@ "Bibliotheken, Symbol- und Shlibs-Dateien gesucht wird." #. type: textblock -#: dh_shlibdeps:71 +#: dh_shlibdeps:72 msgid "" "Suppose that your source package produces libfoo1, libfoo-dev, and libfoo-" "bin binary packages. libfoo-bin links against libfoo1, and should depend on " @@ -7167,7 +7174,7 @@ "B aus:" #. type: verbatim -#: dh_shlibdeps:75 +#: dh_shlibdeps:76 #, no-wrap msgid "" "\tdh_makeshlibs\n" @@ -7179,7 +7186,7 @@ "\n" #. type: textblock -#: dh_shlibdeps:78 +#: dh_shlibdeps:79 msgid "" "This will have the effect of generating automatically a shlibs file for " "libfoo1, and using that file and the libfoo1 library in the F, you can make libfoo-bin depend on " @@ -7202,7 +7209,7 @@ "wie folgt eine Abhängigkeit von libbar1 erreichen:" #. type: verbatim -#: dh_shlibdeps:87 +#: dh_shlibdeps:88 #, no-wrap msgid "" "\tdh_shlibdeps -Llibbar1 -l/usr/lib/bar\n" @@ -7212,7 +7219,7 @@ "\t\n" #. type: textblock -#: dh_shlibdeps:177 +#: dh_shlibdeps:154 msgid "L, L" msgstr "L, L" @@ -7562,6 +7569,13 @@ msgid "Andrew Stribblehill " msgstr "Andrew Stribblehill " +#, fuzzy +#~| msgid "Sets the priority string of the F symlink. Default is 60." +#~ msgid "Sets the priority string of the F symlink. Default is 40." +#~ msgstr "" +#~ "setzt die Prioritätszeichenkette des symbolischen F-Verweises. " +#~ "Vorgabe ist 60." + #~ msgid "" #~ "An upstream F file may be specified as an option. If none is " #~ "specified, it looks for files with names that seem likely to be " diff -Nru debhelper-9.20131127ubuntu2/man/po4a/po/es.po debhelper-9.20131227ubuntu1/man/po4a/po/es.po --- debhelper-9.20131127ubuntu2/man/po4a/po/es.po 2013-12-09 17:14:04.000000000 +0000 +++ debhelper-9.20131227ubuntu1/man/po4a/po/es.po 2014-02-19 14:18:16.000000000 +0000 @@ -31,7 +31,7 @@ msgstr "" "Project-Id-Version: debhelper 9.20120609\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-09 17:14+0000\n" +"POT-Creation-Date: 2014-02-19 14:18+0000\n" "PO-Revision-Date: 2012-08-20 11:17+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -1740,7 +1740,7 @@ #: dh_builddeb:124 dh_clean:142 dh_compress:210 dh_desktop:31 dh_fixperms:127 #: dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260 #: dh_installcatalogs:122 dh_installchangelogs:224 dh_installcron:79 -#: dh_installdeb:140 dh_installdebconf:128 dh_installdirs:88 +#: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88 #: dh_installdocs:334 dh_installemacsen:141 dh_installexamples:108 #: dh_installifupdown:71 dh_installinfo:77 dh_installinit:343 #: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 @@ -1748,7 +1748,7 @@ #: dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117 #: dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59 #: dh_listpackages:30 dh_makeshlibs:258 dh_md5sums:90 dh_movefiles:170 -#: dh_perl:148 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:175 dh_strip:242 +#: dh_perl:148 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:242 #: dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28 #: dh_usrlocal:116 msgid "SEE ALSO" @@ -1785,7 +1785,7 @@ #: dh_builddeb:130 dh_clean:148 dh_compress:216 dh_desktop:37 dh_fixperms:133 #: dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266 #: dh_installcatalogs:128 dh_installchangelogs:230 dh_installcron:85 -#: dh_installdeb:146 dh_installdebconf:134 dh_installdirs:94 +#: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94 #: dh_installdocs:340 dh_installemacsen:148 dh_installexamples:114 #: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86 #: dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203 @@ -1793,7 +1793,7 @@ #: dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 #: dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:264 #: dh_md5sums:96 dh_movefiles:176 dh_perl:154 dh_prep:66 dh_scrollkeeper:34 -#: dh_shlibdeps:181 dh_strip:248 dh_suidregister:123 dh_testdir:59 +#: dh_shlibdeps:158 dh_strip:248 dh_suidregister:123 dh_testdir:59 #: dh_testroot:33 dh_undocumented:34 dh_usrlocal:122 msgid "AUTHOR" msgstr "AUTOR" @@ -1803,7 +1803,7 @@ #: debhelper.pod:699 dh:977 dh_auto_build:55 dh_auto_clean:58 #: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 #: dh_clean:150 dh_compress:218 dh_fixperms:135 dh_gencontrol:90 -#: dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:148 +#: dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:150 #: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:342 #: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79 #: dh_installinfo:85 dh_installinit:351 dh_installlogrotate:60 @@ -1811,7 +1811,7 @@ #: dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75 #: dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236 #: dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 -#: dh_prep:68 dh_shlibdeps:183 dh_strip:250 dh_suidregister:125 dh_testdir:61 +#: dh_prep:68 dh_shlibdeps:160 dh_strip:250 dh_suidregister:125 dh_testdir:61 #: dh_testroot:35 dh_undocumented:36 msgid "Joey Hess " msgstr "Joey Hess " @@ -1988,7 +1988,7 @@ # type: =head1 #. type: =head1 -#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:69 +#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:70 msgid "EXAMPLES" msgstr "EJEMPLOS" @@ -2543,7 +2543,7 @@ #: dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144 #: dh_compress:212 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84 #: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:226 -#: dh_installcron:81 dh_installdeb:142 dh_installdebconf:130 dh_installdirs:90 +#: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90 #: dh_installdocs:336 dh_installexamples:110 dh_installifupdown:73 #: dh_installinfo:79 dh_installinit:345 dh_installlogcheck:82 #: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199 @@ -2561,7 +2561,7 @@ #: dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 #: dh_clean:146 dh_compress:214 dh_desktop:35 dh_fixperms:131 dh_gconf:105 #: dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:228 -#: dh_installcron:83 dh_installdeb:144 dh_installdebconf:132 dh_installdirs:92 +#: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92 #: dh_installdocs:338 dh_installemacsen:146 dh_installexamples:112 #: dh_installifupdown:75 dh_installinfo:81 dh_installinit:347 #: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201 @@ -2569,7 +2569,7 @@ #: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 #: dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:262 #: dh_md5sums:94 dh_movefiles:174 dh_perl:152 dh_prep:64 dh_scrollkeeper:32 -#: dh_shlibdeps:179 dh_strip:246 dh_suidregister:121 dh_testdir:57 +#: dh_shlibdeps:156 dh_strip:246 dh_suidregister:121 dh_testdir:57 #: dh_testroot:31 dh_undocumented:32 dh_usrlocal:120 msgid "This program is a part of debhelper." msgstr "Este programa es parte de debhelper." @@ -6469,11 +6469,11 @@ #. type: textblock #: dh_installudev:47 #, fuzzy -#| msgid "Sets the priority string of the F symlink. Default is 60." -msgid "Sets the priority string of the F symlink. Default is 40." +#| msgid "Sets the priority number of a F file. Default is 50." +msgid "Sets the priority the file. Default is 40." msgstr "" -"Define la cadena para la prioridad del enlace simbólico de F. El " -"valor predeterminado es 60." +"Define el número de prioridad de un fichero F. El número " +"predeterminado es 50." # type: textblock #. type: textblock @@ -7680,12 +7680,20 @@ # type: textblock #. type: textblock #: dh_shlibdeps:51 -msgid "" -"Before B is run, B will have added to it " -"the specified directory (or directories -- separate with colons). With " -"recent versions of B, this is mostly only useful for " -"packages that build multiple flavors of the same library, or other " -"situations where the library is installed into a directory not on the " +#, fuzzy +#| msgid "" +#| "Before B is run, B will have added to it " +#| "the specified directory (or directories -- separate with colons). With " +#| "recent versions of B, this is mostly only useful for " +#| "packages that build multiple flavors of the same library, or other " +#| "situations where the library is installed into a directory not on the " +#| "regular library search path." +msgid "" +"It tells B (via its B<-l> parameter), to look for private " +"package libraries in the specified directory (or directories -- separate " +"with colons). With recent versions of B, this is mostly only " +"useful for packages that build multiple flavors of the same library, or " +"other situations where the library is installed into a directory not on the " "regular library search path." msgstr "" "Antes de ejecutar B, B habrá añadido el " @@ -7697,13 +7705,13 @@ # type: =item #. type: =item -#: dh_shlibdeps:58 +#: dh_shlibdeps:59 msgid "B<-L>I, B<--libpackage=>I" msgstr "B<-L>I, B<--libpackage=>I" # type: textblock #. type: textblock -#: dh_shlibdeps:60 +#: dh_shlibdeps:61 msgid "" "With recent versions of B, this option is generally not " "needed, unless your package builds multiple flavors of the same library." @@ -7714,7 +7722,7 @@ # type: textblock #. type: textblock -#: dh_shlibdeps:63 +#: dh_shlibdeps:64 msgid "" "It tells B (via its B<-S> parameter) to look first in the " "package build directory for the specified package, when searching for " @@ -7726,7 +7734,7 @@ # type: textblock #. type: textblock -#: dh_shlibdeps:71 +#: dh_shlibdeps:72 msgid "" "Suppose that your source package produces libfoo1, libfoo-dev, and libfoo-" "bin binary packages. libfoo-bin links against libfoo1, and should depend on " @@ -7739,7 +7747,7 @@ # type: verbatim #. type: verbatim -#: dh_shlibdeps:75 +#: dh_shlibdeps:76 #, no-wrap msgid "" "\tdh_makeshlibs\n" @@ -7752,7 +7760,7 @@ # type: textblock #. type: textblock -#: dh_shlibdeps:78 +#: dh_shlibdeps:79 msgid "" "This will have the effect of generating automatically a shlibs file for " "libfoo1, and using that file and the libfoo1 library in the F, you can make libfoo-bin depend on " @@ -7777,7 +7785,7 @@ # type: verbatim #. type: verbatim -#: dh_shlibdeps:87 +#: dh_shlibdeps:88 #, no-wrap msgid "" "\tdh_shlibdeps -Llibbar1 -l/usr/lib/bar\n" @@ -7788,7 +7796,7 @@ # type: textblock #. type: textblock -#: dh_shlibdeps:177 +#: dh_shlibdeps:154 msgid "L, L" msgstr "L, L" @@ -8174,6 +8182,14 @@ msgid "Andrew Stribblehill " msgstr "Andrew Stribblehill " +# type: textblock +#, fuzzy +#~| msgid "Sets the priority string of the F symlink. Default is 60." +#~ msgid "Sets the priority string of the F symlink. Default is 40." +#~ msgstr "" +#~ "Define la cadena para la prioridad del enlace simbólico de F. El " +#~ "valor predeterminado es 60." + #~ msgid "" #~ "An upstream F file may be specified as an option. If none is " #~ "specified, it looks for files with names that seem likely to be " diff -Nru debhelper-9.20131127ubuntu2/man/po4a/po/fr.po debhelper-9.20131227ubuntu1/man/po4a/po/fr.po --- debhelper-9.20131127ubuntu2/man/po4a/po/fr.po 2013-12-09 17:14:04.000000000 +0000 +++ debhelper-9.20131227ubuntu1/man/po4a/po/fr.po 2014-02-19 14:18:17.000000000 +0000 @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: debhelper manpages\n" -"POT-Creation-Date: 2013-12-09 17:14+0000\n" +"POT-Creation-Date: 2014-02-19 14:18+0000\n" "PO-Revision-Date: 2012-11-03 11:13-0400\n" "Last-Translator: Valery Perrin \n" "Language-Team: French \n" @@ -1740,7 +1740,7 @@ #: dh_builddeb:124 dh_clean:142 dh_compress:210 dh_desktop:31 dh_fixperms:127 #: dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260 #: dh_installcatalogs:122 dh_installchangelogs:224 dh_installcron:79 -#: dh_installdeb:140 dh_installdebconf:128 dh_installdirs:88 +#: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88 #: dh_installdocs:334 dh_installemacsen:141 dh_installexamples:108 #: dh_installifupdown:71 dh_installinfo:77 dh_installinit:343 #: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 @@ -1748,7 +1748,7 @@ #: dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117 #: dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59 #: dh_listpackages:30 dh_makeshlibs:258 dh_md5sums:90 dh_movefiles:170 -#: dh_perl:148 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:175 dh_strip:242 +#: dh_perl:148 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:242 #: dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28 #: dh_usrlocal:116 msgid "SEE ALSO" @@ -1786,7 +1786,7 @@ #: dh_builddeb:130 dh_clean:148 dh_compress:216 dh_desktop:37 dh_fixperms:133 #: dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266 #: dh_installcatalogs:128 dh_installchangelogs:230 dh_installcron:85 -#: dh_installdeb:146 dh_installdebconf:134 dh_installdirs:94 +#: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94 #: dh_installdocs:340 dh_installemacsen:148 dh_installexamples:114 #: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86 #: dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203 @@ -1794,7 +1794,7 @@ #: dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 #: dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:264 #: dh_md5sums:96 dh_movefiles:176 dh_perl:154 dh_prep:66 dh_scrollkeeper:34 -#: dh_shlibdeps:181 dh_strip:248 dh_suidregister:123 dh_testdir:59 +#: dh_shlibdeps:158 dh_strip:248 dh_suidregister:123 dh_testdir:59 #: dh_testroot:33 dh_undocumented:34 dh_usrlocal:122 msgid "AUTHOR" msgstr "AUTEUR" @@ -1804,7 +1804,7 @@ #: debhelper.pod:699 dh:977 dh_auto_build:55 dh_auto_clean:58 #: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 #: dh_clean:150 dh_compress:218 dh_fixperms:135 dh_gencontrol:90 -#: dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:148 +#: dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:150 #: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:342 #: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79 #: dh_installinfo:85 dh_installinit:351 dh_installlogrotate:60 @@ -1812,7 +1812,7 @@ #: dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75 #: dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236 #: dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 -#: dh_prep:68 dh_shlibdeps:183 dh_strip:250 dh_suidregister:125 dh_testdir:61 +#: dh_prep:68 dh_shlibdeps:160 dh_strip:250 dh_suidregister:125 dh_testdir:61 #: dh_testroot:35 dh_undocumented:36 msgid "Joey Hess " msgstr "Joey Hess " @@ -1998,7 +1998,7 @@ # type: =head1 #. type: =head1 -#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:69 +#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:70 msgid "EXAMPLES" msgstr "EXEMPLES" @@ -2592,7 +2592,7 @@ #: dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144 #: dh_compress:212 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84 #: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:226 -#: dh_installcron:81 dh_installdeb:142 dh_installdebconf:130 dh_installdirs:90 +#: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90 #: dh_installdocs:336 dh_installexamples:110 dh_installifupdown:73 #: dh_installinfo:79 dh_installinit:345 dh_installlogcheck:82 #: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199 @@ -2610,7 +2610,7 @@ #: dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 #: dh_clean:146 dh_compress:214 dh_desktop:35 dh_fixperms:131 dh_gconf:105 #: dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:228 -#: dh_installcron:83 dh_installdeb:144 dh_installdebconf:132 dh_installdirs:92 +#: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92 #: dh_installdocs:338 dh_installemacsen:146 dh_installexamples:112 #: dh_installifupdown:75 dh_installinfo:81 dh_installinit:347 #: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201 @@ -2618,7 +2618,7 @@ #: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 #: dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:262 #: dh_md5sums:94 dh_movefiles:174 dh_perl:152 dh_prep:64 dh_scrollkeeper:32 -#: dh_shlibdeps:179 dh_strip:246 dh_suidregister:121 dh_testdir:57 +#: dh_shlibdeps:156 dh_strip:246 dh_suidregister:121 dh_testdir:57 #: dh_testroot:31 dh_undocumented:32 dh_usrlocal:120 msgid "This program is a part of debhelper." msgstr "Ce programme fait partie de debhelper." @@ -6651,11 +6651,11 @@ #. type: textblock #: dh_installudev:47 #, fuzzy -#| msgid "Sets the priority string of the F symlink. Default is 60." -msgid "Sets the priority string of the F symlink. Default is 40." +#| msgid "Sets the priority number of a F file. Default is 50." +msgid "Sets the priority the file. Default is 40." msgstr "" -"Fixe la priorité du lien symbolique des F. La valeur par défaut est " -"60." +"Fixe le numéro de priorité du fichier F. La valeur par défaut " +"est 50." # type: textblock #. type: textblock @@ -7889,12 +7889,20 @@ # type: textblock #. type: textblock #: dh_shlibdeps:51 -msgid "" -"Before B is run, B will have added to it " -"the specified directory (or directories -- separate with colons). With " -"recent versions of B, this is mostly only useful for " -"packages that build multiple flavors of the same library, or other " -"situations where the library is installed into a directory not on the " +#, fuzzy +#| msgid "" +#| "Before B is run, B will have added to it " +#| "the specified directory (or directories -- separate with colons). With " +#| "recent versions of B, this is mostly only useful for " +#| "packages that build multiple flavors of the same library, or other " +#| "situations where the library is installed into a directory not on the " +#| "regular library search path." +msgid "" +"It tells B (via its B<-l> parameter), to look for private " +"package libraries in the specified directory (or directories -- separate " +"with colons). With recent versions of B, this is mostly only " +"useful for packages that build multiple flavors of the same library, or " +"other situations where the library is installed into a directory not on the " "regular library search path." msgstr "" "Avant que B ne soit exécuté, B aura été " @@ -7907,13 +7915,13 @@ # type: =item #. type: =item -#: dh_shlibdeps:58 +#: dh_shlibdeps:59 msgid "B<-L>I, B<--libpackage=>I" msgstr "B<-L>I, B<--libpackage=>I" # type: textblock #. type: textblock -#: dh_shlibdeps:60 +#: dh_shlibdeps:61 msgid "" "With recent versions of B, this option is generally not " "needed, unless your package builds multiple flavors of the same library." @@ -7924,7 +7932,7 @@ # type: textblock #. type: textblock -#: dh_shlibdeps:63 +#: dh_shlibdeps:64 msgid "" "It tells B (via its B<-S> parameter) to look first in the " "package build directory for the specified package, when searching for " @@ -7937,7 +7945,7 @@ # type: textblock #. type: textblock -#: dh_shlibdeps:71 +#: dh_shlibdeps:72 msgid "" "Suppose that your source package produces libfoo1, libfoo-dev, and libfoo-" "bin binary packages. libfoo-bin links against libfoo1, and should depend on " @@ -7950,7 +7958,7 @@ # type: verbatim #. type: verbatim -#: dh_shlibdeps:75 +#: dh_shlibdeps:76 #, no-wrap msgid "" "\tdh_makeshlibs\n" @@ -7963,7 +7971,7 @@ # type: textblock #. type: textblock -#: dh_shlibdeps:78 +#: dh_shlibdeps:79 msgid "" "This will have the effect of generating automatically a shlibs file for " "libfoo1, and using that file and the libfoo1 library in the F, you can make libfoo-bin depend on " @@ -7988,7 +7996,7 @@ # type: verbatim #. type: verbatim -#: dh_shlibdeps:87 +#: dh_shlibdeps:88 #, no-wrap msgid "" "\tdh_shlibdeps -Llibbar1 -l/usr/lib/bar\n" @@ -7999,7 +8007,7 @@ # type: textblock #. type: textblock -#: dh_shlibdeps:177 +#: dh_shlibdeps:154 msgid "L, L" msgstr "L, L" @@ -8396,6 +8404,14 @@ msgstr "Andrew Stribblehill " # type: textblock +#, fuzzy +#~| msgid "Sets the priority string of the F symlink. Default is 60." +#~ msgid "Sets the priority string of the F symlink. Default is 40." +#~ msgstr "" +#~ "Fixe la priorité du lien symbolique des F. La valeur par défaut " +#~ "est 60." + +# type: textblock #~ msgid "" #~ "An upstream F file may be specified as an option. If none is " #~ "specified, it looks for files with names that seem likely to be "