[Pkg-doc-linux-devel] r238 - in trunk/doc-linux/debian: . copyrights/free copyrights/undistributable

[djpig at alioth.debian.org]

Author: djpig
Date: 2007-06-19 00:40:08 +0000 (Tue, 19 Jun 2007)
New Revision: 238

Added:
   trunk/doc-linux/debian/copyrights/undistributable/Secure-BootCD-VPN-HOWTO
Modified:
   trunk/doc-linux/debian/copyrights/free/GFDL-1.2
   trunk/doc-linux/debian/copyrights/free/GFDL-1.2+GPL-2
   trunk/doc-linux/debian/copyrights/free/GPL-2
   trunk/doc-linux/debian/doc-linux-nonfree.changelog
   trunk/doc-linux/debian/doc-linux.changelog
Log:
Prepare new upstream release (20070616)


Modified: trunk/doc-linux/debian/copyrights/free/GFDL-1.2
===================================================================
--- trunk/doc-linux/debian/copyrights/free/GFDL-1.2	2007-05-21 22:57:44 UTC (rev 237)
+++ trunk/doc-linux/debian/copyrights/free/GFDL-1.2	2007-06-19 00:40:08 UTC (rev 238)
@@ -1,5 +1,4 @@
 HOWTO: 8021X-HOWTO
-HOWTO: Athlon-Powersaving-HOWTO
 HOWTO: Aviation-HOWTO
 HOWTO: BogoMips
 HOWTO: BTTV

Modified: trunk/doc-linux/debian/copyrights/free/GFDL-1.2+GPL-2
===================================================================
--- trunk/doc-linux/debian/copyrights/free/GFDL-1.2+GPL-2	2007-05-21 22:57:44 UTC (rev 237)
+++ trunk/doc-linux/debian/copyrights/free/GFDL-1.2+GPL-2	2007-06-19 00:40:08 UTC (rev 238)
@@ -1,5 +1,6 @@
 HOWTO: Clone-HOWTO
 HOWTO: Kodak-Digitalcam-HOWTO
+HOWTO: TCP-Keepalive-HOWTO
 
 These HOWTOs are licensed under the GNU Free Documentation License,
 Version 1.2; with no Invarient Sections, with no Front-Cover Texts,

Modified: trunk/doc-linux/debian/copyrights/free/GPL-2
===================================================================
--- trunk/doc-linux/debian/copyrights/free/GPL-2	2007-05-21 22:57:44 UTC (rev 237)
+++ trunk/doc-linux/debian/copyrights/free/GPL-2	2007-06-19 00:40:08 UTC (rev 238)
@@ -2,6 +2,7 @@
 HOWTO: Alsa-sound
 HOWTO: Antares-RAID-sparcLinux-HOWTO
 HOWTO: Apache-mods
+HOWTO: Athlon-Powersaving-HOWTO
 HOWTO: C++-dlopen
 HOWTO: DSL-HOWTO
 HOWTO: Debian-and-Windows-Shared-Printing

Added: trunk/doc-linux/debian/copyrights/undistributable/Secure-BootCD-VPN-HOWTO
===================================================================
--- trunk/doc-linux/debian/copyrights/undistributable/Secure-BootCD-VPN-HOWTO	                        (rev 0)
+++ trunk/doc-linux/debian/copyrights/undistributable/Secure-BootCD-VPN-HOWTO	2007-06-19 00:40:08 UTC (rev 238)
@@ -0,0 +1,26 @@
+HOWTO: Secure-BootCD-VPN-HOWTO
+
+This HOWTO includes the following license text:
+
+You are free:
+
+    * to copy, distribute, display, and perform the work
+    * to make derivative works
+    * to make commercial use of the work
+
+Under the following conditions:
+
+Attribution.
+
+You must give the original author credit.
+
+Share Alike. If you alter, transform, or build upon this work, you may
+distribute the resulting work only under a license identical to this one.
+
+    * For any reuse or distribution, you must make clear to others the
+      license terms of this work.
+    * Any of these conditions can be waived if you get permission from the
+      author.
+
+I'm confused on whether this should be the actual license or whether
+he just didn't understand how to use a CC license. Author contacted.

Modified: trunk/doc-linux/debian/doc-linux-nonfree.changelog
===================================================================
--- trunk/doc-linux/debian/doc-linux-nonfree.changelog	2007-05-21 22:57:44 UTC (rev 237)
+++ trunk/doc-linux/debian/doc-linux-nonfree.changelog	2007-06-19 00:40:08 UTC (rev 238)
@@ -1,3 +1,18 @@
+doc-linux-nonfree (2007.06-1) unstable; urgency=low
+
+  * new upstream release (20070616)
+  * Updated HOWTOs:
+    Athlon-Powersaving-HOWTO Autodir-HOWTO Ecology-HOWTO Hardware-HOWTO
+    Linux+IPv6-HOWTO UPS-HOWTO libdc1394-HOWTO 
+  * Added HOWTOs:
+    TCP-Keepalive-HOWTO
+  * All mentioned HOWTOs except for the Autodir-HOWTO are free.
+  * The new Secure-BootCD-VPN-HOWTO was not included since it
+    had confusing license terms. These will to have be cleared with
+    the author first
+
+ -- Frank Lichtenheld <djpig at debian.org>  Tue, 19 Jun 2007 02:25:31 +0200
+
 doc-linux-nonfree (2007.05-1) unstable; urgency=low
 
   * new upstream release (20070503)

Modified: trunk/doc-linux/debian/doc-linux.changelog
===================================================================
--- trunk/doc-linux/debian/doc-linux.changelog	2007-05-21 22:57:44 UTC (rev 237)
+++ trunk/doc-linux/debian/doc-linux.changelog	2007-06-19 00:40:08 UTC (rev 238)
@@ -1,3 +1,20 @@
+doc-linux (2007.06-1) unstable; urgency=low
+
+  * new upstream release (20070616)
+  * Updated HOWTOs:
+    Athlon-Powersaving-HOWTO Autodir-HOWTO Ecology-HOWTO Hardware-HOWTO
+    Linux+IPv6-HOWTO UPS-HOWTO libdc1394-HOWTO 
+  * Added HOWTOs:
+    TCP-Keepalive-HOWTO
+  * All mentioned HOWTOs except for the Autodir-HOWTO are free.
+  * The Hardware-HOWTO now includes clear license information
+    in the HTML version (Closes: #233784)
+  * The new Secure-BootCD-VPN-HOWTO was not included since it
+    had confusing license terms. These will to have be cleared with
+    the author first
+
+ -- Frank Lichtenheld <djpig at debian.org>  Tue, 19 Jun 2007 02:25:31 +0200
+
 doc-linux (2007.05-1) unstable; urgency=low
 
   * new upstream release (20070503)