summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-private/private-cmndline.cc3
-rw-r--r--debian/changelog6
2 files changed, 8 insertions, 1 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index b6f257bcb..718a7ce6a 100644
--- 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);
+ // 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
diff --git a/debian/changelog b/debian/changelog
index 92b9635dd..ca6bb4406 100644
--- 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)
+
+ [ 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