[Pkg-doc-linux-devel] r264 - in trunk/doc-linux/debian: . copyrights/free copyrights/non-free

djpig at alioth.debian.org djpig at alioth.debian.org
Sat Jan 19 13:41:51 UTC 2008


Author: djpig
Date: 2008-01-19 13:41:51 +0000 (Sat, 19 Jan 2008)
New Revision: 264

Added:
   trunk/doc-linux/debian/copyrights/free/GFDL-1.1ol
   trunk/doc-linux/debian/copyrights/free/GFDL-latest
Modified:
   trunk/doc-linux/debian/copyrights/free/GFDL-1.1
   trunk/doc-linux/debian/copyrights/free/GFDL-1.2
   trunk/doc-linux/debian/copyrights/non-free/GFDL-1.1-Invariants
   trunk/doc-linux/debian/doc-linux-nonfree.control
   trunk/doc-linux/debian/doc-linux.changelog
Log:
* Review the list of GFDL-1.1 licensed howtos:
  - Move Belgian-HOWTO and Conexant+Rockwell-modem-HOWTO
    to non-free since they contain Invariant Sections
  - VideoLAN-HOWTO is actually licensed under GFDL-1.2
  - Split the rest of the list into HOWTOs licensed
    GFDL-1.1 or any later (64), HOWTOs licensed without
    any specific version information (28), and HOWTOs
    really licensed under GFDL-1.1 only (4). Declare all
    but the last group as redistributed under GFDL-1.2.
* Update the Replaces of the non-free packages.


Modified: trunk/doc-linux/debian/copyrights/free/GFDL-1.1
===================================================================
--- trunk/doc-linux/debian/copyrights/free/GFDL-1.1	2007-12-15 02:12:50 UTC (rev 263)
+++ trunk/doc-linux/debian/copyrights/free/GFDL-1.1	2008-01-19 13:41:51 UTC (rev 264)
@@ -1,114 +1,10 @@
-HOWTO: ACPI-HOWTO
-HOWTO: ADSL-Bandwidth-Management-HOWTO
-HOWTO: ATA-RAID-HOWTO
-HOWTO: ATM-Linux-HOWTO
-HOWTO: AX25-HOWTO
 HOWTO: Assembly-HOWTO
-HOWTO: Authentication-Gateway-HOWTO
-HOWTO: Bandwidth-Limiting-HOWTO
-HOWTO: Bangla-HOWTO
-HOWTO: Bash-Prompt-HOWTO
-HOWTO: Belgian-HOWTO
-HOWTO: Beowulf-HOWTO
-HOWTO: Bridge
-HOWTO: C-editing-with-VIM-HOWTO
-HOWTO: CDROM-HOWTO
-HOWTO: CDServer-HOWTO
-HOWTO: Cryptoloop-HOWTO
-HOWTO: Caudium-HOWTO
-HOWTO: Conexant+Rockwell-modem-HOWTO
-HOWTO: Diskless-root-NFS-other-HOWTO
-HOWTO: DocBook-Install
-HOWTO: DocBook-OpenJade-SGML-XML-HOWTO
-HOWTO: Emacspeak-HOWTO
-HOWTO: Enterprise-Java-for-Linux-HOWTO
 HOWTO: Euro-Char-Support
-HOWTO: FBB
-HOWTO: Firewall-Piercing
-HOWTO: Francophones-HOWTO
-HOWTO: HP-HOWTO
-HOWTO: HighQuality-Apps-HOWTO
-HOWTO: IO-Perf-HOWTO
 HOWTO: Indic-Fonts-HOWTO
