The following commit has been merged in the lenny branch:
commit d35a953af6bde7b5871ba4c54c2057090f532d01
Author: Guillem Jover <[EMAIL PROTECTED]>
Date:   Tue May 13 05:43:51 2008 +0300

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

diff --git a/ChangeLog b/ChangeLog
index d2687b9..60ff131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-13  Guillem Jover  <[EMAIL PROTECTED]>
+
+       * src/main.c (setforce): Add help output for '--force-breaks'.
+
 2008-05-12  Guillem Jover  <[EMAIL PROTECTED]>
 
        * configure.ac: Bump version to 1.14.20~.
diff --git a/debian/changelog b/debian/changelog
index 8ff7137..d9f5c92 100644
--- 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 <[EMAIL PROTECTED]>  Mon, 12 May 2008 09:04:34 +0300
 
diff --git a/src/main.c b/src/main.c
index 00b0544..41c08e1 100644
--- 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"

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to