Fix erroneous description of Breaks in dselect

The description should be 'breaks' as in 'A breaks B' rather than
'A breaks with B' since it is B that is broken by A and not vice versa.

diff --git a/ChangeLog b/ChangeLog
index 279b6483b57e941d78e77f6032bd4f9d3db61172..8a2263ffb7a100acf6cba7e9ab26bd5d5696e775 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-09  Ian Jackson  <ian@davenant.greenend.org.uk>
+
+       * dselect/pkgdisplay.cc (relatestrings): Change 'breaks with' to
+       'breaks'.
+
 2008-03-09  Ian Jackson  <ian@davenant.greenend.org.uk>
 
        * dselect/pkgdepcon.cc (packagelist::resolvedepcon): Move dep_breaks

diff --git a/debian/changelog b/debian/changelog
index 7cf926312bf0c385e4e7fd901c4c539b7ae08c33..4444b7e30a039fd7d8c9d93bdce6837f897abafb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ dpkg (1.14.17) UNRELEASED; urgency=low
     Thanks to Ian Jackson.
   * Implement 'Breaks' properly in dselect. Closes: #448946
     Thanks to Ian Jackson.
+  * Fix erroneous description of Breaks in dselect output.
+    Thanks to Ian Jackson.
 
   [ Raphael Hertzog ]
   * Add a warning displayed by dpkg-genchanges if the current version is

diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index e7567a46b502756454e1cff78bde8f248dedf46e..2e78ed7d937ac7fd769d9b5a9282f90ffd29de98 100644 (file)
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -72,7 +72,7 @@ const char
                            N_("recommends"),
                            N_("depends on"),
                            N_("pre-depends on"),
-                           N_("breaks with"),
+                           N_("breaks"),
                            N_("conflicts with"),
                            N_("provides"),
                            N_("replaces"),