summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <egon@bottom>2006-12-14 12:39:29 +0100
committerMichael Vogt <egon@bottom>2006-12-14 12:39:29 +0100
commit6ca714d55119e87a01bd475abd08e7212dcafbd0 (patch)
tree264c3a939b34f5daea19f45619686f060569f34d /doc
parent0660506d1916f6538359f238e860804441ba24f3 (diff)
parentdc4002d8c3c687e6614d01b34e4b6aa929411ea9 (diff)
* merged the apt-breaks-iwj branch
* pulled in the other remaining ubuntu changes
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-cache.8.xml2
-rw-r--r--doc/cache.sgml3
-rw-r--r--doc/dpkg-tech.sgml2
3 files changed, 5 insertions, 2 deletions
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 2779f2501..c1e65332d 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -151,7 +151,7 @@ Reverse Provides:
a dependency but were not provided by any package. Missing packages may
be in evidence if a full distribution is not accessed, or if a package
(real or virtual) has been dropped from the distribution. Usually they
- are referenced from Conflicts statements.</para>
+ are referenced from Conflicts or Breaks statements.</para>
</listitem>
<listitem><para><literal>Total distinct</literal> versions is the number of package versions
diff --git a/doc/cache.sgml b/doc/cache.sgml
index aa87db986..e257dcd81 100644
--- a/doc/cache.sgml
+++ b/doc/cache.sgml
@@ -492,7 +492,7 @@ This is the parsed priority value of the package.
Dependency contains the information for a single dependency record. The records
are split up like this to ease processing by the client. The base of list
linked list is Version.DependsList. All forms of dependencies are recorded
-here including Conflicts, Suggests and Recommends.
+here including Conflicts, Breaks, Suggests and Recommends.
<p>
Multiple depends on the same package must be grouped together in
@@ -671,6 +671,7 @@ of them.
#define pkgDEP_Recommends 4
#define pkgDEP_Conflicts 5
#define pkgDEP_Replaces 6
+#define pkgDEP_Breaks 8
</example>
</sect1>
diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
index 23372d71f..7c6e023dd 100644
--- a/doc/dpkg-tech.sgml
+++ b/doc/dpkg-tech.sgml
@@ -46,6 +46,8 @@ The basic dpkg package control file supports the following major features:-
productivity of the package
<item>Conflicts, to specify a package which must NOT be installed
in order for the package to be configured
+ <item>Breaks, to specify a package which is broken by the
+ package and which should therefore not be configured while broken
</list>
Each of these dependencies can specify a version and a depedency on that
version, for example "<= 0.5-1", "== 2.7.2-1", etc. The comparators available