Added the 2004 version of the social contract.

CVS version numbers

english/social_contract.1.1.wml: INITIAL -> 1.1 
english/searchtmpl/search.wml: 1.8 -> 1.9 
english/vote/2003/vote_0003.wml: 1.18 -> 1.19

1 files changed, 163 insertions, 0 deletions

diff --git a/english/social_contract.1.1.wml b/english/social_contract.1.1.wml
new file mode 100644
index 00000000000..de2d9d1232a
--- /dev/null
+++ b/english/social_contract.1.1.wml
@@ -0,0 +1,163 @@
+#use wml::debian::template title="Debian Social Contract" BARETITLE=true
+
+#  Original document: contract.html
+#  Author           : Manoj Srivastava ( srivasta@tiamat.datasync.com )
+#  Created On       : Wed Jul  2 12:47:56 1997
+
+<P>
+  Version 1.1 ratified on April 26, 2004. Supersedes
+  <a href="social_contract.1.0">Version 1.0</a> ratified on July 5, 1997.
+</P>
+
+<P>Debian, the producers of the Debian GNU/Linux system, have created the
+<strong>Debian Social Contract</strong>. The <a href="#guidelines">Debian Free Software
+Guidelines (DFSG)</a> part of the contract, initially designed
+as a set of commitments that we agree to abide by, has been adopted by
+the free software community as the basis of the
+<a href="http://www.opensource.org/osd.html">Open Source Definition</a>.
+
+<HR>
+    <h2><q>Social Contract</q> with the Free Software Community</h2>
+
+    <ol>
+      <li>
+	<strong>Debian will remain 100% free</strong>
+	<p>
+	  We provide the guidelines that we use to determine if a work
+	  is "<em>free</em>" in the document entitled "<cite>The Debian Free
+	  Software Guidelines</cite>". We promise that the Debian system and
+	  all its components will be free according to these
+	  guidelines. We will support people who create or use both
+	  free and non-free works on Debian. We will never make the
+	  system require the use of a non-free component.
+
+	</p>
+      </li>
+      <li><strong>We will give back to the free software community</strong>
+	<p>
+	  When we write new components of the Debian system, we will
+	  license them in a manner consistent with the Debian Free
+	  Software Guidelines.  We will make the best system we can,
+	  so that free works will be widely distributed and used.  We
+	  will communicate things such as bug fixes, improvements and
+	  user requests to the "<em>upstream</em>" authors of works
+	  included in our system.
+	</p>
+      </li>
+      <li><strong>We will not hide problems</strong>
+	<p>
+	  We will keep our entire bug report database open for public
+	  view at all times. Reports that people file online will
+	  promptly become visible to others.
+	</p>
+      </li>
+      <li><strong>Our priorities are our users and free software</strong>
+	<p>
+	  We will be guided by the needs of our users and the free
+	  software community. We will place their interests first in
+	  our priorities. We will support the needs of our users for
+	  operation in many different kinds of computing
+	  environments. We will not object to non-free works that are
+	  intended to be used on Debian systems, or attempt to charge
+	  a fee to people who create or use such works. We will allow
+	  others to create distributions containing both the Debian
+	  system and other works, without any fee from us. In
+	  furtherance of these goals, we will provide an integrated
+	  system of high-quality materials with no legal restrictions
+	  that would prevent such uses of the system.
+	</p>
+      </li>
+      <li><strong>Works that do not meet our free software standards</strong>
+	<p>
+	  We acknowledge that some of our users require the use of
+	  works that do not conform to the Debian Free Software
+	  Guidelines. We have created "<code>contrib</code>" and
+	  "<code>non-free</code>" areas in our archive for these
+	  works. The packages in these areas are not part of the
+	  Debian system, although they have been configured for use
+	  with Debian. We encourage CD manufacturers to read the
+	  licenses of the packages in these areas and determine if
+	  they can distribute the packages on their CDs. Thus,
+	  although non-free works are not a part of Debian, we support
+	  their use and provide infrastructure for non-free packages
+	  (such as our bug tracking system and mailing lists).
+	</p>
+      </li>
+    </ol>
+<HR>
+<H2><a name="guidelines">The Debian Free Software Guidelines (DFSG)</a></H2>
+<OL>
+   <LI><P><strong>Free Redistribution</strong>
+     <P>The license of a Debian component may not restrict any
+     party from selling or giving away the software as a
+     component of an aggregate software distribution containing
+     programs from several different sources. The license may not
+     require a royalty or other fee for such sale.</P>
+   <LI><P><strong>Source Code</strong>
+     <P>The program must include source code, and must allow
+     distribution in source code as well as compiled
+     form.</P>
+   <LI><P><strong>Derived Works</strong>
+     <P>The license must allow modifications and derived works, and
+     must allow them to be distributed under the same terms as
+     the license of the original software.</P>
+   <LI><P><strong>Integrity of The Author's Source Code</strong>
+     <P>The license may restrict source-code from being distributed
+     in modified form _<strong>only</strong>_ if the license allows
+     the distribution of "<tt>patch files</tt>" with the source
+     code for the purpose of modifying the program at build
+     time. The license must explicitly permit distribution of
+     software built from modified source code. The license may
+     require derived works to carry a different name or version
+     number from the original software.  (<em>This is a
+     compromise. The Debian group encourages all authors not to
+     restrict any files, source or binary, from being
+     modified.</em>)</P>
+   <LI><P><strong>No Discrimination Against Persons or Groups</strong>
+     <P>The license must not discriminate against any person or
+     group of persons.</P>
+   <LI><P><strong>No Discrimination Against Fields of Endeavor</strong>
+     <P>The license must not restrict anyone from making use of the
+     program in a specific field of endeavor. For example, it may
+     not restrict the program from being used in a business, or
+     from being used for genetic research.</P>
+   <LI><P><strong>Distribution of License</strong>
+     <P>The rights attached to the program must apply to all to
+     whom the program is redistributed without the need for
+     execution of an additional license by those
+     parties.</P>
+   <LI><P><strong>License Must Not Be Specific to Debian</strong>
+     <P>The rights attached to the program must not depend on the
+     program's being part of a Debian system. If the program is
+     extracted from Debian and used or distributed without Debian
+     but otherwise within the terms of the program's license, all
+     parties to whom the program is redistributed should have the
+     same rights as those that are granted in conjunction with
+     the Debian system.</P>
+   <LI><P><strong>License Must Not Contaminate Other Software</strong>
+     <P>The license must not place restrictions on other software
+     that is distributed along with the licensed
+     software. For example, the license must not insist that all
+     other programs distributed on the same medium must be free
+     software.</P>
+   <LI><P><strong>Example Licenses</strong>
+     <P>The "<strong><a href="http://www.gnu.org/copyleft/gpl.html">GPL</a></strong>",
+     "<strong><a href="misc/bsd.license">BSD</a></strong>", and
+     "<strong><a href="http://www.perl.com/pub/a/language/misc/Artistic.html">Artistic</a></strong>"
+     licenses are examples of licenses that we consider "<em>free</em>".
+</OL>
+
+<p><em>The concept of stating our "social contract with the free
+software community" was suggested by Ean Schuessler. This document
+was drafted by Bruce Perens, refined by the other Debian developers
+during a month-long e-mail conference in June 1997, and then
+<a href="http://lists.debian.org/debian-announce/debian-announce-1997/msg00017.html">\
+accepted</a> as the publicly stated policy of the Debian Project.</em></p>
+
+<p><em>Bruce Perens later removed the Debian-specific references from the
+Debian Free Software Guidelines to create
+<a href="http://www.opensource.org/docs/definition.php">&ldquo;The Open
+Source Definition&rdquo;</a>.</em></p>
+
+<P><EM>Other organizations may derive from and build on this document.
+Please give credit to the Debian project if you do.</EM>