-HOWTO: Intranet-Server-HOWTO
-HOWTO: Jabber-Server-Farming-HOWTO
-HOWTO: LDAP-HOWTO
-HOWTO: LDP-Reviewer-HOWTO
-HOWTO: LILO
-HOWTO: Leased-Line
-HOWTO: Linux+Win9x+Grub-HOWTO
-HOWTO: Linux+WinNT
-HOWTO: Linux+Windows-HOWTO
-HOWTO: Linux-Complete-Backup-and-Recovery-HOWTO
-HOWTO: Linux-Crash-HOWTO
-HOWTO: Linux-Modem-Sharing
-HOWTO: Linux-Promise-RAID1-HOWTO
-HOWTO: Lotus-DominoR5
-HOWTO: MIDI-HOWTO
-HOWTO: MIPS-HOWTO
-HOWTO: MP3-HOWTO
-HOWTO: MP3-CD-Burning
-HOWTO: Mail-Queue
-HOWTO: Mock-Mainframe
-HOWTO: Modules
-HOWTO: Mosix-HOWTO
-HOWTO: Multi-Disk-HOWTO
-HOWTO: Multi-Distro-Dev
-HOWTO: NC-HOWTO
-HOWTO: NCD-HOWTO
-HOWTO: Network-boot-HOWTO
-HOWTO: News-Leafsite
-HOWTO: Nvidia-OpenGL-Configuration
-HOWTO: Oracle-9i-RH8-and-RH9-HOWTO
-HOWTO: Oracle8-on-RH7X-HOWTO
-HOWTO: Outlook-to-Unix-Mailbox
-HOWTO: PCTel-MicroModem-Config
-HOWTO: PHP-Nuke-HOWTO
-HOWTO: PalmOS-HOWTO
-HOWTO: Pine-Exchange
-HOWTO: Print2Win
-HOWTO: Qmail-VMailMgr-Courier-imap-HOWTO
-HOWTO: Remote-Bridging
 HOWTO: Remote-X-Apps
-HOWTO: SCSI-2.4-HOWTO
-HOWTO: SCSI-Generic-HOWTO
-HOWTO: SMB-HOWTO
-HOWTO: SMP-HOWTO
-HOWTO: Scientific-Computing-with-GNU-Linux
-HOWTO: Slovak-HOWTO
-HOWTO: Software-Proj-Mgmt-HOWTO
-HOWTO: Sound-HOWTO
-HOWTO: Speech-Recognition-HOWTO
-HOWTO: Sybase-PHP-Apache
-HOWTO: Token-Ring
-HOWTO: Traffic-Control-HOWTO
-HOWTO: Traffic-Control-tcng-HTB-HOWTO
-HOWTO: UMSDOS-HOWTO
-HOWTO: UUCP-HOWTO
-HOWTO: Update
-HOWTO: VMailMgr-HOWTO
-HOWTO: VPN-HOWTO
-HOWTO: Valgrind-HOWTO
-HOWTO: VideoLAN-HOWTO
-HOWTO: Virtual-Web
-HOWTO: Visual-Bell
-HOWTO: Wireless-Sync-HOWTO
-HOWTO: XFree-Local-multi-user-HOWTO
-HOWTO: XFree86-R200
-HOWTO: XFree86-Second-Mouse
-HOWTO: XFree86-Touch-Screen-HOWTO
-HOWTO: XML-RPC-HOWTO
-HOWTO: XWindow-Overview-HOWTO
-HOWTO: openMosix-HOWTO
-HOWTO: phhttpd-HOWTO
-HOWTO: ppp-ssh
 
-The documents listed here have no Invariant Sections, with the exception of
-the following documents which have their copyright sections labelled as
-Invariant Sections:
+The documents listed here have no Invariant Sections.
 
-  * MIPS
-
 		GNU Free Documentation License
 		   Version 1.1, March 2000
 

