Remove the license summaries since the people on debian-legal came to

the conclusion that it's to difficult to maintain.
Use modified text by MJ Ray that only lists some licenses currently used
in main and non-free and links to some "unofficial" summaries and statements.

CVS version numbers

english/legal/licenses/byclass.wml: 1.3 -> 1.4(DEAD) 
english/legal/licenses/bydate.wml: 1.2 -> 1.3(DEAD) 
english/legal/licenses/byname.wml: 1.3 -> 1.4(DEAD) 
english/legal/licenses/dls-001-gpl.data: 1.2 -> 1.3(DEAD) 
english/legal/licenses/dls-001-gpl.wml: 1.1 -> 1.2(DEAD) 
english/legal/licenses/dls-002-bsd.data: 1.1 -> 1.2(DEAD) 
english/legal/licenses/dls-002-bsd.wml: 1.1 -> 1.2(DEAD) 
english/legal/licenses/dls-003-artistic.data: 1.1 -> 1.2(DEAD) 
english/legal/licenses/dls-003-artistic.wml: 1.1 -> 1.2(DEAD) 
english/legal/licenses/dls-005-opl.data: 1.1 -> 1.2(DEAD) 
english/legal/licenses/dls-005-opl.wml: 1.1 -> 1.2(DEAD) 
english/legal/licenses/dls-006-ccby.data: 1.2 -> 1.3(DEAD) 
english/legal/licenses/dls-006-ccby.wml: 1.1 -> 1.2(DEAD) 
english/legal/licenses/dls-007-osl.data: 1.1 -> 1.2(DEAD) 
english/legal/licenses/dls-007-osl.wml: 1.2 -> 1.3(DEAD) 
english/legal/licenses/index.wml: 1.7 -> 1.8

16 files changed, 114 insertions, 1375 deletions

