[Pkg-doc-linux-devel] r185 - in trunk/doc-linux/debian: .
copyrights/free
Frank Lichtenheld
djpig at costa.debian.org
Thu Sep 1 13:39:56 UTC 2005
Author: djpig
Date: 2005-09-01 13:39:55 +0000 (Thu, 01 Sep 2005)
New Revision: 185
Added:
trunk/doc-linux/debian/copyrights/free/GFDL-1.2+GPL-2
trunk/doc-linux/debian/copyrights/free/LDPL-2.0+GPL-2
Modified:
trunk/doc-linux/debian/copyrights/free/GFDL-1.1
trunk/doc-linux/debian/copyrights/free/GPL-2
trunk/doc-linux/debian/copyrights/free/LDPL-2.0
trunk/doc-linux/debian/doc-linux.changelog
Log:
Clearly indicate the license terms for HOWTOs that dual licensed
(BootPrompt-HOWTO) or contain program code under a different
license than that of the HOWTO itself (Clone-HOWTO,
Kodak-Digitalcam-HOWTO)
Modified: trunk/doc-linux/debian/copyrights/free/GFDL-1.1
===================================================================
--- trunk/doc-linux/debian/copyrights/free/GFDL-1.1 2005-09-01 13:20:16 UTC (rev 184)
+++ trunk/doc-linux/debian/copyrights/free/GFDL-1.1 2005-09-01 13:39:55 UTC (rev 185)
@@ -20,7 +20,6 @@
HOWTO: Cryptoloop-HOWTO
HOWTO: CSPM-HOWTO
HOWTO: Caudium-HOWTO
-HOWTO: Clone-HOWTO
HOWTO: Conexant+Rockwell-modem-HOWTO
HOWTO: Diskless-root-NFS-other-HOWTO
HOWTO: DocBook-Install
@@ -39,7 +38,6 @@
HOWTO: Indic-Fonts-HOWTO
HOWTO: Intranet-Server-HOWTO
HOWTO: Jabber-Server-Farming-HOWTO
-HOWTO: Kodak-Digitalcam-HOWTO
HOWTO: LDAP-HOWTO
HOWTO: LDP-Reviewer-HOWTO
HOWTO: LILO
Added: trunk/doc-linux/debian/copyrights/free/GFDL-1.2+GPL-2
===================================================================
--- trunk/doc-linux/debian/copyrights/free/GFDL-1.2+GPL-2 2005-09-01 13:20:16 UTC (rev 184)
+++ trunk/doc-linux/debian/copyrights/free/GFDL-1.2+GPL-2 2005-09-01 13:39:55 UTC (rev 185)
@@ -0,0 +1,15 @@
+HOWTO: Clone-HOWTO
+HOWTO: Kodak-Digitalcam-HOWTO
+
+These HOWTOs are licensed under the GNU Free Documentation License,
+Version 1.2; with no Invarient Sections, with no Front-Cover Texts,
+and with no Back-Cover Texts.
+
+The full text of the GNU Free Documentation License can be found elsewhere
+in this file.
+
+They additionaly contain program code that is licensed under the
+GNU General Public License, version 2.
+
+On Debian systems, a copy of the GNU General Public License is available in
+/usr/share/common-licenses/GPL as part of the base-files package.
Modified: trunk/doc-linux/debian/copyrights/free/GPL-2
===================================================================
--- trunk/doc-linux/debian/copyrights/free/GPL-2 2005-09-01 13:20:16 UTC (rev 184)
+++ trunk/doc-linux/debian/copyrights/free/GPL-2 2005-09-01 13:39:55 UTC (rev 185)
@@ -2,8 +2,6 @@
HOWTO: Alsa-sound
HOWTO: Antares-RAID-sparcLinux-HOWTO
HOWTO: Apache-mods
-HOWTO: BootPrompt-HOWTO
-HOWTO: Clone-HOWTO
HOWTO: DSL-HOWTO
HOWTO: Debian-and-Windows-Shared-Printing
HOWTO: Diald-HOWTO
@@ -22,7 +20,6 @@
HOWTO: Intkeyb
HOWTO: Italian-HOWTO
HOWTO: KernelAnalysis-HOWTO
-HOWTO: Kodak-Digitalcam-HOWTO
HOWTO: Linux+IPv6-HOWTO
HOWTO: Linux+XFS-HOWTO
HOWTO: LinuxDoc+Emacs+Ispell-HOWTO
Modified: trunk/doc-linux/debian/copyrights/free/LDPL-2.0
===================================================================
--- trunk/doc-linux/debian/copyrights/free/LDPL-2.0 2005-09-01 13:20:16 UTC (rev 184)
+++ trunk/doc-linux/debian/copyrights/free/LDPL-2.0 2005-09-01 13:39:55 UTC (rev 185)
@@ -11,7 +11,6 @@
HOWTO: Bash-Prog-Intro-HOWTO
HOWTO: Boca
HOWTO: BogoMips
-HOWTO: BootPrompt-HOWTO
HOWTO: Bootdisk-HOWTO
HOWTO: Bridge+Firewall+DSL
HOWTO: Bridge+Firewall
Added: trunk/doc-linux/debian/copyrights/free/LDPL-2.0+GPL-2
===================================================================
--- trunk/doc-linux/debian/copyrights/free/LDPL-2.0+GPL-2 2005-09-01 13:20:16 UTC (rev 184)
+++ trunk/doc-linux/debian/copyrights/free/LDPL-2.0+GPL-2 2005-09-01 13:39:55 UTC (rev 185)
@@ -0,0 +1,12 @@
+HOWTO: BootPrompt-HOWTO
+
+These HOWTOs can be copied and redistributed under
+
+ either the default license for LDP documents (LINUX DOCUMENTATION
+ PROJECT LICENSE, v2.0, available elsewhere in this file)
+
+ OR
+
+ the GNU General Public License, version 2. On Debian systems, a copy of
+ the GNU General Public License is available in
+ /usr/share/common-licenses/GPL as part of the base-files package.
Modified: trunk/doc-linux/debian/doc-linux.changelog
===================================================================
--- trunk/doc-linux/debian/doc-linux.changelog 2005-09-01 13:20:16 UTC (rev 184)
+++ trunk/doc-linux/debian/doc-linux.changelog 2005-09-01 13:39:55 UTC (rev 185)
@@ -17,7 +17,12 @@
(Closes: #316163)
* Fix URL to subversion repository in debian/copyright
* Clean up packaging handling of placeholders a bit
+ * Clearly indicate the license terms for HOWTOs that dual licensed
+ (BootPrompt-HOWTO) or contain program code under a different
+ license than that of the HOWTO itself (Clone-HOWTO,
+ Kodak-Digitalcam-HOWTO). This also closes: #322877
+
-- Frank Lichtenheld <djpig at debian.org> Wed, 31 Aug 2005 20:51:46 +0200
doc-linux (2005.07-1) unstable; urgency=low
More information about the Pkg-doc-linux-devel
mailing list