Added: trunk/doc-linux/debian/copyrights/free/GFDL-1.1ol
===================================================================
--- trunk/doc-linux/debian/copyrights/free/GFDL-1.1ol	                        (rev 0)
+++ trunk/doc-linux/debian/copyrights/free/GFDL-1.1ol	2008-01-19 13:41:51 UTC (rev 264)
@@ -0,0 +1,78 @@
+HOWTO: ACPI-HOWTO
+HOWTO: ATM-Linux-HOWTO
+HOWTO: Authentication-Gateway-HOWTO
+HOWTO: AX25-HOWTO
+HOWTO: Bangla-HOWTO
+HOWTO: Bash-Prompt-HOWTO
+HOWTO: Beowulf-HOWTO
+HOWTO: Bridge
+HOWTO: C-editing-with-VIM-HOWTO
+HOWTO: Caudium-HOWTO
+HOWTO: CDROM-HOWTO
+HOWTO: CDServer-HOWTO
+HOWTO: Cryptoloop-HOWTO
+HOWTO: DocBook-Install
+HOWTO: DocBook-OpenJade-SGML-XML-HOWTO
+HOWTO: Emacspeak-HOWTO
+HOWTO: Enterprise-Java-for-Linux-HOWTO
+HOWTO: FBB
+HOWTO: HP-HOWTO
+HOWTO: IO-Perf-HOWTO
+HOWTO: Jabber-Server-Farming-HOWTO
+HOWTO: LDAP-HOWTO
+HOWTO: LDP-Reviewer-HOWTO
+HOWTO: LILO
+HOWTO: Linux-Complete-Backup-and-Recovery-HOWTO
+HOWTO: Linux-Crash-HOWTO
+HOWTO: Linux-Promise-RAID1-HOWTO
+HOWTO: Linux+Win9x+Grub-HOWTO
+HOWTO: Linux+WinNT
+HOWTO: Linux+Windows-HOWTO
+HOWTO: Lotus-DominoR5
+HOWTO: Mock-Mainframe
+HOWTO: Multi-Disk-HOWTO
+HOWTO: Multi-Distro-Dev
+HOWTO: Mosix-HOWTO
+HOWTO: NC-HOWTO
+HOWTO: NCD-HOWTO
+HOWTO: Nvidia-OpenGL-Configuration
+HOWTO: openMosix-HOWTO
+HOWTO: Oracle-9i-RH8-and-RH9-HOWTO
+HOWTO: Oracle8-on-RH7X-HOWTO
+HOWTO: Outlook-to-Unix-Mailbox
+HOWTO: PalmOS-HOWTO
+HOWTO: PCTel-MicroModem-Config
+HOWTO: PHP-Nuke-HOWTO
+HOWTO: Pine-Exchange
+HOWTO: Print2Win
+HOWTO: Qmail-VMailMgr-Courier-imap-HOWTO
+HOWTO: Remote-Bridging
+HOWTO: Scientific-Computing-with-GNU-Linux
+HOWTO: SCSI-2.4-HOWTO
+HOWTO: SCSI-Generic-HOWTO
+HOWTO: SMB-HOWTO
+HOWTO: Software-Proj-Mgmt-HOWTO
+HOWTO: Sound-HOWTO
+HOWTO: Speech-Recognition-HOWTO
+HOWTO: Token-Ring
+HOWTO: Traffic-Control-HOWTO
+HOWTO: Traffic-Control-tcng-HTB-HOWTO
+HOWTO: Update
+HOWTO: Valgrind-HOWTO
+HOWTO: VMailMgr-HOWTO
+HOWTO: VPN-HOWTO
+HOWTO: XFree-Local-multi-user-HOWTO
+HOWTO: XFree86-R200
+HOWTO: XML-RPC-HOWTO
+HOWTO: XWindow-Overview-HOWTO
+
+The documents listed here have no Invariant Sections.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1,
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+
+On Debian systems, a copy of the latest GNU Free Documentation License,
+is available in /usr/share/common-licenses/GFDL as part of the base-files
+package.

Modified: trunk/doc-linux/debian/copyrights/free/GFDL-1.2
===================================================================
--- trunk/doc-linux/debian/copyrights/free/GFDL-1.2	2007-12-15 02:12:50 UTC (rev 263)
+++ trunk/doc-linux/debian/copyrights/free/GFDL-1.2	2008-01-19 13:41:51 UTC (rev 264)
@@ -32,6 +32,7 @@
 HOWTO: TimePrecision-HOWTO
 HOWTO: UPS-HOWTO
 HOWTO: VB6-to-Tcl
+HOWTO: VideoLAN-HOWTO
 HOWTO: Web-Browsing-Behind-ISA-Server-HOWTO
 HOWTO: Webcam-HOWTO
 HOWTO: WikiText-HOWTO

Added: trunk/doc-linux/debian/copyrights/free/GFDL-latest
===================================================================
--- trunk/doc-linux/debian/copyrights/free/GFDL-latest	                        (rev 0)
+++ trunk/doc-linux/debian/copyrights/free/GFDL-latest	2008-01-19 13:41:51 UTC (rev 264)
@@ -0,0 +1,41 @@
+HOWTO: ATA-RAID-HOWTO
+HOWTO: Bandwidth-Limiting-HOWTO
+HOWTO: Diskless-root-NFS-other-HOWTO
+HOWTO: Firewall-Piercing
+HOWTO: Francophones-HOWTO
+HOWTO: HighQuality-Apps-HOWTO
+HOWTO: Intranet-Server-HOWTO
+HOWTO: Leased-Line
+HOWTO: Linux-Modem-Sharing
+HOWTO: Mail-Queue
+HOWTO: MIDI-HOWTO
+HOWTO: Modules
+HOWTO: MP3-HOWTO
+HOWTO: MP3-CD-Burning
+HOWTO: Network-boot-HOWTO
+HOWTO: News-Leafsite
+HOWTO: phhttpd-HOWTO
+HOWTO: ppp-ssh
+HOWTO: Slovak-HOWTO
+HOWTO: SMP-HOWTO
+HOWTO: Sybase-PHP-Apache
+HOWTO: UMSDOS-HOWTO
+HOWTO: UUCP-HOWTO
+HOWTO: Virtual-Web
+HOWTO: Visual-Bell
+HOWTO: Wireless-Sync-HOWTO
+HOWTO: XFree86-Second-Mouse
+HOWTO: XFree86-Touch-Screen-HOWTO
+
+The listed HOWTOs did not specify any version information regarding
+the GNU Free Documentation License. We assume that the following
+terms apply in this case:
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1,
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+
+On Debian systems, a copy of the latest GNU Free Documentation License,
+is available in /usr/share/common-licenses/GFDL as part of the base-files
+package.

