[SCM] live-manual branch, debian, updated. debian/2.0_a6-1-4-g7adec51
Daniel Baumann
daniel at debian.org
Sat Sep 18 23:27:02 UTC 2010
The following commit has been merged in the debian branch:
commit 7038ae33b7f303da7edfc5f510179d6ff349ae16
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Sep 19 01:23:31 2010 +0200
Really removing undistributable Debian logo (Closes: #597237).
diff --git a/debian/copyright b/debian/copyright
index 653c931..fc25ff0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,143 +19,3 @@ 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
- 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 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.
diff --git a/html/favicon.ico b/html/favicon.ico
deleted file mode 100644
index 8f4e75c..0000000
Binary files a/html/favicon.ico and /dev/null differ
diff --git a/html/image.png b/html/image.png
deleted file mode 100644
index d1321d8..0000000
Binary files a/html/image.png and /dev/null differ
diff --git a/html/index.html b/html/index.html
deleted file mode 100644
index c069d92..0000000
--- a/html/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
- <title>Debian Live Project</title>
- <link type="text/css" rel="stylesheet" href="stylesheet.css" />
-</head>
-
-<body>
-
-<h1 id="title"><a href="/">Debian Live Project</a></h1>
-<h2 id="subtitle"><a href="/">Live Debian systems!</a></h2>
-
-<div id="body">
-
-<h2>Live Manual</h2>
-
-<dl>
-
-<dd>
- <ul>
- <li>› <a href="en"><b>English</b></a></li>
- <li>› <a href="de">Deutsch (German)</a></li>
- </ul>
-</dd>
-
-</dl>
-</div>
-
-<div class="footer">
-
-<p>
- <a href="http://live.debian.net/">Debian Live</a> <<a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>> - <a href="http://live.debian.net/legal.html">Legal Notice</a>
-</p>
-
-</div>
-
-</body>
-</html>
diff --git a/html/stylesheet.css b/html/stylesheet.css
deleted file mode 100644
index a96e1c3..0000000
--- a/html/stylesheet.css
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Debian PTS stylesheet.
- * by:
- * - Dan Callahan <dan.callahan at gmail.com>
- * - Enrico Tassi <gareuselesinge at debian.org>
- * - Stefano Zacchiroli <zack at debian.org>
- */
-
-/* --- Whole-Page --- */
-body {
- margin: 0;
- padding: 0;
- font-family: "DejaVu Sans", "Bitstream Vera Sans", sans-serif; /*Prefer Free Fonts*/
- background: #fff url('image.png') no-repeat 10px 7px;
- color: #000;
- font-size: 100%;
-}
-
-a:link { color: #0755d7; text-decoration: underline; }
-a:visited { color: #0755d7; text-decoration: underline; }
-a:hover { color: #032a6b; text-decoration: underline; }
-a:active { color: #f00; text-decoration: underline; }
-a img { border: none; }
-
-.containertable { width: 100%; }
-
-/* --- Header --- */
-body > form { /* "Jump to package" */
- margin: 0.3em;
- font-size: 80%;
- padding: 0.5em;
- border: 1px solid #aaa;
- background-color: #dfdfdf;
-}
-#quickforms { /* "Jump to package" */
- margin: 0.3em;
- font-size: 80%;
- padding: 0.5em;
- border: 1px solid #aaa;
- background-color: #dfdfdf;
-}
-
-
-h1#title {
- margin: 0 0 0 0;
- padding: 20px 0 0 280px;
- font-size: 150%;
-/* min-height: 60px;
- height: auto !important; /* "Min-Height Fast Hack" */
-/* height: 60px; */
-}
-
-h1#title a {
- color: black;
- text-decoration: none;
-}
-
-h2#subtitle {
- margin: -1em 0 1em 0;
- padding: 20px 0 0 280px;
- font-size: 80%;
-/* min-height: 60px;
- height: auto !important;
- height: 60px;*/
-}
-
-h2#subtitle a {
- color: black;
- text-decoration: none;
-}
-
-/* --- Content Pane --- */
-div#body {
- clear: both;
- border-top: 2px solid #d70751;
-/* background: #dfdfdf;*/
- padding: 1em 1em; /* 0em 0em */
-}
-
-table.containertable {
- padding: 0.5em 0.5em;
-}
-
-td.containercell { padding: 0.5em; }
-
-table.lefttable {
- border-collapse: collapse;
- border: 1px solid #999;
- background: #fff;
- width: 100%;
-}
-
-table.righttable {
- border-collapse: collapse;
- border: 1px solid #999;
- background: #fff;
- width: 100%;
-}
-
-td.titlecell {
- padding: 0.2em 0.2em 0.1em 0.2em;
- font-weight: bold;
- font-size: 100%;
- background: #d70751;
- color: #fff;
- border-top: 3px solid #999;
- border-bottom: 1px solid #999;
-}
-td.titlecell a:link { color: #ffffff; background: #d70751; text-decoration: underline; }
-td.titlecell a:visited { color: #ffffff; background: #d70751; text-decoration: underline; }
-td.titlecell a:hover { color: #fff200; background: #d70751; text-decoration: underline; }
-td.titlecell a:active { color: #295598; background: #d70751; text-decoration: underline; }
-
-th.titlecell {
- padding: 0.2em 0.2em 0.1em 0.2em;
- font-weight: bold;
- font-size: 100%;
- background: #d70751;
- color: #fff;
- border-top: 3px solid #999;
- border-bottom: 1px solid #999;
-}
-th.titlecell a:link { color: #ffffff; background: #d70751; text-decoration: underline; }
-th.titlecell a:visited { color: #ffffff; background: #d70751; text-decoration: underline; }
-th.titlecell a:hover { color: #fff200; background: #d70751; text-decoration: underline; }
-th.titlecell a:active { color: #295598; background: #d70751; text-decoration: underline; }
-
-
-
-td.labelcell {
- font-weight: bold;
- padding: 0.2em 0 0.2em 0.3em;
- border-bottom: 1px dotted #999;
-}
-td.labelcell:after {
- content: ":";
-}
-
-td.contentcell {
- padding: 0.2em 0.3em 0.2em 0;
- border-bottom: 1px dotted #999;
-}
-
-/* - Edge Tables - */
-tr#bugs_rc { font-size: 90%; }
-tr#bugs_in { font-size: 90%; }
-tr#bugs_mw { font-size: 90%; }
-tr#bugs_fp { font-size: 90%; }
-span.indented { padding-left: 1.5em; }
-
-td > form { margin: 0.4em 0 0.4em 0.4em; padding: 0; } /* PTS subscribe */
-
-td#src_files ul { padding: 0; }
-td#src_files li {
- display: inline;
- font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
-}
-
-#news-list {
- max-height: 30em;
- overflow: auto;
-}
-
-/* - Central Table - */
-#problems { background: #0755d7; color: #ffffff; }
-#todo { background: #0755d7; color: #ffffff; }
-
-/* --- Footer --- */
-div#body > hr { display: none; }
-
-div.footer {
- padding: 1em 0;
- background-color: #fff;
- text-align: center;
- border-top: 2px solid #d70751;
- margin: 0 0 0 0;
- border-bottom: 0;
-}
-
-tt { font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace; }
-
-/* --- Misc --- */
-form > p { margin: 0; padding: 0; }
-
-a.feedlink { /* Little orange RSS button */
- background: #f60 !important;
- color: #fff !important;
- border: 1px solid !important;
- border-color: #fc9 #630 #330 #f96 !important;
- padding: 0 3px !important;
- font-weight: bold !important;
- font-size: 70% !important;
- text-decoration: none !important;
- vertical-align: 0.2em !important;
- /* Without !important, inherets from td.titlecell a:* */
-}
-
-ul { list-style-type: none; padding: 0; }
-li { margin-top: 0.2em; }
-/*li { margin-top: 0.4em; }
-td > ul { padding-left: 1em; }
-a.none { color: #000 !important; text-decoration: none !important; }*/
--
live-manual
More information about the debian-live-changes
mailing list