[Pkg-doc-linux-devel] r200 - in trunk/doc-linux/debian: .
copyrights/free copyrights/non-free
Frank Lichtenheld
djpig at costa.debian.org
Sun Dec 11 18:05:52 UTC 2005
Author: djpig
Date: 2005-12-11 18:05:51 +0000 (Sun, 11 Dec 2005)
New Revision: 200
Added:
trunk/doc-linux/debian/copyrights/non-free/Boot+Root+Raid+LILO
trunk/doc-linux/debian/copyrights/non-free/CC-ShareAlike-1.0
trunk/doc-linux/debian/copyrights/non-free/ESR
trunk/doc-linux/debian/copyrights/non-free/Installation
trunk/doc-linux/debian/copyrights/non-free/LDPL-Simple-4
trunk/doc-linux/debian/copyrights/non-free/LDPL-Simple-6
trunk/doc-linux/debian/copyrights/non-free/Root-RAID
trunk/doc-linux/debian/copyrights/non-free/TT-XFree86
trunk/doc-linux/debian/copyrights/non-free/TeTeX
Removed:
trunk/doc-linux/debian/copyrights/free/Boot+Root+Raid+LILO
trunk/doc-linux/debian/copyrights/free/CC-ShareAlike-1.0
trunk/doc-linux/debian/copyrights/free/ESR
trunk/doc-linux/debian/copyrights/free/Installation
trunk/doc-linux/debian/copyrights/free/LDPL-Simple-4
trunk/doc-linux/debian/copyrights/free/LDPL-Simple-6
trunk/doc-linux/debian/copyrights/free/Root-RAID
trunk/doc-linux/debian/copyrights/free/TT-XFree86
trunk/doc-linux/debian/copyrights/free/TeTeX
Modified:
trunk/doc-linux/debian/doc-linux-nonfree.control
trunk/doc-linux/debian/doc-linux.changelog
Log:
Update for 20051211 and apply some results of the license audit by
Francesco Poli
Deleted: trunk/doc-linux/debian/copyrights/free/Boot+Root+Raid+LILO
===================================================================
--- trunk/doc-linux/debian/copyrights/free/Boot+Root+Raid+LILO 2005-10-12 10:30:22 UTC (rev 199)
+++ trunk/doc-linux/debian/copyrights/free/Boot+Root+Raid+LILO 2005-12-11 18:05:51 UTC (rev 200)
@@ -1,15 +0,0 @@
-HOWTO: Boot+Root+Raid+LILO
-
- This document is GNU copyleft by Michael Robinton
- Michael at BizSystems.com <mailto:michael at bizsystems.com>.
-
- Permission to use, copy, distribute this document for any purpose is
- hereby granted, provided that the author's / editor's name and this
- notice appear in all copies and/or supporting documents; and that an
- unmodified version of this document is made freely available. This
- document is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, either expressed or implied. While every effort
- has been taken to ensure the accuracy of the information documented
- herein, the author / editor / maintainer assumes NO RESPONSIBILITY for
- any errors, or for any damages, direct or consequential, as a result
- of the use of the information documented herein.
Deleted: trunk/doc-linux/debian/copyrights/free/CC-ShareAlike-1.0
===================================================================
--- trunk/doc-linux/debian/copyrights/free/CC-ShareAlike-1.0 2005-10-12 10:30:22 UTC (rev 199)
+++ trunk/doc-linux/debian/copyrights/free/CC-ShareAlike-1.0 2005-12-11 18:05:51 UTC (rev 200)
@@ -1,203 +0,0 @@
-HOWTO: K7s5a-HOWTO
-
- ShareAlike 1.0 Licence
-
-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 d 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. You may distribute, publicly display, publicly perform, or
- publicly digitally perform a Derivative 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 each Derivative Work You distribute, publicly
- display, publicly perform, or publicly digitally perform. You
- may not offer or impose any terms on the Derivative Works that
- alter or restrict the terms of this License or the recipients'
- exercise of the rights granted hereunder, and 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
- Derivative 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
- Derivative Work as incorporated in a Collective Work, but this
- does not require the Collective Work apart from the Derivative
- Work itself to be made subject to the terms of this License.
-
-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.
Deleted: trunk/doc-linux/debian/copyrights/free/ESR
===================================================================
--- trunk/doc-linux/debian/copyrights/free/ESR 2005-10-12 10:30:22 UTC (rev 199)
+++ trunk/doc-linux/debian/copyrights/free/ESR 2005-12-11 18:05:51 UTC (rev 200)
@@ -1,16 +0,0 @@
-HOWTO: Oracle-8-HOWTO
-HOWTO: Reading-List-HOWTO
-HOWTO: Wacom-USB-mini-HOWTO
-
-You may use, disseminate, and reproduce this document freely, provided you:
-
- * do not omit or alter this copyright notice.
-
- * do not omit or alter the version number and date.
-
- * do not omit or alter the document's pointer to the current WWW version.
-
- * clearly mark any condensed, or altered versions as such.
-
-These restrictions are intended to protect potential readers from stale or
-mangled versions. If you think you have a good case for an exception, ask me.
Deleted: trunk/doc-linux/debian/copyrights/free/Installation
===================================================================
--- trunk/doc-linux/debian/copyrights/free/Installation 2005-10-12 10:30:22 UTC (rev 199)
+++ trunk/doc-linux/debian/copyrights/free/Installation 2005-12-11 18:05:51 UTC (rev 200)
@@ -1,15 +0,0 @@
-HOWTO: Installation-HOWTO
-
-This document is copyright 1998 by Eric S. Raymond. You may use, disseminate,
-and reproduce it freely, provided you:
-
- * Do not omit or alter this copyright notice (you may translate it)
-
- * Do not omit or alter or omit the version number and date.
-
- * Do not omit or alter the document's pointer to the current WWW version.
-
- * Clearly mark any condensed, or altered versions as such.
-
-These restrictions are intended to protect potential readers from stale or
-mangled versions. If you think you have a good case for an exception, ask me.
Deleted: trunk/doc-linux/debian/copyrights/free/LDPL-Simple-4
===================================================================
--- trunk/doc-linux/debian/copyrights/free/LDPL-Simple-4 2005-10-12 10:30:22 UTC (rev 199)
+++ trunk/doc-linux/debian/copyrights/free/LDPL-Simple-4 2005-12-11 18:05:51 UTC (rev 200)
@@ -1,11 +0,0 @@
-HOWTO: Oracle-7-HOWTO
-
- Like all Linux HOWTO documents, this may be reproduced and distributed
- in whole or in part, in any medium, physical or electronic, so long as
- this copyright notice is retained on all copies.
-
- Commercial redistribution is allowed and encouraged; however the
- author would like to be notified of such distributions. You may
- translate this HOWTO into any language whatsoever provided that you
- leave this copyright statement and disclaimer intact, and that you
- append a notice stating who translated the document.
Deleted: trunk/doc-linux/debian/copyrights/free/LDPL-Simple-6
===================================================================
--- trunk/doc-linux/debian/copyrights/free/LDPL-Simple-6 2005-10-12 10:30:22 UTC (rev 199)
+++ trunk/doc-linux/debian/copyrights/free/LDPL-Simple-6 2005-12-11 18:05:51 UTC (rev 200)
@@ -1,5 +0,0 @@
-HOWTO: NCD-X-Terminal
-
- Linux HOWTO documents may be reproduced and distributed in whole or in
- part, in any medium physical or electronic, as long as this copyright
- notice is retained on all copies.
Deleted: trunk/doc-linux/debian/copyrights/free/Root-RAID
===================================================================
--- trunk/doc-linux/debian/copyrights/free/Root-RAID 2005-10-12 10:30:22 UTC (rev 199)
+++ trunk/doc-linux/debian/copyrights/free/Root-RAID 2005-12-11 18:05:51 UTC (rev 200)
@@ -1,15 +0,0 @@
-HOWTO: Root-RAID-HOWTO
-
- This document is GNU copyleft by Michael Robinton michael at bzs.org
- <mailto:michael at bzs.org>.
-
- Permission to use, copy, distribute this document for any purpose is
- hereby granted, provided that the author's / editor's name and this
- notice appear in all copies and/or supporting documents; and that an
- unmodified version of this document is made freely available. This
- document is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, either expressed or implied. While every effort
- has been taken to ensure the accuracy of the information documented
- herein, the author / editor / maintainer assumes NO RESPONSIBILITY for
- any errors, or for any damages, direct or consequential, as a result
- of the use of the information documented herein.
Deleted: trunk/doc-linux/debian/copyrights/free/TT-XFree86
===================================================================
--- trunk/doc-linux/debian/copyrights/free/TT-XFree86 2005-10-12 10:30:22 UTC (rev 199)
+++ trunk/doc-linux/debian/copyrights/free/TT-XFree86 2005-12-11 18:05:51 UTC (rev 200)
@@ -1,7 +0,0 @@
-HOWTO: TT-XFree86
-
- Download, copy and redistribute this text freely. If you do any
- changes, please submit them to me, and I will pass them to the LDP, of
- course, credit will be given.
-
- Copyright (c) 2001 by Bartek Kostrzewa
Deleted: trunk/doc-linux/debian/copyrights/free/TeTeX
===================================================================
--- trunk/doc-linux/debian/copyrights/free/TeTeX 2005-10-12 10:30:22 UTC (rev 199)
+++ trunk/doc-linux/debian/copyrights/free/TeTeX 2005-12-11 18:05:51 UTC (rev 200)
@@ -1,21 +0,0 @@
-HOWTO: TeTeX-HOWTO
-
- The teTeX-HOWTO is copyright (C) 1997, 1998 by Robert Kiesling.
- Permission is granted to make and distribute verbatim copies of this
- manual provided that the copyright notice and this permission notice
- are preserved on all copies.
-
- Permission is granted to copy and distribute modified versions of this
- manual under the conditions for verbatim copying, provided also that
- the sections entitled, ``Distribution,'' and, ``GNU General Public
- License,'' are included exactly as in the original, and provided that
- the entire resulting derived work is distributed under the terms of a
- permission notice identical to this one.
-
- Permission is granted to copy and distribute translations of this
- manual into another language, under the above conditions for modified
- versions. except that the sections entitled, ``Distribution,'' and,
- ``GNU General Public License,'' may be included in a translation
- approved by the Free Software Foundation instead of in the original
- English. Please refer to Section ``Distribution and Copyright'' for
- terms of copying.
Copied: trunk/doc-linux/debian/copyrights/non-free/Boot+Root+Raid+LILO (from rev 199, trunk/doc-linux/debian/copyrights/free/Boot+Root+Raid+LILO)
Copied: trunk/doc-linux/debian/copyrights/non-free/CC-ShareAlike-1.0 (from rev 199, trunk/doc-linux/debian/copyrights/free/CC-ShareAlike-1.0)
Copied: trunk/doc-linux/debian/copyrights/non-free/ESR (from rev 199, trunk/doc-linux/debian/copyrights/free/ESR)
Copied: trunk/doc-linux/debian/copyrights/non-free/Installation (from rev 199, trunk/doc-linux/debian/copyrights/free/Installation)
Copied: trunk/doc-linux/debian/copyrights/non-free/LDPL-Simple-4 (from rev 199, trunk/doc-linux/debian/copyrights/free/LDPL-Simple-4)
Copied: trunk/doc-linux/debian/copyrights/non-free/LDPL-Simple-6 (from rev 199, trunk/doc-linux/debian/copyrights/free/LDPL-Simple-6)
Copied: trunk/doc-linux/debian/copyrights/non-free/Root-RAID (from rev 199, trunk/doc-linux/debian/copyrights/free/Root-RAID)
Copied: trunk/doc-linux/debian/copyrights/non-free/TT-XFree86 (from rev 199, trunk/doc-linux/debian/copyrights/free/TT-XFree86)
Copied: trunk/doc-linux/debian/copyrights/non-free/TeTeX (from rev 199, trunk/doc-linux/debian/copyrights/free/TeTeX)
Modified: trunk/doc-linux/debian/doc-linux-nonfree.control
===================================================================
--- trunk/doc-linux/debian/doc-linux-nonfree.control 2005-10-12 10:30:22 UTC (rev 199)
+++ trunk/doc-linux/debian/doc-linux-nonfree.control 2005-12-11 18:05:51 UTC (rev 200)
@@ -4,14 +4,14 @@
Maintainer: Debian LDP Maintainers <pkg-doc-linux-devel at lists.alioth.debian.org>
Uploaders: Frank Lichtenheld <djpig at debian.org>, Colin Watson <cjwatson at debian.org>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4)
+Build-Depends: debhelper (>= 5)
Build-Depends-Indep: bzip2
Package: doc-linux-nonfree-html
Priority: optional
Architecture: all
Conflicts: doc, doc-linux
-Replaces: doc-linux, doc-linux-text (<< 98.06-1), doc-linux-html (<< 2005.01-1)
+Replaces: doc-linux, doc-linux-text (<< 98.06-1), doc-linux-html (<< 2005.12-1)
Recommends: doc-linux-html
Suggests: doc-base, menu, www-browser
Enhances: doc-linux-html
@@ -35,7 +35,7 @@
Package: doc-linux-nonfree-text
Architecture: all
Conflicts: doc, doc-linux
-Replaces: doc-linux, doc-linux-html (<< 98.06-1), doc-linux-text (<< 2005.01-1)
+Replaces: doc-linux, doc-linux-html (<< 98.06-1), doc-linux-text (<< 2005.12-1)
Recommends: doc-linux-text
Suggests: doc-linux-html
Enhances: doc-linux-text
Modified: trunk/doc-linux/debian/doc-linux.changelog
===================================================================
--- trunk/doc-linux/debian/doc-linux.changelog 2005-10-12 10:30:22 UTC (rev 199)
+++ trunk/doc-linux/debian/doc-linux.changelog 2005-12-11 18:05:51 UTC (rev 200)
@@ -1,3 +1,41 @@
+doc-linux (2005.12-1) unstable; urgency=low
+
+ * new upstream release (20051211)
+ * Updated HOWTOs:
+ DB2-HOWTO FBB Font-HOWTO Howtos-with-LinuxDoc
+ IP-Masquerade-HOWTO LILO Leased-Line
+ Linksys-Blue-Box-Router-HOWTO Linux+WinNT
+ Linux-Complete-Backup-and-Recovery-HOWTO
+ Quake-HOWTO TimePrecision-HOWTO
+ * All above mentioned HOWTOs are free, except for the DB2-HOWTO
+ * Francesco Poli did a license audit for the free
+ HOWTOs and pointed out some ambigous stuff which
+ needs to be sorted out with the respective authors:
+ + Moved Boot+Root+Raid+LILO and Root-RAID to
+ non-free until their license contains explicit
+ permission to modify
+ + Moved the HOWTOs under the old-style ESR license
+ (Installation-HOWTO, Oracle-8-HOWTO, Reading-List-HOWTO,
+ Wacom-USB-mini-HOWTO) to non-free for similar reasons
+ + Same for Oracle-7-HOWTO, NCD-X-Terminal and TT-XFree86
+ which probably derived their license come from an old,
+ misleading LDP template
+ + Some of the arguments against the CC Attribution
+ licenses also apply to CC-SA 1.0. Move K7s5a-HOWTO
+ to non-free
+ + The TeTeX-HOWTO tries to introduce invariant sections
+ and includes the GPL for other purposes than its own
+ license text. Seems to be clearly non-free. Moved.
+ + All other HOWTOs mentioned in the bug report will remain
+ in main even though they still might need some clarification
+ of their licenses. I will also not move any of the GFDL
+ (no invariants) stuff to non-free yet. Just too much of it.
+ (Closes: #335220) All parts of the bug not solved yet are now
+ covered in separate bug reports.
+ * Updated Replaces in control file accordingly
+
+ -- Frank Lichtenheld <djpig at debian.org> Sun, 11 Dec 2005 19:04:15 +0100
+
doc-linux (2005.10-1) unstable; urgency=low
* new upstream release (20051012)
More information about the Pkg-doc-linux-devel
mailing list