diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-11-03 08:59:19 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-11-03 08:59:19 +0100 |
| commit | 26f6e9b4c32c937d5a138404a9c1b94809c3afd6 (patch) | |
| tree | 5208d66e39a8c61ba9e9ade61dc1c03f0711d475 /doc/dpkg-tech.dbk | |
| parent | 0c535a8aedc34705ed115754796856a2b5d92a08 (diff) | |
| parent | 28460cb27846b2437010b08adf10bde18e370974 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'doc/dpkg-tech.dbk')
| -rw-r--r-- | doc/dpkg-tech.dbk | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/doc/dpkg-tech.dbk b/doc/dpkg-tech.dbk index 660ccabc9..2584cf640 100644 --- a/doc/dpkg-tech.dbk +++ b/doc/dpkg-tech.dbk @@ -222,13 +222,11 @@ Where <replaceable>Want</replaceable> may be one of <emphasis>unknown</emphasis>, <emphasis>install</emphasis>, <emphasis>hold</emphasis>, <emphasis>deinstall</emphasis>, <emphasis>purge</emphasis>. <replaceable>Flag</replaceable> may -be one of <emphasis>ok</emphasis>, <emphasis>reinstreq</emphasis>, -<emphasis>hold</emphasis>, -<emphasis>hold-reinstreq</emphasis>. <replaceable>Status</replaceable> may -be one of <emphasis>not-installed</emphasis>, <emphasis>unpacked</emphasis>, -<emphasis>half-configured</emphasis>, <emphasis>installed</emphasis>, -<emphasis>half-installed</emphasis> <emphasis>config-files</emphasis>, -<emphasis>post-inst-failed</emphasis>, <emphasis>removal-failed</emphasis>. +be one of <emphasis>ok</emphasis>, <emphasis>reinstreq</emphasis>. +<replaceable>Status</replaceable> may +be one of <emphasis>not-installed</emphasis>, <emphasis>config-files</emphasis>, +<emphasis>half-installed</emphasis>, <emphasis>unpacked</emphasis>, +<emphasis>half-configured</emphasis> and <emphasis>installed</emphasis>. The states are as follows:- </para> <variablelist> @@ -287,22 +285,6 @@ nothing else. </para> </listitem> </varlistentry> -<varlistentry> -<term>post-inst-failed</term> -<listitem> -<para> -Old name for half-configured. Do not use. -</para> -</listitem> -</varlistentry> -<varlistentry> -<term>removal-failed</term> -<listitem> -<para> -Old name for half-installed. Do not use. -</para> -</listitem> -</varlistentry> </variablelist> <para> The two last items are only left in dpkg for compatibility - they are |