From d59228b0656483be9b60aa9d5e7b4759bf9e6b15 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Tue, 2 Dec 2008 20:54:43 +0100
Subject: 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)

---
 cmdline/apt-get.cc           |  3 +++
 configure.in                 |  2 +-
 debian/changelog             | 10 ++++++++--
 doc/examples/configure-index |  1 +
 4 files changed, 13 insertions(+), 3 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 0ffbc67ff..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.18")
+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 d1ccf8b8f..325804f84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-apt (0.7.20~exp2) unstable; urgency=low
+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)
 
   [ Eugene V. Lyubimkin ]
   * doc/examples/sources.list:
@@ -8,7 +14,7 @@ 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
+ -- 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 
-- 
cgit v1.2.3