From ac4b509f10bb9bc6d6da4aa684b322893b3108d7 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Sat, 5 Jul 2008 15:17:28 -0700
Subject: [PATCH] Mandate UTF-8 for changelog files

Remove the suggestion of UTF-8 in the appendix about changelog file
formats and add the requirement to the main Policy section on
debian/changelog.

Closes: #241333
---
 policy.sgml | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/policy.sgml b/policy.sgml
index 24c9072..9e7e1fb 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -1472,10 +1472,6 @@
 	  </footnote>
 	</p>
 
-        <p>
-          
-        </p>
-
         <p>
           The format of the <file>debian/changelog</file> allows the
 	  package building tools to discover which version of the package
@@ -1581,6 +1577,10 @@
 	  separated by exactly two spaces.
 	</p>
 
+	<p>
+	  The entire changelog must be encoded in UTF-8.
+	</p>
+
 	<p>
 	  For more information on placement of the changelog files
 	  within binary packages, please see <ref id="changelogs">.
@@ -9822,36 +9822,6 @@ install-info --quiet --remove /usr/share/info/foobar.info
 	    See <ref id="dpkgchangelog">.
 	  </p>
 
-	  <p>
-	    It is recommended that the entire changelog be encoded in the
-	    <url id="http://www.cis.ohio-state.edu/cgi-bin/rfc/rfc2279.html" name="UTF-8">
-	    encoding of
-	    <url id="http://www.unicode.org/"
-	    name="Unicode">.<footnote>
-	      <p>
-		I think it is fairly obvious that we need to
-		eventually transition to UTF-8 for our package
-		infrastructure; it is really the only sane char-set in
-		an international environment.  Now, we can't switch to
-		using UTF-8 for package control fields and the like
-		until dpkg has better support, but one thing we can
-		start doing today is requesting that Debian changelogs
-		are UTF-8 encoded. At some point in time, we can start
-		requiring them to do so. 
-	      </p>
-	      <p>
-		Checking for non-UTF8 characters in a changelog is
-		trivial.  Dump the file through 
-		<example>iconv -f utf-8 -t ucs-4</example>
-                  discard the output, and check the return
-		value.  If there are any characters in the stream
-		which are invalid UTF-8 sequences, iconv will exit
-		with an error code; and this will be the case for the
-		vast majority of other character sets.
-	      </p>
-	    </footnote>
-	  </p>
-
  	  <sect2><heading>Defining alternative changelog formats
 	    </heading>
 
-- 
2.39.5