The following commit has been merged in the master branch:
commit 3c461dc3e566b21fe51d77e836d8cae674372207
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Thu Nov 1 20:00:54 2007 +0000
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 279b648..8a2263f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-03-09 Ian Jackson <[EMAIL PROTECTED]>
+ * dselect/pkgdisplay.cc (relatestrings): Change 'breaks with' to
+ 'breaks'.
+
+2008-03-09 Ian Jackson <[EMAIL PROTECTED]>
+
* dselect/pkgdepcon.cc (packagelist::resolvedepcon): Move dep_breaks
case after dep_conflicts so that it falls through.
(packagelist::deppossatisfied): Handle dep_breaks in the same way as
diff --git a/debian/changelog b/debian/changelog
index 7cf9263..4444b7e 100644
--- 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 e7567a4..2e78ed7 100644
--- 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"),
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
