This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: PATCH: Place manuals under the GDFL


Mark Mitchell wrote:

> This patch places most of the manuals in the GCC tree under the GDFL,
> as requested by the FSF.  (The GDFL is th GNU Free Documentation
> License.)  From now on, all new manuals should be placed under this
> license.
> 
> I did not do the following manuals:
> 
>   f/*.texi

I did g77.texi - I hope that covers it for GNU Fortran.  The other
f/*.texi files all have sentences in them like

@c For copying conditions, see the file g77.texi.

If this is not sufficient, I need some guidance on how to update _these_
files.

Here's the patch I applied to g77.texi on the branch (after a bootstrap
and install on ix86 Debian 2.2) - I hope someone well versed in
licensing wording could verify that this is indeed what is intended
(TIA):

2001-05-19  Toon Moene  <toon@moene.indiv.nluug.nl>

	* Make-lang.in: Have $(MAKEINFO) look into the parent
	directory for includes.
	* g77.texi: Use the GFDL.

*** Make-lang.in.orig   Mon May 14 18:57:11 2001
--- Make-lang.in        Sat May 19 16:49:13 2001
*************** $(srcdir)/f/g77.info: $(srcdir)/f/g77.te
*** 180,184 ****
        if [ -f lang-f77 ] && [ x$(BUILD_INFO) = xinfo ]; then \
          rm -f $(srcdir)/f/g77.info-*; \
!         cd $(srcdir)/f && $(MAKEINFO) -o g77.info g77.texi; \
        else true; fi
  
--- 180,184 ----
        if [ -f lang-f77 ] && [ x$(BUILD_INFO) = xinfo ]; then \
          rm -f $(srcdir)/f/g77.info-*; \
!         cd $(srcdir)/f && $(MAKEINFO) -I.. -o g77.info g77.texi; \
        else true; fi
  
*** g77.texi.orig       Fri Jan  5 20:12:20 2001
--- g77.texi    Sat May 19 16:50:11 2001
***************
*** 3,8 ****
  @setfilename g77.info
  
! @set last-update 2000-12-21
! @set copyrights-g77 1995,1996,1997,1998,1999,2000
  
  @include root.texi
--- 3,8 ----
  @setfilename g77.info
  
! @set last-update 2001-05-19
! @set copyrights-g77 1995,1996,1997,1998,1999,2000,2001
  
  @include root.texi
*************** Boston, MA 02111-1307 USA
*** 98,127 ****
  Copyright (C) @value{copyrights-g77} Free Software Foundation, Inc.
  
! Permission is granted to make and distribute verbatim copies of
! this manual provided the copyright notice and this permission notice
! are preserved on all copies.
! 
! @ignore
! Permission is granted to process this file through Tex and print the
! results, provided the printed document carries copying permission
! notice identical to this one except for the removal of this paragraph
! (this paragraph not being relevant to the printed manual).
! 
! @end ignore
! Permission is granted to copy and distribute modified versions of this
! manual under the conditions for verbatim copying, provided also that
the
! sections entitled ``GNU General Public License,'' ``Funding for Free
! Software,'' and ``Protect Your Freedom---Fight `Look And Feel'@w{}''
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 ``GNU General Public License,''
! ``Funding for Free Software,'' and ``Protect Your Freedom---Fight
`Look
! And Feel'@w{}'', and this permission notice, may be included in
! translations approved by the Free Software Foundation instead of in
the
! original English.
  @end ifinfo
  
--- 98,119 ----
  Copyright (C) @value{copyrights-g77} Free Software Foundation, Inc.
  
! 
! 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 the
! Invariant Sections being ``GNU General Public License'', the
Front-Cover
! texts being (a) (see below), and with the Back-Cover Texts being (b)
! (see below).  A copy of the license is included in the section
entitled
! ``GNU Free Documentation License''.
! 
! (a) The FSF's Front-Cover Text is:
! 
!      A GNU Manual
! 
! (b) The FSF's Back-Cover Text is:
! 
!      You have freedom to copy and modify this GNU Manual, like GNU
!      software.  Copies published by the Free Software Foundation raise
!      funds for GNU development.
  @end ifinfo
  
*************** Boston, MA 02111-1307, USA@*
*** 164,186 ****
  @c ISBN ???
  @sp 1
! Permission is granted to make and distribute verbatim copies of
! this manual provided 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 ``GNU General Public License,'' ``Funding for Free
! Software,'' and ``Protect Your Freedom---Fight `Look And Feel'@w{}''
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 ``GNU General Public License,''
! ``Funding for Free Software,'' and ``Protect Your Freedom---Fight
`Look
! And Feel'@w{}'', and this permission notice, may be included in
! translations approved by the Free Software Foundation instead of in
the
! original English.
  @end titlepage
  @page
--- 156,176 ----
  @c ISBN ???
  @sp 1
! 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 the
! Invariant Sections being ``GNU General Public License'', the
Front-Cover
! texts being (a) (see below), and with the Back-Cover Texts being (b)
! (see below).  A copy of the license is included in the section
entitled
! ``GNU Free Documentation License''.
! 
! (a) The FSF's Front-Cover Text is:
! 
!      A GNU Manual
! 
! (b) The FSF's Back-Cover Text is:
! 
!      You have freedom to copy and modify this GNU Manual, like GNU
!      software.  Copies published by the Free Software Foundation raise
!      funds for GNU development.
  @end titlepage
  @page
*************** most consistent with the @code{g77} prod
*** 235,238 ****
--- 225,230 ----
  * Copying::         GNU General Public License says
                      how you can copy and share GNU Fortran.
+ * GNU Free Documentation License::
+                   How you can copy and share this manual.
  * Contributors::    People who have contributed to GNU Fortran.
  * Funding::         How to help assure continued work for free
software.
*************** consider it more useful to permit linkin
*** 662,665 ****
--- 654,659 ----
  library.  If this is what you want to do, use the GNU Library General
  Public License instead of this License.
+ 
+ @include fdl.texi
  
  @node Contributors

I will apply the same patch to the trunk, shortly (i.e. after make
bootstrap / make install).

-- 
Toon Moene - mailto:toon@moene.indiv.nluug.nl - phoneto: +31 346 214290
Saturnushof 14, 3738 XG  Maartensdijk, The Netherlands
Maintainer, GNU Fortran 77: http://gcc.gnu.org/onlinedocs/g77_news.html
Join GNU Fortran 95: http://g95.sourceforge.net/ (under construction)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]