diff --git a/english/legal/licenses/byclass.wml b/english/legal/licenses/byclass.wml
deleted file mode 100644
index 1a6868a1eb3..00000000000
--- a/english/legal/licenses/byclass.wml
+++ /dev/null
@@ -1,35 +0,0 @@
-<define-tag pagetitle>Debian License Summaries -- by class</define-tag>
-#use wml::debian::template title="<pagetitle>" GEN_TIME="yes"
-#use wml::debian::legal_lists
-
-<dls-lists-page-header />
-
-<h2>DLS &ndash; sorted by license classification</h2>
-
-<perl>
-    my %name = (
-                yes => [ '<headline-free/>', 'free' ],
-                no => [ '<headline-non-free/>', 'non-free' ],
-                'non-dist' => [ '<headline-non-dist/>', 'non-dist' ],
-                );
-foreach (qw( yes no non-dist )) {
-    my %str = get_alphabetical_list( "$_", 'list' );
-    my ( $toc, $content );
-    
-    if (scalar keys %str > 2) {
-        print "<h3><a id=\"$name{$_}[1]\">$name{$_}[0]</a></h3>";
-    }
-    foreach my $letter (sort keys %str) {
-        if (($letter eq 'foot') || ($letter eq 'head')) {
-            next;
-        }
-        if (scalar keys %str > 12) {
-            $toc .= " [&nbsp;<a href=\"#$letter\">$letter</a>&nbsp;]";
-            $content .= "<h4><a id=\"$letter\">$letter</a></h4>\n";
-            }
-        $content .= "$str{head}$str{$letter}$str{foot}\n";
-    }
-    print "<p>$toc</p>" if $toc;
-    print $content;
-}
-</perl>
diff --git a/english/legal/licenses/bydate.wml b/english/legal/licenses/bydate.wml
deleted file mode 100644
index 9b0b3261757..00000000000
--- a/english/legal/licenses/bydate.wml
+++ /dev/null
@@ -1,12 +0,0 @@
-<define-tag pagetitle>Debian License Summaries -- by date</define-tag>
-#use wml::debian::template title="<pagetitle>" GEN_TIME="yes"
-#use wml::debian::recent_list
-#use wml::debian::legal_tags
-
-<dls-lists-page-header/>
-
-<h2>DLS &ndash; sorted by date</h2>
-
-<:= get_recent_list( '.', '0', '$(ENGLISHDIR)/legal/licenses', 
-   'list', 'dls-.*' ) :>
-
diff --git a/english/legal/licenses/byname.wml b/english/legal/licenses/byname.wml
deleted file mode 100644
index dd1382d44aa..00000000000
--- a/english/legal/licenses/byname.wml
+++ /dev/null
@@ -1,25 +0,0 @@
-<define-tag pagetitle>Debian License Summaries -- by name</define-tag>
-#use wml::debian::template title="<pagetitle>" GEN_TIME="yes"
-#use wml::debian::legal_lists
-
-<dls-lists-page-header />
-
-<h2>DLS &ndash; sorted by license name</h2>
-
-<perl>
-    my %str = get_alphabetical_list( '', 'list' );
-my ( $toc, $content );
-
-foreach my $letter (sort keys %str) {
-    if (($letter eq 'foot') || ($letter eq 'head')) {
-        next;
-    }
-    if (scalar keys %str > 10) {
-        $toc .= " [&nbsp;<a href=\"#$letter\">$letter</a>&nbsp;]";
-        $content .= "<h3><a id=\"$letter\">$letter</a></h3>\n";
-    }
-    $content .= "$str{head}$str{$letter}$str{foot}\n";
-}
-print "<p>$toc</p>" if $toc;
-print $content;
-</perl>
diff --git a/english/legal/licenses/dls-001-gpl.data b/english/legal/licenses/dls-001-gpl.data
deleted file mode 100644
index 100fa53f25a..00000000000
--- a/english/legal/licenses/dls-001-gpl.data
+++ /dev/null
@@ -1,354 +0,0 @@
-<define-tag pagetitle>DLS 001-1</define-tag>
-<define-tag report_date>1997-07-04</define-tag>
-<define-tag license-name>GNU General Public License (GPL)</define-tag>
-<define-tag license-version>2.0</define-tag>
-<define-tag license-url>http://www.gnu.org/copyleft/gpl.html</define-tag>
-<define-tag discussion-url>http://www.debian.org/social_contract</define-tag>
-<define-tag summary-url></define-tag>
-<define-tag summary-author>Andreas Barth</define-tag>
-<define-tag isfree>yes</define-tag>
-
-#use wml::debian::legal
-
-<verbatim>
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</verbatim>
diff --git a/english/legal/licenses/dls-001-gpl.wml b/english/legal/licenses/dls-001-gpl.wml
deleted file mode 100644
index 462cbf45ad4..00000000000
--- a/english/legal/licenses/dls-001-gpl.wml
+++ /dev/null
@@ -1,12 +0,0 @@
-<define-tag short-summary>Free</define-tag>
-<define-tag license-text-trans></define-tag>
-<define-tag justification>
-<ul>
-<li>This license is mentioned as free license in DFSG §10.</li>
-
-</ul>
-</define-tag>
-
-# do not modify the following line
-#include "$(ENGLISHDIR)/legal/licenses/dls-001-gpl.data"
-# $Id$
diff --git a/english/legal/licenses/dls-002-bsd.data b/english/legal/licenses/dls-002-bsd.data
deleted file mode 100644
index ddb86d382e4..00000000000
--- a/english/legal/licenses/dls-002-bsd.data
+++ /dev/null
@@ -1,40 +0,0 @@
-<define-tag pagetitle>DLS 002-1</define-tag>
-<define-tag report_date>1997-07-04</define-tag>
-<define-tag license-name>BSD License</define-tag>
-<define-tag license-version></define-tag>
-<define-tag license-url></define-tag>
-<define-tag discussion-url>http://www.debian.org/social_contract</define-tag>
-<define-tag summary-url></define-tag>
-<define-tag summary-author>Andreas Barth</define-tag>
-<define-tag isfree>yes</define-tag>
-
-#use wml::debian::legal
-
-<verbatim>
-Copyright (c) The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-</verbatim>
diff --git a/english/legal/licenses/dls-002-bsd.wml b/english/legal/licenses/dls-002-bsd.wml
deleted file mode 100644
index 3ac3d33baaf..00000000000
--- a/english/legal/licenses/dls-002-bsd.wml
+++ /dev/null
@@ -1,12 +0,0 @@
-<define-tag short-summary>Free</define-tag>
-<define-tag license-text-trans></define-tag>
-<define-tag justification>
-<ul>
-<li>This license is mentioned as free license in DFSG §10.</li>
-
-</ul>
-</define-tag>
-
-# do not modify the following line
-#include "$(ENGLISHDIR)/legal/licenses/dls-002-bsd.data"
-# $Id$
diff --git a/english/legal/licenses/dls-003-artistic.data b/english/legal/licenses/dls-003-artistic.data
deleted file mode 100644
index 07152823343..00000000000
--- a/english/legal/licenses/dls-003-artistic.data
+++ /dev/null
@@ -1,145 +0,0 @@
-<define-tag pagetitle>DLS 003-1</define-tag>
-<define-tag report_date>1997-07-04</define-tag>
-<define-tag license-name>Artistic License</define-tag>
-<define-tag license-version></define-tag>
-<define-tag license-url>http://www.perl.com/pub/a/language/misc/Artistic.html</define-tag>
-<define-tag discussion-url>http://www.debian.org/social_contract</define-tag>
-<define-tag summary-url></define-tag>
-<define-tag summary-author>Andreas Barth</define-tag>
-<define-tag isfree>yes</define-tag>
-
-#use wml::debian::legal
-
-<verbatim>
-
-
-
-
-			 The "Artistic License"
-
-				Preamble
-
-The intent of this document is to state the conditions under which a
-Package may be copied, such that the Copyright Holder maintains some
-semblance of artistic control over the development of the package,
-while giving the users of the package the right to use and distribute
-the Package in a more-or-less customary fashion, plus the right to make
-reasonable modifications.
-
-Definitions:
-
-	"Package" refers to the collection of files distributed by the
-	Copyright Holder, and derivatives of that collection of files
-	created through textual modification.
-
-	"Standard Version" refers to such a Package if it has not been
-	modified, or has been modified in accordance with the wishes
-	of the Copyright Holder as specified below.
-
-	"Copyright Holder" is whoever is named in the copyright or
-	copyrights for the package.
-
-	"You" is you, if you're thinking about copying or distributing
-	this Package.
-
-	"Reasonable copying fee" is whatever you can justify on the
-	basis of media cost, duplication charges, time of people involved,
-	and so on.  (You will not be required to justify it to the
-	Copyright Holder, but only to the computing community at large
-	as a market that must bear the fee.)
-
-	"Freely Available" means that no fee is charged for the item
-	itself, though there may be fees involved in handling the item.
-	It also means that recipients of the item may redistribute it
-	under the same conditions they received it.
-
-1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you
-duplicate all of the original copyright notices and associated disclaimers.
-
-2. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder.  A Package
-modified in such a way shall still be considered the Standard Version.
-
-3. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:
-
-    a) place your modifications in the Public Domain or otherwise make them
-    Freely Available, such as by posting said modifications to Usenet or
-    an equivalent medium, or placing the modifications on a major archive
-    site such as uunet.uu.net, or by allowing the Copyright Holder to include
-    your modifications in the Standard Version of the Package.
-
-    b) use the modified Package only within your corporation or organization.
-
-    c) rename any non-standard executables so the names do not conflict
-    with standard executables, which must also be provided, and provide
-    a separate manual page for each non-standard executable that clearly
-    documents how it differs from the Standard Version.
-
-    d) make other distribution arrangements with the Copyright Holder.
-
-4. You may distribute the programs of this Package in object code or
-executable form, provided that you do at least ONE of the following:
-
-    a) distribute a Standard Version of the executables and library files,
-    together with instructions (in the manual page or equivalent) on where
-    to get the Standard Version.
-
-    b) accompany the distribution with the machine-readable source of
-    the Package with your modifications.
-
-    c) give non-standard executables non-standard names, and clearly
-    document the differences in manual pages (or equivalent), together
-    with instructions on where to get the Standard Version.
-
-    d) make other distribution arrangements with the Copyright Holder.
-
-5. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this
-Package.  You may not charge a fee for this Package itself.  However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you do not advertise this Package as a
-product of your own.  You may embed this Package's interpreter within
-an executable of yours (by linking); this shall be construed as a mere
-form of aggregation, provided that the complete Standard Version of the
-interpreter is so embedded.
-
-6. The scripts and library files supplied as input to or produced as
-output from the programs of this Package do not automatically fall
-under the copyright of this Package, but belong to whoever generated
-them, and may be sold commercially, and may be aggregated with this
-Package.  If such scripts or library files are aggregated with this
-Package via the so-called "undump" or "unexec" methods of producing a
-binary executable image, then distribution of such an image shall
-neither be construed as a distribution of this Package nor shall it
-fall under the restrictions of Paragraphs 3 and 4, provided that you do
-not represent such an executable image as a Standard Version of this
-Package.
-
-7. C subroutines (or comparably compiled subroutines in other
-languages) supplied by you and linked into this Package in order to
-emulate subroutines and variables of the language defined by this
-Package shall not be considered part of this Package, but are the
-equivalent of input as in Paragraph 6, provided these subroutines do
-not change the language in any way that would cause it to fail the
-regression tests for the language.
-
-8. Aggregation of this Package with a commercial distribution is always
-permitted provided that the use of this Package is embedded; that is,
-when no overt attempt is made to make this Package's interfaces visible
-to the end user of the commercial distribution.  Such use shall not be
-construed as a distribution of this Package.
-
-9. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-				The End
-</verbatim>
diff --git a/english/legal/licenses/dls-003-artistic.wml b/english/legal/licenses/dls-003-artistic.wml
deleted file mode 100644
index a1c66baf399..00000000000
--- a/english/legal/licenses/dls-003-artistic.wml
+++ /dev/null
@@ -1,12 +0,0 @@
-<define-tag short-summary>Free</define-tag>
-<define-tag license-text-trans></define-tag>
-<define-tag justification>
-<ul>
-<li>This license is mentioned as free license in DFSG §10.</li>
-
-</ul>
-</define-tag>
-
-# do not modify the following line
-#include "$(ENGLISHDIR)/legal/licenses/dls-003-artistic.data"
-# $Id$
diff --git a/english/legal/licenses/dls-005-opl.data b/english/legal/licenses/dls-005-opl.data
deleted file mode 100644
index 486a3be26e1..00000000000
--- a/english/legal/licenses/dls-005-opl.data
+++ /dev/null
@@ -1,130 +0,0 @@
-<define-tag pagetitle>DLS 005-1</define-tag>
-<define-tag report_date>2004-4-2</define-tag>
-<define-tag license-name>Open Publication License (OPL)</define-tag>
-<define-tag license-version>1.0</define-tag>
-<define-tag license-url>http://opencontent.org/openpub/</define-tag>
-<define-tag discussion-url>http://lists.debian.org/debian-legal/2004/debian-legal-200402/msg00278.html</define-tag>
-<define-tag summary-url>http://lists.debian.org/debian-legal/2004/debian-legal-200403/msg00226.html</define-tag>
-<define-tag summary-author>Jeremy Hankins</define-tag>
-<define-tag isfree>no</define-tag>
-
-#use wml::debian::legal
-
-<verbatim>
-Open Publication License
-v1.0, 8 June 1999
-
-
-I. REQUIREMENTS ON BOTH UNMODIFIED AND MODIFIED VERSIONS
-
-The Open Publication works may be reproduced and distributed in whole or in
-part, in any medium physical or electronic, provided that the terms of this
-license are adhered to, and that this license or an incorporation of it by
-reference (with any options elected by the author(s) and/or publisher) is
-displayed in the reproduction.
-
-Proper form for an incorporation by reference is as follows:
-
-    Copyright (c) <year> by <author's name or designee>. This material may be
-    distributed only subject to the terms and conditions set forth in the Open
-    Publication License, vX.Y or later (the latest version is presently
-    available at http://www.opencontent.org/openpub/).
-
-The reference must be immediately followed with any options elected by the
-author(s) and/or publisher of the document (see section VI).
-
-Commercial redistribution of Open Publication-licensed material is permitted.
-
-Any publication in standard (paper) book form shall require the citation of
-the original publisher and author. The publisher and author's names shall
-appear on all outer surfaces of the book. On all outer surfaces of the book
-the original publisher's name shall be as large as the title of the work and
-cited as possessive with respect to the title.
-
-
-II. COPYRIGHT
-
-The copyright to each Open Publication is owned by its author(s) or designee.
-
-
-III. SCOPE OF LICENSE
-
-The following license terms apply to all Open Publication works, unless
-otherwise explicitly stated in the document.
-
-Mere aggregation of Open Publication works or a portion of an Open Publication
-work with other works or programs on the same media shall not cause this
-license to apply to those other works. The aggregate work shall contain a
-notice specifying the inclusion of the Open Publication material and
-appropriate copyright notice.
-
-SEVERABILITY. If any part of this license is found to be unenforceable in any
-jurisdiction, the remaining portions of the license remain in force.
-
-NO WARRANTY. Open Publication works are licensed and provided "as is" without
-warranty of any kind, express or implied, including, but not limited to, the
-implied warranties of merchantability and fitness for a particular purpose or
-a warranty of non-infringement.
-
-
-IV. REQUIREMENTS ON MODIFIED WORKS
-
-All modified versions of documents covered by this license, including
-translations, anthologies, compilations and partial documents, must meet the
-following requirements:
-
- 1. The modified version must be labeled as such.
- 2. The person making the modifications must be identified and the
-    modifications dated.
- 3. Acknowledgement of the original author and publisher if applicable must be
-    retained according to normal academic citation practices.
- 4. The location of the original unmodified document must be identified.
- 5. The original author's (or authors') name(s) may not be used to assert or
-    imply endorsement of the resulting document without the original author's
-    (or authors') permission.
-
-
-V. GOOD-PRACTICE RECOMMENDATIONS
-
-In addition to the requirements of this license, it is requested from and
-strongly recommended of redistributors that:
-
- 1. If you are distributing Open Publication works on hardcopy or CD-ROM, you
-    provide email notification to the authors of your intent to redistribute
-    at least thirty days before your manuscript or media freeze, to give the
-    authors time to provide updated documents. This notification should
-    describe modifications, if any, made to the document.
- 2. All substantive modifications (including deletions) be either clearly
-    marked up in the document or else described in an attachment to the
-    document.
- 3. Finally, while it is not mandatory under this license, it is considered
-    good form to offer a free copy of any hardcopy and CD-ROM expression of an
-    Open Publication-licensed work to its author(s).
-
-
-VI. LICENSE OPTIONS
-
-The author(s) and/or publisher of an Open Publication-licensed document may
-elect certain options by appending language to the reference to or copy of the
-license. These options are considered part of the license instance and must be
-included with the license (or its incorporation by reference) in derived
-works.
-
-A. To prohibit distribution of substantively modified versions without the
-explicit permission of the author(s). "Substantive modification" is defined as
-a change to the semantic content of the document, and excludes mere changes in
-format or typographical corrections.
-
-To accomplish this, add the phrase `Distribution of substantively modified
-versions of this document is prohibited without the explicit permission of the
-copyright holder.' to the license reference or copy.
-
-B. To prohibit any publication of this work or derivative works in whole or in
-part in standard (paper) book form for commercial purposes is prohibited
-unless prior permission is obtained from the copyright holder.
-
-To accomplish this, add the phrase 'Distribution of the work or derivative of
-the work in any standard (paper) book form is prohibited unless prior
-permission is obtained from the copyright holder.' to the license reference or
-copy.
-</verbatim>
diff --git a/english/legal/licenses/dls-005-opl.wml b/english/legal/licenses/dls-005-opl.wml
deleted file mode 100644
index 5d1810f58b5..00000000000
--- a/english/legal/licenses/dls-005-opl.wml
+++ /dev/null
@@ -1,25 +0,0 @@
-<define-tag short-summary>Restricts modification</define-tag>
-<define-tag license-text-trans></define-tag>
-<define-tag justification>
-<ul>
-<li>It requires the original publisher and author to appear on all outer
-  surfaces of a paper copy, and defines how they should appear.  This is
-  a significant restriction on modification (DFSG §3).</li>
-
-<li>The person who makes any modifications must be identified.  According
-  to the Dissident Test this is an unacceptable restriction on
-  modification (DFSG §3).  (See the
-<a href="http://people.debian.org/~bap/dfsg-faq.html">DFSG FAQ</a> for
-  a description of the Dissident Test.)</li>
-
-<li>A reference to the original, unmodified version must be included in
-  any modified versions.  This may not be known or available, and may be
-  impossible under certain circumstances (e.g., the document is included
-  as help text in a binary).  This is an unacceptable restriction on
-  modification (DFSG §3).</li>
-</ul>
-</define-tag>
-
-# do not modify the following line
-#include "$(ENGLISHDIR)/legal/licenses/dls-005-opl.data"
-# $Id$
diff --git a/english/legal/licenses/dls-006-ccby.data b/english/legal/licenses/dls-006-ccby.data
deleted file mode 100644
index 300bbe605a0..00000000000
--- a/english/legal/licenses/dls-006-ccby.data
+++ /dev/null
@@ -1,237 +0,0 @@
-<define-tag pagetitle>DLS 006-1</define-tag>
-<define-tag report_date>2004-4-6</define-tag>
-<define-tag license-name>Creative Commons Attribution license (CC-by)</define-tag>
-<define-tag license-version>1.0</define-tag>
-<define-tag license-url>http://creativecommons.org/licenses/by/1.0/legalcode</define-tag>
-<define-tag discussion-url>http://lists.debian.org/debian-legal/2004/03/msg00267.html</define-tag>
-<define-tag summary-url>http://lists.debian.org/debian-legal/2004/04/msg00031.html</define-tag>
-<define-tag summary-author>Jeremy Hankins</define-tag>
-<define-tag isfree>no</define-tag>
-
-#use wml::debian::legal
-
-<verbatim>
-Attribution 1.0
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
-CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
-PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
-WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
-AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS
-YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF
-SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Collective Work" means a work, such as a periodical issue,
-   anthology or encyclopedia, in which the Work in its entirety in
-   unmodified form, along with a number of other contributions,
-   constituting separate and independent works in themselves, are
-   assembled into a collective whole. A work that constitutes a
-   Collective Work will not be considered a Derivative Work (as
-   defined below) for the purposes of this License.
-
-   2. "Derivative Work" means a work based upon the Work or upon the
-   Work and other pre-existing works, such as a translation, musical
-   arrangement, dramatization, fictionalization, motion picture
-   version, sound recording, art reproduction, abridgment,
-   condensation, or any other form in which the Work may be recast,
-   transformed, or adapted, except that a work that constitutes a
-   Collective Work will not be considered a Derivative Work for the
-   purpose of this License.
-
-   3. "Licensor" means the individual or entity that offers the Work
-   under the terms of this License.
-
-   4. "Original Author" means the individual or entity who created the
-      Work.
-
-   5. "Work" means the copyrightable work of authorship offered under
-   the terms of this License.
-
-   6. "You" means an individual or entity exercising rights under this
-      License who has not previously violated the terms of this
-      License with respect to the Work, or who has received express
-      permission from the Licensor to exercise rights under this
-      License despite a previous violation.
-
-2. Fair Use Rights. Nothing in this license is intended to reduce,
-   limit, or restrict any rights arising from fair use, first sale or
-   other limitations on the exclusive rights of the copyright owner
-   under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License,
-   Licensor hereby grants You a worldwide, royalty-free,
-   non-exclusive, perpetual (for the duration of the applicable
-   copyright) license to exercise the rights in the Work as stated
-   below:
-
-   1. to reproduce the Work, to incorporate the Work into one or more
-   Collective Works, and to reproduce the Work as incorporated in the
-   Collective Works;
-   2. to create and reproduce Derivative Works;
-   3. to distribute copies or phonorecords of, display publicly,
-   perform publicly, and perform publicly by means of a digital audio
-   transmission the Work including as incorporated in Collective
-   Works;
-   4. to distribute copies or phonorecords of, display publicly,
-   perform publicly, and perform publicly by means of a digital audio
-   transmission Derivative Works;
-
-The above rights may be exercised in all media and formats whether now
-known or hereafter devised. The above rights include the right to make
-such modifications as are technically necessary to exercise the rights
-in other media and formats. All rights not expressly granted by
-Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly
-   made subject to and limited by the following restrictions:
-
-   1. You may distribute, publicly display, publicly perform, or
-   publicly digitally perform the Work only under the terms of this
-   License, and You must include a copy of, or the Uniform Resource
-   Identifier for, this License with every copy or phonorecord of the
-   Work You distribute, publicly display, publicly perform, or
-   publicly digitally perform. You may not offer or impose any terms
-   on the Work that alter or restrict the terms of this License or the
-   recipients' exercise of the rights granted hereunder. You may not
-   sublicense the Work. You must keep intact all notices that refer to
-   this License and to the disclaimer of warranties. You may not
-   distribute, publicly display, publicly perform, or publicly
-   digitally perform the Work with any technological measures that
-   control access or use of the Work in a manner inconsistent with the
-   terms of this License Agreement. The above applies to the Work as
-   incorporated in a Collective Work, but this does not require the
-   Collective Work apart from the Work itself to be made subject to
-   the terms of this License. If You create a Collective Work, upon
-   notice from any Licensor You must, to the extent practicable,
-   remove from the Collective Work any reference to such Licensor or
-   the Original Author, as requested. If You create a Derivative Work,
-   upon notice from any Licensor You must, to the extent practicable,
-   remove from the Derivative Work any reference to such Licensor or
-   the Original Author, as requested.
-
-   2. If you distribute, publicly display, publicly perform, or
-      publicly digitally perform the Work or any Derivative Works or
-      Collective Works, You must keep intact all copyright notices for
-      the Work and give the Original Author credit reasonable to the
-      medium or means You are utilizing by conveying the name (or
-      pseudonym if applicable) of the Original Author if supplied; the
-      title of the Work if supplied; in the case of a Derivative Work,
-      a credit identifying the use of the Work in the Derivative Work
-      (e.g., "French translation of the Work by Original Author," or
-      "Screenplay based on original Work by Original Author"). Such
-      credit may be implemented in any reasonable manner; provided,
-      however, that in the case of a Derivative Work or Collective
-      Work, at a minimum such credit will appear where any other
-      comparable authorship credit appears and in a manner at least as
-      prominent as such other comparable authorship credit.
-
-5. Representations, Warranties and Disclaimer
-
-   1. By offering the Work for public release under this License,
-   Licensor represents and warrants that, to the best of Licensor's
-   knowledge after reasonable inquiry:
-
-         1. Licensor has secured all rights in the Work necessary to
-         grant the license rights hereunder and to permit the lawful
-         exercise of the rights granted hereunder without You having
-         any obligation to pay any royalties, compulsory license fees,
-         residuals or any other payments;
-         2. The Work does not infringe the copyright, trademark,
-         publicity rights, common law rights or any other right of any
-         third party or constitute defamation, invasion of privacy or
-         other tortious injury to any third party.
-
-   2. EXCEPT AS EXPRESSLY STATED IN THIS LICENSE OR OTHERWISE AGREED
-         IN WRITING OR REQUIRED BY APPLICABLE LAW, THE WORK IS
-         LICENSED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-         EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-         WARRANTIES REGARDING THE CONTENTS OR ACCURACY OF THE WORK.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY
-   APPLICABLE LAW, AND EXCEPT FOR DAMAGES ARISING FROM LIABILITY TO A
-   THIRD PARTY RESULTING FROM BREACH OF THE WARRANTIES IN SECTION 5,
-   IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-   ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY
-   DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF
-   LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate
-   automatically upon any breach by You of the terms of this
-   License. Individuals or entities who have received Derivative Works
-   or Collective Works from You under this License, however, will not
-   have their licenses terminated provided such individuals or
-   entities remain in full compliance with those licenses. Sections 1,
-   2, 5, 6, 7, and 8 will survive any termination of this License.
-
-   2. Subject to the above terms and conditions, the license granted
-      here is perpetual (for the duration of the applicable copyright
-      in the Work). Notwithstanding the above, Licensor reserves the
-      right to release the Work under different license terms or to
-      stop distributing the Work at any time; provided, however that
-      any such election will not serve to withdraw this License (or
-      any other license that has been, or is required to be, granted
-      under the terms of this License), and this License will continue
-      in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You distribute or publicly digitally perform the Work
-   or a Collective Work, the Licensor offers to the recipient a
-   license to the Work on the same terms and conditions as the license
-   granted to You under this License.
-
-   2. Each time You distribute or publicly digitally perform a
-   Derivative Work, Licensor offers to the recipient a license to the
-   original Work on the same terms and conditions as the license
-   granted to You under this License.
-
-   3. If any provision of this License is invalid or unenforceable
-   under applicable law, it shall not affect the validity or
-   enforceability of the remainder of the terms of this License, and
-   without further action by the parties to this agreement, such
-   provision shall be reformed to the minimum extent necessary to make
-   such provision valid and enforceable.
-
-   4. No term or provision of this License shall be deemed waived and
-   no breach consented to unless such waiver or consent shall be in
-   writing and signed by the party to be charged with such waiver or
-   consent.
-
-   5. This License constitutes the entire agreement between the
-      parties with respect to the Work licensed here. There are no
-      understandings, agreements or representations with respect to
-      the Work not specified here. Licensor shall not be bound by any
-      additional provisions that may appear in any communication from
-      You. This License may not be modified without the mutual written
-      agreement of the Licensor and You.
-
-</verbatim>
-
-<p>Additional notices:</p>
-
-<verbatim>
-Creative Commons is not a party to this License, and makes no warranty
-whatsoever in connection with the Work. Creative Commons will not be
-liable to You or any party on any legal theory for any damages
-whatsoever, including without limitation any general, special,
-incidental or consequential damages arising in connection to this
-license. Notwithstanding the foregoing two (2) sentences, if Creative
-Commons has expressly identified itself as the Licensor hereunder, it
-shall have all rights and obligations of Licensor.
-
-Except for the limited purpose of indicating to the public that the
-Work is licensed under the CCPL, neither party will use the trademark
-"Creative Commons" or any related trademark or logo of Creative
-Commons without the prior written consent of Creative Commons. Any
-permitted use will be in compliance with Creative Commons'
-then-current trademark usage guidelines, as may be published on its
-website or otherwise made available upon request from time to time.
-</verbatim>
diff --git a/english/legal/licenses/dls-006-ccby.wml b/english/legal/licenses/dls-006-ccby.wml
deleted file mode 100644
index 4b21dfaf967..00000000000
--- a/english/legal/licenses/dls-006-ccby.wml
+++ /dev/null
@@ -1,28 +0,0 @@
-<define-tag short-summary>Restricts modification</define-tag>
-<define-tag license-text-trans></define-tag>
-<define-tag justification>
-<ul>
-<li>It appears (though it's slightly unclear) that credit to original
-  author(s) must be as prominently displayed, and in the same location, 
-  as credit to any other author.  This restricts modification (DFSG
-  §3).</li>
-
-<li>When any Licensor asks, all references to their name(s) must be purged
-  from the work.  This restricts modification (DFSG §3).</li>
-
-<li><p>Use of the "Creative Commons" trademark (or related trademark or logo)
-  appears to be a license violation, and thus grounds for a copyright
-  holder to revoke the license.  This violates the
-  <a href="http://people.debian.org/~bap/dfsg-faq.html">"Tentacles of Evil"</a>
-  test and can remove all freedoms the license grants.</p>
-
-  <p>This references the trademark notice on the license's website
-    where it is not obvious if this notice is part of the license.</p>
-</li>
-
-</ul>
-</define-tag>
-
-# do not modify the following line
-#include "$(ENGLISHDIR)/legal/licenses/dls-006-ccby.data"
-# $Id$
diff --git a/english/legal/licenses/dls-007-osl.data b/english/legal/licenses/dls-007-osl.data
deleted file mode 100644
index 194a9778794..00000000000
--- a/english/legal/licenses/dls-007-osl.data
+++ /dev/null
@@ -1,201 +0,0 @@
-<define-tag pagetitle>DLS 007-1</define-tag>
-<define-tag report_date>2004-5-4</define-tag>
-<define-tag license-name>Open Software License (OSL)</define-tag>
-<define-tag license-version>2.0</define-tag>
-<define-tag license-url>http://opensource.org/licenses/osl-2.0.php</define-tag>
-<define-tag discussion-url>http://lists.debian.org/debian-legal/2004/04/msg00076.html</define-tag>
-<define-tag summary-url>http://lists.debian.org/debian-legal/2004/05/msg00118.html</define-tag>
-<define-tag summary-author>Jeremy Hankins</define-tag>
-<define-tag isfree>no</define-tag>
-
-#use wml::debian::legal
-
-<verbatim>
-Open Software License
- v. 2.0
-
-This Open Software License (the "License") applies to any original
-work of authorship (the "Original Work") whose owner (the "Licensor")
-has placed the following notice immediately following the copyright
-notice for the Original Work:
-Licensed under the Open Software License version 2.0
-
-1) Grant of Copyright License. Licensor hereby grants You a
-world-wide, royalty-free, non-exclusive, perpetual, sublicenseable
-license to do the following:
-a) to reproduce the Original Work in copies; 
-
-b) to prepare derivative works ("Derivative Works") based upon the
-Original Work;
-
-c) to distribute copies of the Original Work and Derivative Works to
-the public, with the proviso that copies of Original Work or
-Derivative Works that You distribute shall be licensed under the Open
-Software License;
-
-d) to perform the Original Work publicly; and 
-
-e) to display the Original Work publicly.   
-
-
-
-2) Grant of Patent License. Licensor hereby grants You a world-wide,
-   royalty-free, non-exclusive, perpetual, sublicenseable license,
-   under patent claims owned or controlled by the Licensor that are
-   embodied in the Original Work as furnished by the Licensor, to
-   make, use, sell and offer for sale the Original Work and Derivative
-   Works.
-
-3) Grant of Source Code License. The term "Source Code" means the
-   preferred form of the Original Work for making modifications to it
-   and all available documentation describing how to modify the
-   Original Work.  Licensor hereby agrees to provide a
-   machine-readable copy of the Source Code of the Original Work along
-   with each copy of the Original Work that Licensor distributes.
-   Licensor reserves the right to satisfy this obligation by placing a
-   machine-readable copy of the Source Code in an information
-   repository reasonably calculated to permit inexpensive and
-   convenient access by You for as long as Licensor continues to
-   distribute the Original Work, and by publishing the address of that
-   information repository in a notice immediately following the
-   copyright notice that applies to the Original Work.
-
-4) Exclusions From License Grant. Neither the names of Licensor, nor
-   the names of any contributors to the Original Work, nor any of
-   their trademarks or service marks, may be used to endorse or
-   promote products derived from this Original Work without express
-   prior written permission of the Licensor.  Nothing in this License
-   shall be deemed to grant any rights to trademarks, copyrights,
-   patents, trade secrets or any other intellectual property of
-   Licensor except as expressly stated herein.  No patent license is
-   granted to make, use, sell or offer to sell embodiments of any
-   patent claims other than the licensed claims defined in Section 2.
-   No right is granted to the trademarks of Licensor even if such
-   marks are included in the Original Work.  Nothing in this License
-   shall be interpreted to prohibit Licensor from licensing under
-   different terms from this License any Original Work that Licensor
-   otherwise would have a right to license.
-
-5) External Deployment. The term "External Deployment" means the use
-   or distribution of the Original Work or Derivative Works in any way
-   such that the Original Work or Derivative Works may be used by
-   anyone other than You, whether the Original Work or Derivative
-   Works are distributed to those persons or made available as an
-   application intended for use over a computer network.  As an
-   express condition for the grants of license hereunder, You agree
-   that any External Deployment by You of a Derivative Work shall be
-   deemed a distribution and shall be licensed to all under the terms
-   of this License, as prescribed in section 1(c) herein.
-
-6) Attribution Rights. You must retain, in the Source Code of any
-   Derivative Works that You create, all copyright, patent or
-   trademark notices from the Source Code of the Original Work, as
-   well as any notices of licensing and any descriptive text
-   identified therein as an "Attribution Notice."  You must cause the
-   Source Code for any Derivative Works that You create to carry a
-   prominent Attribution Notice reasonably calculated to inform
-   recipients that You have modified the Original Work.
-
-7) Warranty of Provenance and Disclaimer of Warranty. Licensor
-   warrants that the copyright in and to the Original Work and the
-   patent rights granted herein by Licensor are owned by the Licensor
-   or are sublicensed to You under the terms of this License with the
-   permission of the contributor(s) of those copyrights and patent
-   rights.  Except as expressly stated in the immediately proceeding
-   sentence, the Original Work is provided under this License on an
-   "AS IS" BASIS and WITHOUT WARRANTY, either express or implied,
-   including, without limitation, the warranties of NON-INFRINGEMENT,
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE
-   RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.  This
-   DISCLAIMER OF WARRANTY constitutes an essential part of this
-   License.  No license to Original Work is granted hereunder except
-   under this disclaimer.
-
-8) Limitation of Liability. Under no circumstances and under no legal
-   theory, whether in tort (including negligence), contract, or
-   otherwise, shall the Licensor be liable to any person for any
-   direct, indirect, special, incidental, or consequential damages of
-   any character arising as a result of this License or the use of the
-   Original Work including, without limitation, damages for loss of
-   goodwill, work stoppage, computer failure or malfunction, or any
-   and all other commercial damages or losses.  This limitation of
-   liability shall not apply to liability for death or personal injury
-   resulting from Licensor's negligence to the extent applicable law
-   prohibits such limitation.  Some jurisdictions do not allow the
-   exclusion or limitation of incidental or consequential damages, so
-   this exclusion and limitation may not apply to You.
-
-9) Acceptance and Termination. If You distribute  copies of the
-   Original Work or a Derivative Work, You must make a reasonable
-   effort under the circumstances to obtain the express assent of
-   recipients to the terms of this License.  Nothing else but this
-   License (or another written agreement between Licensor and You)
-   grants You permission to create Derivative Works based upon the
-   Original Work or to exercise any of the rights granted in Section 1
-   herein, and any attempt to do so except under the terms of this
-   License (or another written agreement between Licensor and You) is
-   expressly prohibited by U.S. copyright law, the equivalent laws of
-   other countries, and by international treaty.  Therefore, by
-   exercising any of the rights granted to You in Section 1 herein,
-   You indicate Your acceptance of this License and all of its terms
-   and conditions.  This License shall terminate immediately and you
-   may no longer exercise any of the rights granted to You by this
-   License upon Your failure to honor the proviso in Section 1(c)
-   herein.
-
-10) Termination for Patent Action. This License shall terminate
-    automatically and You may no longer exercise any of the rights
-    granted to You by this License as of the date You commence an
-    action, including a cross-claim or counterclaim, for patent
-    infringement (i) against Licensor with respect to a patent
-    applicable to software or (ii) against any entity with respect to
-    a patent applicable to the Original Work (but excluding
-    combinations of the Original Work with other software or
-    hardware).
-
-11) Jurisdiction, Venue and Governing Law. Any action or suit relating
-    to this License may be brought only in the courts of a
-    jurisdiction wherein the Licensor resides or in which Licensor
-    conducts its primary business, and under the laws of that
-    jurisdiction excluding its conflict-of-law provisions.  The
-    application of the United Nations Convention on Contracts for the
-    International Sale of Goods is expressly excluded.  Any use of the
-    Original Work outside the scope of this License or after its
-    termination shall be subject to the requirements and penalties of
-    the U.S. Copyright Act, 17 U.S.C.  101 et seq., the equivalent
-    laws of other countries, and international treaty.  This section
-    shall survive the termination of this License.
-
-12) Attorneys Fees. In any action to enforce the terms of this License
-    or seeking damages relating thereto, the prevailing party shall be
-    entitled to recover its costs and expenses, including, without
-    limitation, reasonable attorneys' fees and costs incurred in
-    connection with such action, including any appeal of such action.
-    This section shall survive the termination of this License.
-
-13) Miscellaneous. This License represents the complete agreement
-    concerning the subject matter hereof.  If any provision of this
-    License is held to be unenforceable, such provision shall be
-    reformed only to the extent necessary to make it enforceable.
-
-14) Definition of "You" in This License. "You" throughout this
-    License, whether in upper or lower case, means an individual or a
-    legal entity exercising rights under, and complying with all of
-    the terms of, this License.  For legal entities, "You" includes
-    any entity that controls, is controlled by, or is under common
-    control with you.  For purposes of this definition, "control"
-    means (i) the power, direct or indirect, to cause the direction or
-    management of such entity, whether by contract or otherwise, or
-    (ii) ownership of fifty percent (50%) or more of the outstanding
-    shares, or (iii) beneficial ownership of such entity.
-
-15) Right to Use. You may use the Original Work in all ways not
-    otherwise restricted or conditioned by this License or by law, and
-    Licensor promises not to interfere with or be responsible for such
-    uses by You.
-
-This license is Copyright (C) 2003 Lawrence E. Rosen.  All rights
-reserved.  Permission is hereby granted to copy and distribute this
-license without modification.  This license may not be modified
-without the express written permission of its copyright owner.
-</verbatim>
diff --git a/english/legal/licenses/dls-007-osl.wml b/english/legal/licenses/dls-007-osl.wml
deleted file mode 100644
index 497c0a0be94..00000000000
--- a/english/legal/licenses/dls-007-osl.wml
+++ /dev/null
@@ -1,31 +0,0 @@
-<define-tag short-summary>Restricts modification, unreasonable termination clause</define-tag>
-<define-tag license-text-trans></define-tag>
-<define-tag justification>
-<ul>
-<li>Item #5 "External Deployment" places distribution-like burdens on
-  deployment.  E.g., when the Work is made available for use over a
-  network source must be distributed.  This is a use restriction.  While
-  the DFSG does not explicitly prohibit this, the consensus on
-  debian-legal is that this is non-free.</li>
-
-<li>Item #9 "Acceptance and Termination" requires the licensee to
-  acknowledge acceptance of the license.  According to the
-  <a href="http://people.debian.org/~bap/dfsg-faq.html">Dissident
-  Test</a> this is a significant restriction on distribution (DFSG §1)</li>
-
-<li>Item #6 "Attribution Rights" requires retention of any "Attribution 
-  Notice," even if false.  There are no restrictions on what may be
-  considered an attribution notice, so there are no clear limits on what
-  materials must be retained.  This restricts modification (DFSG §3).</li>
-
-<li>Item #10 "Termination for Patent Action" terminates the license if you
-  are involved in a suit with a licensor over "a patent applicable to
-  software", or against anyone else over a patent relating to the Work.
-  This clause is much too broad, and restricts all the freedoms that the
-  license provides.</li>
-</ul>
-</define-tag>
-
-# do not modify the following line
-#include "$(ENGLISHDIR)/legal/licenses/dls-007-osl.data"
-# $Id$
diff --git a/english/legal/licenses/index.wml b/english/legal/licenses/index.wml
index 038987d6c53..624db65eab9 100644
--- a/english/legal/licenses/index.wml
+++ b/english/legal/licenses/index.wml
@@ -1,88 +1,126 @@
 <define-tag pagetitle>License information</define-tag>
 #use wml::debian::template title="<pagetitle>" GEN_TIME="yes"
-#use wml::debian::recent_list
 
 <p>This site presents the opinion of debian-legal contributors on how
 certain licenses follow the
 <a href="$(HOME)/social_contract#guidelines">Debian Free Software
-Guidelines</a> (DFSG). Most of these opinions were formed in
+Guidelines</a> (DFSG).  Most of these opinions were formed in
 discussions on the <a href="http://lists.debian.org/debian-legal/">\
 debian-legal mailing list</a> in response to questions from
-potential package maintainers or licence users. You may
-<a href="mailto:debian-legal@lists.debian.org">contact debian-legal</a> if you
-have questions or comments about these summaries.</p>
-
-<p>Note that this site was started in May 2004 and old summaries
-are slowly integrated. Please excuse any inconsistencies and
-gaps appearing in the first weeks.</p>
-
-<p>Software packaged for debian is normally classified into three categories.
-There is <em>free</em> software, <em>non-free</em> software and
-software under licenses that <em>don't allow redistribution</em>.
-The final decision rests with the ftpmasters,
-but they have many other responsibilities,
-so any consensus on debian-legal is usually considered.</p>
-
-<p><em>Free</em> software is licensed in a way that follows
-the DFSG. For help with interpreting the DFSG, you should
-check the
-<a href="http://people.debian.org/~bap/dfsg-faq.html">DFSG FAQ</a>
-that answers some common questions about the DFSG and how to analyse
-software. To be licensed under a suitable license is a necessary (but not
-sufficient, see
-<a href="$(DOC)/debian-policy/ch-archive.html#s-main">Debian Policy,
-section 2.2.1</a>) criteria for a piece of software to be included in Debian.
-Examples of suitable licenses are the
-<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public
-License</a>, the
-<a href="http://www.opensource.org/licenses/artistic-license.php">\
-Artistic license</a> and <a href="$(HOME)/misc/bsd.license">\
-BSD style licenses</a>. 
-
-<p>Software in <em>non-free</em> has licenses that fail to follow one or
-more of the DFSG, but do allow at least the unlimited non-commercial
-redistribution of the licensed software.  Debian provides
-infrastructure for some non-free packages. Although not part of
-the Debian system, these packages are provided as a benefit to our
-users (see §5 of our <a href="$(HOME)/social_contract">Social Contract</a>).
-Examples are software under licenses that restrict commercial use of the
-software or licenses that make restrictions on modifications.</p>
-
-<p><em>Non-redistributable</em> software is
-non-free, but also doesn't allow unlimited non-commercial redistribution.
-This category also includes software under licenses that are silent
-regarding rights of redistribution. In other words, if the license does not
-specifically grant the right to redistribute, the assumption is that
-no rights are granted.  Debian does not support non-redistributable
-software and the licenses do not grant permission for distribution
-needed by the Debian mirror network.</p>
-
-<p>Similar lists are maintained by the
+potential package maintainers or licensors.  We welcome
+enquiries from maintainers considering particular licenses, but
+we encourage most maintainers to use one of the common licenses:
+GPL, LGPL, BSD or Artistic.</p>
+
+<p>Software packaged for debian is normally classified into four
+categories.  There is free software (main), non-free software
+(non-free), free software which depends on some non-free
+software (contrib) and software which cannot be redistributed
+(not included).
+<a href="$(DOC)/debian-policy/ch-archive.html">Debian Policy section 2</a>
+explains exactly how the DFSG
+are applied to the archive.  If in doubt, maintainers are
+asked to email debian-legal about licenses, including the text
+of any new license into the body of the email.</p>
+
+<p>debian-legal is advisory. The actual decision-makers are the
+ftpmasters and the package maintainers.  However, if one cannot
+convince most of the generally liberal debian-legal contributors,
+it's probably not clear that the software follows the DFSG.</p>
+
+<p>Lists are maintained by the
 <a href="http://www.gnu.org/licenses/license-list.html">Free Software
 Foundation</a> (FSF) and the
 <a href="http://www.opensource.org/licenses/index.html">Open Source
-Initiative</a> (OSI). Please note however, that the Debian project
-decides on particular packages rather than licences in abstract,
-and the following are just general explanations when possible.
-It is possible to have a package containing software under one of
-these licences with some other aspect that makes it non-free.</p>
-
-<p>We provide three lists that differ in how they are sorted:</p>
-
-        <ul>
-          <li><a href="bydate">chronological list</a>, sorted
-            by the date of the summary.</li>
-          <li><a href="byname">alphabetical list</a>, sorted
-            by the name of the license.</li>
-          <li><a href="byclass">classification list</a>,
-            sorted alphabetically within each classification.
-            You can go directly to the lists of
-            <a href="byclass#free">free</a>, <a href="byclass#non-free">\
-              non-free</a> and
-            <a href="byclass#non-dist">non-redistributable</a> licenses.
-        </ul>
-
-<h2>Most recent summaries</h2>
-
-<:= get_recent_list( '.', '10', '$(ENGLISHDIR)/legal/licenses', 'list', 'dls-.*' ) :>
+Initiative</a> (OSI).  Please note however, that
+the Debian project decides on particular packages rather than
+licenses in abstract, and the lists are general explanations. It
+is possible to have a package containing software under a
+"free" license with some other aspect that makes it non-free.
+Sometimes, debian-legal comments on a license in abstract, not
+applied to any particular software.  While these discussion
+can suggest possible problems, often no firm answers can be
+reached until some specific software is examined.</p>
+
+<p>You may contact debian-legal if you have questions or comments
+about these summaries.</p>
+
+<p>Licenses currently found in Debian main include:</p>
+
+<ul>
+<li>GNU General Public License (common)</li>
+<li>GNU Lesser General Public License (common)</li>
+<li>GNU Library General Public License (common)</li>
+<li>Modified BSD License (common)</li>
+<li>Perl Artistic license (common)</li>
+<li>Apache License</li>
+<li>MIT/X11-style licenses</li>
+<li>zlib-style licenses</li>
+<li>LaTeX Project Public License</li>
+<li>Python Software Foundation License</li>
+<li>Ruby's License</li>
+<li>Glasgow Haskell Compiler License</li>
+<li>PHP License</li>
+<li>W3C Software Notice and License</li>
+<li>OpenSSL License</li>
+<li>Sleepycat License</li>
+<li>Common UNIX Printing System License Agreement</li>
+<li>vhf Public License</li>
+<li>"No problem Bugroff" license</li>
+<li>public domain (not a license, strictly speaking)</li>
+</ul>
+
+<p>If you use one of these licenses, 
+please try to use the latest version and edit no more than necessary,
+unless indicated otherwise.
+Licenses marked (common) can be found in <tt>/usr/share/common-licenses</tt>
+on a Debian system.</p>
+
+<p>Licenses currently found in the non-free archive section include:</p>
+
+<ul>
+<li>NVIDIA Software License</li>
+<li>SCILAB License</li>
+<li>Limited Use Software License Agreement</li>
+<li>Non-Commercial License</li>
+<li>FastCGI / Open Market License</li>
+<li>LaTeX2HTML License</li>
+<li>Open Publication License</li>
+<li>Free Document Dissemination Licence</li>
+<li>AT&amp;T Open Source License</li>
+<li>Apple Public Source License</li>
+<li>Aladdin Free Public License</li>
+<li>Generic amiwm License (an XV-style license)</li>
+<li>Digital License Agreement</li>
+<li>Moria/Angband license</li>
+<li>Unarj License</li>
+<li>id Software License</li>
+<li>qmail terms</li>
+</ul>
+
+<p>Please do not upload software under these licenses to the
+main archive.</p>
+
+<p>Additionally, some software is not distributable (for example,
+has no licence at all), even in non-free.</p>
+
+
+<h2>Work in Progress</h2>
+
+<p>For help with interpreting the DFSG, you should check the
+<a href="http://people.debian.org/~bap/dfsg-faq">DFSG FAQ</a>
+that answers some common questions about the DFSG and how to analyse
+software.</a>
+
+<p>Manoj Srivasta has drafted
+<a href="http://people.debian.org/~srivasta/Position_Statement">a
+position statement about the FDL</a>
+which is yet to be voted upon.</p>
+
+<p>Evan Prodromu has been delegated to work with Creative Commons
+to resolve DFSG-related problems with some of their licenses, as
+<a href="http://people.debian.org/~evan/ccsummary">summarised
+on Evan's page</a> and
+<a href="http://lists.debian.org/debian-legal/2005/04/msg00031.html">reported
+on debian-legal</a>.</p>