tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Put the examples in the manual under GPL.

This commit is contained in:
Carsten Dominik 2008-06-16 17:05:31 +02:00
parent be026ff5ad
commit 69673b3c1f
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -29,6 +29,7 @@ org-install.el
org-*.tar.gz org-*.tar.gz
org-*.zip org-*.zip
manual manual
org_dual_license.texi
# aspell word and replacement lists # aspell word and replacement lists

1
Makefile
View File

@ -218,6 +218,7 @@ release:
@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
make distfile make distfile
make doc make doc
UTILITIES/gplmanual.pl
make html_manual make html_manual
rm -rf RELEASEDIR rm -rf RELEASEDIR
$(MKDIR) RELEASEDIR $(MKDIR) RELEASEDIR

21
UTILITIES/gplmanual.pl Executable file
View File

@ -0,0 +1,21 @@
#!/usr/bin/perl
# This command creates a version of the manual to is both GFDL and GPL
# To allow DEBIAN to include the manual in its main section.
$gpl =
'
Permission is also granted to copy, distribute and/or modify this document
under the terms of the GNU General Public License (GPL).
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see @url{http://www.gnu.org/licenses/}.
';
open IN, "<doc/org.texi" or die "Cannot open doc/org.texi\n";
open OUT, ">doc/org_dual_license.texi" or die "Cannot open doc/org.texi\n";
while (<IN>) {
print OUT $gpl if /end quotation/;
print OUT $_;
}

13
doc/org.texi
View File

@ -42,13 +42,20 @@ Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or under the terms of the GNU Free Documentation License, Version 1.1 or
any later version published by the Free Software Foundation; with no any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. You should have received a and with the Back-Cover Texts as in (a) below. You should have received
copy of the ``GNU Free Documentation License'' with GNU Emacs. If not, see a copy of the ``GNU Free Documentation License'' with GNU Emacs. If
@url{http://www.gnu.org/licenses/}. not, see @url{http://www.gnu.org/licenses/}.
(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify (a) 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 this GNU Manual, like GNU software. Copies published by the Free
Software Foundation raise funds for GNU development.'' Software Foundation raise funds for GNU development.''
You have permission to copy, distribute and/or modify all code examples
in this manual under the terms of the GNU General Public License,
Version 2 or any later version published by the Free Software
Foundation. You should have received a copy of the GNU General Public
License along with GNU Emacs. If not, see
@url{http://www.gnu.org/licenses/}.
@end quotation @end quotation
@end copying @end copying