Modified: trunk/doc-linux/debian/copyrights/non-free/GFDL-1.1-Invariants
===================================================================
--- trunk/doc-linux/debian/copyrights/non-free/GFDL-1.1-Invariants	2007-12-15 02:12:50 UTC (rev 263)
+++ trunk/doc-linux/debian/copyrights/non-free/GFDL-1.1-Invariants	2008-01-19 13:41:51 UTC (rev 264)
@@ -1,3 +1,5 @@
+HOWTO: Belgian-HOWTO
+HOWTO: Conexant+Rockwell-modem-HOWTO
 HOWTO: Infrared-HOWTO
 HOWTO: JavaStation-HOWTO
 HOWTO: Latvian-HOWTO
@@ -13,6 +15,11 @@
 
 The documents listed here have Invariant Sections as follows:
 
+  * Conexant+Rockwell-modem has one Invariant Section: "Introduction".
+
+  * Belgian has four Invariant Sections: "New versions of this document",
+    "Contributions", "Feedback" and "Copyright information".
+
   * Infrared has two Invariant Sections: "Preface" and "Credits".
 
   * JavaStation has one Invariant Section: "Why JavaStations are No Longer

Modified: trunk/doc-linux/debian/doc-linux-nonfree.control
===================================================================
--- trunk/doc-linux/debian/doc-linux-nonfree.control	2007-12-15 02:12:50 UTC (rev 263)
+++ trunk/doc-linux/debian/doc-linux-nonfree.control	2008-01-19 13:41:51 UTC (rev 264)
@@ -14,7 +14,7 @@
 Priority: optional
 Architecture: all
 Conflicts: doc, doc-linux
-Replaces: doc-linux, doc-linux-text (<< 98.06-1), doc-linux-html (<< 2005.12-1)
+Replaces: doc-linux, doc-linux-text (<< 98.06-1), doc-linux-html (<< 2007.12-2)
 Pre-Depends: dpkg (>= 1.10.24)
 Recommends: doc-linux-html
 Suggests: doc-base, menu, www-browser
@@ -39,7 +39,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.12-1)
+Replaces: doc-linux, doc-linux-html (<< 98.06-1), doc-linux-text (<< 2007.12-2)
 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	2007-12-15 02:12:50 UTC (rev 263)
+++ trunk/doc-linux/debian/doc-linux.changelog	2008-01-19 13:41:51 UTC (rev 264)
@@ -1,3 +1,20 @@
+doc-linux (2007.12-2) unstable; urgency=low
+
+  * Review the list of GFDL-1.1 licensed howtos:
+     - Move Belgian-HOWTO and Conexant+Rockwell-modem-HOWTO
+       to non-free since they contain Invariant Sections
+     - Remove ADSL-Bandwidth-Management-HOWTO and MIPS-HOWTO
+       since they don't actually are shipped anymore.
+     - VideoLAN-HOWTO is actually licensed under GFDL-1.2
+     - Split the rest of the list into HOWTOs licensed
+       GFDL-1.1 or any later (64), HOWTOs licensed without
+       any specific version information (28), and HOWTOs
+       really licensed under GFDL-1.1 only (4). Declare all
+       but the last group as redistributed under GFDL-1.2.
+  * Update the Replaces of the non-free packages.
+
+ -- Frank Lichtenheld <djpig at debian.org>  Sat, 19 Jan 2008 14:19:02 +0100
+
 doc-linux (2007.12-1) unstable; urgency=low
 
   * new upstream release (20071214)




More information about the Pkg-doc-linux-devel mailing list