diff options
| -rw-r--r-- | cmdline/apt-get.cc | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | doc/examples/configure-index | 1 | ||||
| -rw-r--r-- | po/ChangeLog | 4 | ||||
| -rw-r--r-- | po/fr.po | 10 |
6 files changed, 27 insertions, 7 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5fbe21eed..43f8ec8b8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2515,6 +2515,8 @@ bool DoBuildDep(CommandLine &CmdL) { // We successfully installed something; skip remaining alternatives skipAlternatives = hasAlternatives; + if(_config->FindB("APT::Get::Build-Dep-Automatic", false) == true) + Cache->MarkAuto(Pkg, true); continue; } else if (hasAlternatives) @@ -2730,6 +2732,7 @@ int main(int argc,const char *argv[]) {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, {0,"auto-remove","APT::Get::AutomaticRemove",0}, + {0,"build-dep-automatic","APT::Get::Build-Dep-Automatic",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean}, {0,"fix-policy","APT::Get::Fix-Policy-Broken",0}, diff --git a/configure.in b/configure.in index 04d8a4712..f90a32c3b 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.20") +AC_DEFINE_UNQUOTED(VERSION,"0.7.20~exp3") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 83aa70d4d..5d6a6d6b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,14 @@ apt (0.7.20) unstable; urgency=low -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sat, 06 Dec 2008 20:57:00 +0200 +apt (0.7.20~exp3) unstable; urgency=low + + [ Michael Vogt ] + * make "apt-get build-dep" installed packages marked automatic + by default. This can be changed by setting the value of + APT::Get::Build-Dep-Automatic to false (thanks to Aaron + Haviland, closes: #44874, LP: #248268) + apt (0.7.20~exp2) unstable; urgency=low [ Eugene V. Lyubimkin ] @@ -25,7 +33,11 @@ apt (0.7.20~exp2) unstable; urgency=low - Added instruction how to work around MMap error in MMap error message. (Closes: #385674, 436028) - -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Wed, 26 Nov 2008 22:06:21 +0200 + [ Christian Perrier ] + * Translations: + - French corrected (remove awful use of first person) + + -- Michael Vogt <mvo@debian.org> Tue, 02 Dec 2008 20:30:14 +0100 apt (0.7.19) unstable; urgency=low diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 07803b2cb..db07f189e 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -54,6 +54,7 @@ APT Only-Source ""; Diff-Only "false"; Tar-Only "false"; + Build-Dep-Automatic "true"; }; Cache diff --git a/po/ChangeLog b/po/ChangeLog index f8633af22..e71fb1447 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2008-12-06 Christian Perrier <bubulle@debian.org> + + * fr.po: dropped awful use of first person + 2008-11-23 Artem Bondarenko <artem.brz@gmail.com> * uk.po: updated to 477t55f7u @@ -2527,7 +2527,7 @@ msgstr "Le type de fichier d'index « %s » n'est pas accepté" #, c-format msgid "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son " +"Le paquet %s doit être réinstallé, mais il est impossible de trouver son " "archive." #: apt-pkg/algorithms.cc:1107 @@ -2760,8 +2760,8 @@ msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -"Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie " -"sans doute que vous devrez corriger ce paquet manuellement (absence " +"Impossible de localiser un fichier du paquet %s. Cela signifie " +"que vous devrez corriger ce paquet vous-même (absence " "d'architecture)." #: apt-pkg/acquire-item.cc:1290 @@ -2770,8 +2770,8 @@ msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie " -"que vous devrez corriger manuellement ce paquet." +"Impossible de localiser un fichier du paquet %s. Cela signifie " +"que vous devrez corriger ce paquet vous-même." #: apt-pkg/acquire-item.cc:1331 #, c-format |