From 4284b2e1d72815e1ce62a43206845dba0e5b24af Mon Sep 17 00:00:00 2001
From: Stefano Zacchiroli <zack>
Date: Sun, 30 Sep 2012 15:51:14 +0000
Subject: Debian logo relicensing: switch advertised license to LGPL3+/BY-SA
 3.0

Document Debian logo relicensing, as ratified by the SPI board a few
weeks ago, see
http://www.spi-inc.org/corporate/resolutions/2012/2012-09-07.rtb.1/

Also: hyperlink www.d.o in the note requesting to link back to us

CVS version numbers

english/logos/index.wml: 1.64 -> 1.65
---
 english/logos/index.wml | 46 ++++++++++++----------------------------------
 1 file changed, 12 insertions(+), 34 deletions(-)

(limited to 'english/logos')

diff --git a/english/logos/index.wml b/english/logos/index.wml
index bbe5d8ed72b..9a5a39f0736 100644
--- a/english/logos/index.wml
+++ b/english/logos/index.wml
@@ -22,42 +22,20 @@ logo</a> falls under an open use type license.</p>
 </tr>
 <tr>
 <td>
-<h3>Debian Open Use Logo License</h3>
-
-<p>The logo without &ldquo;Debian&rdquo; is released under the following
-common free software license.</p>
-
-<p>Copyright (c) 1999 Software in the Public Interest
-      <p>Permission is hereby granted, free of charge, to any person
-      obtaining a copy of this software and associated documentation
-      files (the "Software"), to deal in the Software without restriction,
-      including without limitation the rights to use, copy, modify, merge,
-      publish, distribute, sublicense, and/or sell copies of the Software,
-      and to permit persons to whom the Software is furnished to do so,
-      subject to the following conditions:</p>
-
-      <p>The above copyright notice and this permission notice shall be
-      included in all copies or substantial portions of the Software.</p>
-
-      <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-      KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-      WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-      NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-      BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-      AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-      IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-      THE SOFTWARE.</p>
-
-<p>The logo with &ldquo;Debian&rdquo; is released under the following license,
-due to ongoing concerns about <a href="../trademark">trademarks</a>.</p>
-
-<p>Copyright (c) 1999 Software in the Public Interest
-<br />This logo or a modified version may be used by anyone to refer to
-the Debian project, but does not indicate endorsement by the
-project.</p>
+
+<p>The Debian Open Use Logo comes in two flavors, with and without
+  &ldquo;Debian&rdquo; label.</p>
+
+<p>The Debian Open Use Logo(s) are Copyright (c) 1999
+  <a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a>,
+  and are released under the terms of the
+  <a href="http://www.gnu.org/copyleft/lgpl.html">GNU Lesser General Public
+  License</a>, version 3 or any later version, or, at your option, of
+  the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
+  Attribution-ShareAlike 3.0 Unported License</a>.</p>
 
 <p>Note: we would appreciate that you make the image a link to
-http://www.debian.org/ if you use it on a web page.</p>
+<a href="$(HOME)">http://www.debian.org/</a> if you use it on a web page.</p>
 </td>
 <td>
 <openlogotable>
-- 
cgit v1.2.3