Synchronized with patch 234 from Manojs tree

Synchronized with patch 234 from Manojs tree

Patches applied:

 * srivasta@debian.org--etch/debian-policy--devel--3.0--patch-234
   Fixed the fact that section 7.5.1 does not describe dpkg's true

git-archimport-id: debian-policy@lists.debian.org--etch/debian-policy--devel--3.0--patch-234

diff --git a/debian/changelog b/debian/changelog
index b8ddf52b5e4cf2ec2ab2a12bc9d775c2499afc93..84e806a3f54b658a741aa02bd0cbe139ccb676b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ debian-policy (3.6.0) unstable; urgency=low
     mis-linked libraries                                   closes: Bug#191369
   * [AMENDMENT 6/6/2003] build-depends-indep should not be satisfied
     during clean target.                                   closes: Bug#191411
+  * Fixed the fact that section 7.5.1 does not describe dpkg's true
+    behavior. Now added a footnote that explains that replaces is a one
+    way relationship.                                      closes: Bug#183195
 
  -- 
 

diff --git a/menu-policy.sgml b/menu-policy.sgml
index 33892fad65560d7ae0950d2d8dcebb96c691346e..cb8270842a3338297c79ae1ea007886308264e3e 100644 (file)
--- a/menu-policy.sgml
+++ b/menu-policy.sgml
@@ -125,6 +125,10 @@
                  <item>
                    <p>text editors, word processors</p>
                  </item>
+                 <tag>Educational</tag>
+                 <item>
+                   <p>educational and training programs</p>
+                 </item>
                  <tag>Emulators</tag>
                  <item>
                    <p>wine, dosemu, etc.</p>

diff --git a/policy.sgml b/policy.sgml
index edb5e39d86d3613d7e3e1a2779d82142147b60b6..1afd229dc53b4e960ff754cd85364614accd9a52 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -4200,16 +4200,13 @@ Provides: bar
            package's <prgn>postrm</prgn> script will be run with a
            special argument to allow the package to do any final
            cleanup required.  See <ref id="mscriptsinstact">.
-         </p>
-
-         <p>
-           If an installed package, <tt>foo</tt> say, declares that
-           it replaces another, <tt>bar</tt>, and an attempt is made
-           to install <tt>bar</tt>, <prgn>dpkg</prgn> will discard
-           files in the <tt>bar</tt> package which would overwrite
-           those already present in <tt>foo</tt>.  This is so that
-           you can install an older version of a package without
-           problems.
+           <footnote>
+             <p>
+               Replaces is a one way relationship -- you have to              
+               install the replacing package after the replaced
+               package.
+             </p>
+           </footnote>
          </p>
 
          <p>