dpkg: Document --force-breaks in --force-help output

diff --git a/ChangeLog b/ChangeLog
index d2687b9755dcbbdbbe07c5e2ea2ca9028b10f22b..60ff1312fbdf2d8c5d8b3f652a9577b6bd895b9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-13  Guillem Jover  <guillem@debian.org>
+
+       * src/main.c (setforce): Add help output for '--force-breaks'.
+
 2008-05-12  Guillem Jover  <guillem@debian.org>
 
        * configure.ac: Bump version to 1.14.20~.

diff --git a/debian/changelog b/debian/changelog
index 8ff71371ea8b00686f9348eb08d5f1b4869b0c42..d9f5c92ce829f3f5deeea2592a4bb4bf4123d9a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dpkg (1.14.20) UNRELEASED; urgency=low
 
   * Change UTF-8 '©' to '(C)' in deb-version.5 (unfuzzy translations).
+  * Document --force-breaks in 'dpkg --force-help' output.
 
  -- Guillem Jover <guillem@debian.org>  Mon, 12 May 2008 09:04:34 +0300
 

diff --git a/src/main.c b/src/main.c
index 00b05440ee337d65f585acd630d167c07a6fc8f2..41c08e1cfb437f4952e49e14335c5916e9ec15a9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -339,6 +339,7 @@ static void setforce(const struct cmdinfo *cip, const char *value) {
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
+"  breaks [!]             Install even if it would break another package\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's file\n"