Bug#315470: diff for removal of non-us
Hi,
I propose this diff for removal of non-us from the policy manual.
Comments are welcome.
Cheers,
Andi
--- orig/policy.sgml
+++ mod/policy.sgml
@@ -310,8 +310,8 @@
</p>
<p>
- The <em>main</em> and the <em>non-US/main</em> sections
- together form the <em>Debian GNU/Linux distribution</em>.
+ The <em>main</em> section
+ forms the <em>Debian GNU/Linux distribution</em>.
</p>
<p>
@@ -427,7 +427,7 @@
<heading>The main section</heading>
<p>
- Every package in <em>main</em> and <em>non-US/main</em>
+ Every package in <em>main</em>
must comply with the DFSG (Debian Free Software
Guidelines).
</p>
@@ -453,37 +453,18 @@
</list>
</p>
- <p>
- Similarly, the packages in <em>non-US/main</em>
- <list compact="compact">
- <item>
- must not require a package outside of <em>main</em>
- or <em>non-US/main</em> for compilation or
- execution,
- </item>
- <item>
- must not be so buggy that we refuse to support them,
- </item>
- <item>
- must meet all policy requirements presented in this
- manual.
- </item>
- </list>
- </p>
-
</sect1>
<sect1 id="contrib">
<heading>The contrib section</heading>
<p>
- Every package in <em>contrib</em> and
- <em>non-US/contrib</em> must comply with the DFSG.
+ Every package in <em>contrib</em>
+ must comply with the DFSG.
</p>
<p>
- In addition, the packages in <em>contrib</em> and
- <em>non-US/contrib</em>
+ In addition, the packages in <em>contrib</em>
<list compact="compact">
<item>
must not be so buggy that we refuse to support them,
@@ -497,14 +478,8 @@
</p>
<p>
- Furthermore, packages in <em>contrib</em> must not require
- a package in a <em>non-US</em> section for compilation or
- execution.
- </p>
-
- <p>
Examples of packages which would be included in
- <em>contrib</em> or <em>non-US/contrib</em> are:
+ <em>contrib</em> are:
<list compact="compact">
<item>
free packages which require <em>contrib</em>,
@@ -524,15 +499,14 @@
<heading>The non-free section</heading>
<p>
- Packages must be placed in <em>non-free</em> or
- <em>non-US/non-free</em> if they are not compliant with
+ Packages must be placed in <em>non-free</em>
+ if they are not compliant with
the DFSG or are encumbered by patents or other legal
issues that make their distribution problematic.
</p>
<p>
- In addition, the packages in <em>non-free</em> and
- <em>non-US/non-free</em>
+ In addition, the packages in <em>non-free</em>
<list compact="compact">
<item>
must not be so buggy that we refuse to support them,
@@ -553,28 +527,27 @@
</p>
</sect1>
- <sect1 id="non-US">
- <heading>The non-US sections</heading>
-
- <p>
- Non-free programs with cryptographic program code need to
- be stored on the <em>non-us</em> server because of export
- restrictions of the U.S.
- </p>
-
- <p>
- Programs which use patented algorithms that have a
- restricted license also need to be stored on "non-us",
- since the non-us archive is located in a country where
- patenting algorithms is not allowed.
+ <sect1>
+ <heading>historical sections</heading>
+ <p>
+ In former times, it was illegal to export cryptographic code
+ from the U.S. For that reason, there was <em>non-us</em> until
+ release of sarge, hosted on a server in the Netherlands. The
+ conditions for programs in the <em>non-us</em> subsections
+ (<em>non-us/main</em>, <em>non-us/contrib</em> and
+ <em>non-us/non-free</em>) were the same as for the "normal"
+ sections, with the addition that they could contain cryptographic
+ code.
+ Debian (the distribution) were <em>main</em> and
+ <em>non-us/main</em> together.
</p>
<p>
- A package depends on another package which is distributed
- via the non-us server has to be stored on the non-us
+ A package depends on another package which was distributed
+ via the non-us server had to be stored on the non-us
server as well.
</p>
- </sect1>
+ </sect1>
</sect>
<sect id="pkgcopyright">
@@ -683,12 +656,6 @@
the <em>contrib</em> or <em>non-free</em> section,
and
</item>
- <item>
- <tt>non-US</tt>, <tt>non-US/contrib</tt> or
- <tt>non-US/non-free</tt> if the package is in
- <em>non-US/main</em>, <em>non-US/contrib</em> or
- <em>non-US/non-free</em> respectively.
- </item>
</list>
</p>
@@ -702,7 +669,7 @@
<em>hamradio</em>, <em>interpreters</em>, <em>kde</em>,
<em>libs</em>, <em>libdevel</em>, <em>mail</em>,
<em>math</em>, <em>misc</em>, <em>net</em>, <em>news</em>,
- <em>non-US</em>, <em>non-free</em>, <em>oldlibs</em>,
+ <em>non-free</em>, <em>oldlibs</em>,
<em>otherosfs</em>, <em>perl</em>, <em>python</em>,
<em>science</em>, <em>shells</em>,
<em>sound</em>, <em>tex</em>, <em>text</em>,
@@ -4149,7 +4116,7 @@
Depends: bar
</example>
and someone else releases an enhanced version of the
- <tt>bar</tt> package (for example, a non-US variant), they
+ <tt>bar</tt> package, they
can say:
<example compact="compact">
Package: bar-plus
Reply to: