Merged from debian-sid branch.

7 files changed, 40 insertions, 61 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 8eccc27ea..90be66400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,16 @@ apt (0.7.20) unstable; urgency=low
       (Closes: #438559)
     - Mentioned '/* ... */' comments. (Closes: #507601)
 
+  [ 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)
+
+  [ Christian Perrier ]
+  * Translations:
+    - Finnish updated. Closes: #508449 
+
  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 06 Dec 2008 20:57:00 +0200
 
 apt (0.7.20~exp2) unstable; urgency=low
@@ -26,7 +36,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..a63e1c430 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-12  Tapio Lehtonen  <tale@debian.org>
+
+	* fi.po: updated to 539t.
+
+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
diff --git a/po/fi.po b/po/fi.po
index bffceef74..f64638966 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-05-04 19:30+0300\n"
+"PO-Revision-Date: 2008-12-11 14:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -164,43 +164,6 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n"
 
 #: cmdline/apt-cache.cc:1721
-#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -258,7 +221,7 @@ msgstr ""
 "   show - Näytä paketin tietue luettavassa muodossa\n"
 "   depends - Näytä paketin riippuvuustiedot käsittelemättömässä muodossa\n"
 "   rdepends - Näytä paketin käänteiset riippuvuudet\n"
-"   pkgnames - Luettele kaikkien pakettien nimet\n"
+"   pkgnames - Luettele järjestelmän kaikkien pakettien nimet\n"
 "   dotty - Tee paketeista graafit GraphViz-muodossa\n"
 "   xvcg - Tee paketeista graafit xvcg-muodossa\n"
 "   policy - Näytä mistä asennuspaketteja haetaan\n"
@@ -2094,9 +2057,8 @@ msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
 #: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
-#, fuzzy
 msgid "Failed to truncate file"
-msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
+msgstr "Tiedoston typistäminen ei onnistunut"
 
 #: methods/http.cc:1105
 msgid "Bad header data"
@@ -2121,7 +2083,7 @@ msgstr "Ei voitu tehdä %lu tavun mmap:ia"
 
 #: apt-pkg/contrib/mmap.cc:213
 msgid "Dynamic MMap ran out of room"
-msgstr ""
+msgstr "Tila loppui kesken dynaamiselta MMap:lta"
 
 #: apt-pkg/contrib/strutl.cc:1014
 #, c-format
@@ -2846,9 +2808,9 @@ msgstr ""
 "tiedostoa\n"
 
 #: apt-pkg/deb/dpkgpm.cc:49
-#, fuzzy, c-format
+#, c-format
 msgid "Installing %s"
-msgstr "%s asennettu"
+msgstr "Asennetaan %s"
 
 #: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
 #, c-format
@@ -2863,7 +2825,7 @@ msgstr "Poistetaan %s"
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Running post-installation trigger %s"
-msgstr ""
+msgstr "Suoritetaan jälkiasennusliipaisin %s"
 
 #: apt-pkg/deb/dpkgpm.cc:521
 #, c-format
@@ -2929,12 +2891,3 @@ msgstr "Tiedostoa %s ei voitu avata"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Yhteys katkesi ennenaikaisesti"
-
-#~ msgid ""
-#~ "Since you only requested a single operation it is extremely likely that\n"
-#~ "the package is simply not installable and a bug report against\n"
-#~ "that package should be filed."
-#~ msgstr ""
-#~ "Koska komennettiin vain yksi toimenpide, erittäin todennäköisesti\n"
-#~ "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
-#~ "tuosta paketista."
diff --git a/po/fr.po b/po/fr.po
index ec164dc4c..91099636a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -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