add "-f" option to "build-dep" as sbuild is using it to fix regression with cross...

diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index b6f257bcb60cd08425e8a9b1536862b56389e116..718a7ce6a82b8ce5c590aa899b07b3150b393dcc 100644 (file)
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -151,6 +151,9 @@ bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const
       addArg('a', "host-architecture", "APT::Get::Host-Architecture", CommandLine::HasArg);
       addArg(0, "purge", "APT::Get::Purge", 0);
       addArg(0, "solver", "APT::Solver", CommandLine::HasArg);
       addArg('a', "host-architecture", "APT::Get::Host-Architecture", CommandLine::HasArg);
       addArg(0, "purge", "APT::Get::Purge", 0);
       addArg(0, "solver", "APT::Solver", CommandLine::HasArg);

+      // this has no effect *but* sbuild is using it (see LP: #1255806)
+      // once sbuild is fixed, this option can be removed
+      addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0);

    }
    else if (CmdMatches("clean", "autoclean", "check", "download", "changelog") ||
            CmdMatches("markauto", "unmarkauto")) // deprecated commands
    }
    else if (CmdMatches("clean", "autoclean", "check", "download", "changelog") ||
            CmdMatches("markauto", "unmarkauto")) // deprecated commands

diff --git a/debian/changelog b/debian/changelog
index 92b9635dd1fe4e3300037eb4bd484fb209b0ed85..ca6bb4406cb7ecde95e932d015eca609cd4c5988 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-apt (0.9.13.1) unstable; urgency=low
+apt (0.9.13.1) UNRELEASED; urgency=low

 
   [ Colin Watson ]
   * fix "apt-get  --purge build-dep" (closes: #720597)
   * fix regression that APT::Keep-Fds is not honored (closes: #730490)
 
   [ Colin Watson ]
   * fix "apt-get  --purge build-dep" (closes: #720597)
   * fix regression that APT::Keep-Fds is not honored (closes: #730490)

+  
+  [ Michael Vogt ]
+  * add "-f" option to "build-dep" as sbuild is using it to fix 
+    regression with cross-building (LP: #1255806)

 
  -- Michael Vogt <mvo@debian.org>  Thu, 28 Nov 2013 16:49:31 +0100
 
 
  -- Michael Vogt <mvo@debian.org>  Thu, 28 Nov 2013 16:49:31 +0100