Merge branch 'master' into bug567845-ballombe

diff --git a/debian/changelog b/debian/changelog
index 52e5010d107561f34cdc3ff24a30a7f2cc842d5e..3a50bc6a36deaeece3758c369f99353b81416884 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-policy (3.8.4.1) UNRELEASED; urgency=low
+
+  * Fix path to changelog.Debian.gz in footnote on documentation symlinks.
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 12 Feb 2010 17:45:37 +0000
+
 debian-policy (3.8.4.0) unstable; urgency=low
 
   [ Bill Allombert ]

diff --git a/policy.sgml b/policy.sgml
index 76ac0d44351c2b98a95fa86c7cbeba464a54b0c0..3bac1e4fe9a261fa4c56f137f03a9e115fbbc731 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -9054,7 +9054,7 @@ END-INFO-DIR-ENTRY
             <p>
               Please note that this does not override the section on
               changelog files below, so the file 
-              <file>/usr/share/<var>package</var>/changelog.Debian.gz</file>
+              <file>/usr/share/doc/<var>package</var>/changelog.Debian.gz</file>
               must refer to the changelog for the current version of
               <var>package</var> in question. In practice, this means
               that the sources of the target and the destination of the