[SCM] Debian Live manual branch, master, updated. d8eb5a2556c79d09f6c9eeeadd64c9ef7afe2ddd

[Daniel Baumann]

The following commit has been merged in the master branch:
commit d8eb5a2556c79d09f6c9eeeadd64c9ef7afe2ddd
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jan 30 19:03:36 2009 +0100

    Adding license statements for debian logos.

diff --git a/debian/copyright b/debian/copyright
index 74ad785..0239b16 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,6 +20,33 @@ License: GPL-3+
  On Debian systems, the complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-3 file.
 
+Files: html/favicon.ico
+Copyright: (C) 1999 Software in the Public Interest, Inc.
+License: other
+ 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:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ 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.
+
+Files: html/image.png
+Copyright: (C) 1999 Software in the Public Interest, Inc.
+License: other
+ 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.
+
 Files: html/stylesheet.css
 Copyright: (C) 1999-2009 Software in the Public Interest, Inc.
 License: OPL-1

-- 
Debian Live manual