From a2caab73ad4ba7ec2ac6b7831937cec52ede2236 Mon Sep 17 00:00:00 2001
From: Manoj Srivastava <srivasta@debian.org>
Date: Thu, 16 Jun 2005 05:40:58 +0000
Subject: [PATCH] Fixed the fact that section 7.5.1 does not describe dpkg's
 true

Author: srivasta
Date: 2003/06/07 18:05:49
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.

git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-234
---
 debian/changelog |  3 +++
 menu-policy.sgml |  4 ++++
 policy.sgml      | 17 +++++++----------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8ddf52..84e806a 100644
--- 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 33892fa..cb82708 100644
--- 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 edb5e39..1afd229 100644
--- 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>
-- 
2.39.5