Synchronized with patch 130 from Manojs tree

Synchronized with patch 130 from Manojs tree

Patches applied:

 * srivasta@debian.org--etch/debian-policy--devel--3.0--patch-130
   * And make a note of the /etc/default stuff in the changelog too.

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

diff --git a/debian/changelog b/debian/changelog
index 5595773c80097c7e7c1970107366a255ff638984..ee8065ab66a368dd97891ea8844a242bad49af43 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debian-policy (3.5.5.1) unstable; urgency=low
 
   * Change footnote about urgency values to the now-current list: low,
     medium, high, emergency.
+  * Correct note about /etc/default files being conffiles/config files,
+    which I mucked up (sorry Joey) [10.3.2]
 
  --