clarify gplv2+ status, per authors

git-svn-id: svn://tug.org/texlive/trunk@13744 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 24 insertions, 21 deletions

diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog
index 3085cbdf413..b391a2168fa 100644
--- a/Build/source/texk/dvi2tty/ChangeLog
+++ b/Build/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-15  Karl Berry  <karl@tug.org>
+
+	* dvi2tty.c,
+	* README: clarify that it's GPLv2+, per
+	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=424018.
+	(I do not agree that the VMS folks contributed under the nonfree
+	license.)
+
 2009-06-12  Francois Charette  <firmicus@ankabut.net>
 
 	* dvistuff.c: rename getline to texlive_getline.
diff --git a/Build/source/texk/dvi2tty/README b/Build/source/texk/dvi2tty/README
index 9c66e197190..991e82e71e9 100644
--- a/Build/source/texk/dvi2tty/README
+++ b/Build/source/texk/dvi2tty/README
@@ -3,7 +3,7 @@
 
 dvi2tty is intended for previewing dvi-files on text-only
 devices (terminals and lineprinters).
-The program is basicly an improved C version of the pascal
+The program is basically an improved C version of the pascal
 program written by Svante Lindahl (see README.ORG).
 I translated it because I could not find a pascal compiler 
 on our machine that could compile it.
@@ -49,5 +49,5 @@ Thats all, good luck.
 | Marcel J.E. Mol                       | They hate you if your're clever
 | Delft University of Technology        | And they despise the fool
 | The Netherlands                       | Till you're so fucking crazy
-| UUCP: marcel@duteca.tudelft.nl        | You can't follow the rules.
+| UUCP: marcel (at) mesa dot nl         | You can't follow the rules.
 -----------------------------------------			 - Lennon
diff --git a/Build/source/texk/dvi2tty/README.ORG b/Build/source/texk/dvi2tty/README.ORG
index 3eeefc4684c..9f8b337b16a 100644
--- a/Build/source/texk/dvi2tty/README.ORG
+++ b/Build/source/texk/dvi2tty/README.ORG
@@ -16,11 +16,8 @@ Before compiling and installing inspect the  "compile-time cust-
 omization constants" and change them to suit your site.
 These constants configure default pager and a little more.
 
-Please report complaints, suggestions, bugs and/or fixes to:
-
+Please report complaints, suggestions, bugs and/or fixes to
+tex-k@tug.org, since this is a modified version of the original, written
+by
 Svante Lindahl, NADA, KTH            Numerical Analysis & Computer Science 
-UUCP: {seismo,mcvax}!enea!ttds!zap   Royal Institute of Technology, Sweden
-ARPA: enea!ttds!zap@seismo.CSS.GOV   EAN: zap@cs.kth.sunet
-
-The TOPS-20 version of the program can also be obtained from the above
-address.
+                                     Royal Institute of Technology, Sweden
diff --git a/Build/source/texk/dvi2tty/dvi2tty.c b/Build/source/texk/dvi2tty/dvi2tty.c
index bbabbff30b1..01094c1b8fc 100644
--- a/Build/source/texk/dvi2tty/dvi2tty.c
+++ b/Build/source/texk/dvi2tty/dvi2tty.c
@@ -1,4 +1,14 @@
 /******************************************************************************
+ * dvitty - get an ascii representation of a dvi-file, suitable for ttys
+ 
+This program was originally written in Pascal by 
+Svante Lindahl <svante dot lindahl (at) pantor dot com>
+and then converted to C by Marcel Mol <marcel (at) mesa dot nl>.
+Some changes have been made for TeX Live (see ./ChangeLog).
+
+It is released under the GNU GPL, version 2 or any later version.
+(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=424018)
+
  * Marcel Mol: 1990-03-27  (UUCP: marcel@duteca.tudelft.nl)
  *               Fixed bug that causes the program to hang when it finds a
  *               fontname with an 's' in it not followed by an 'y'.
@@ -83,18 +93,6 @@
  * VERA::<SVANTE-LINDAHL.DVITTY>DVITTY.PAS.45, 29-Sep-84 18:29:53,
  *  Edit: Svante Lindahl
  *
- * dvitty - get an ascii representation of a dvi-file, suitable for ttys
- *
- * This program, and any documentation for it, is copyrighted by Svante
- * Lindahl. It may be copied for non-commercial use only, provided that
- * any and all copyright notices are preserved.
- *
- * Please report any bugs and/or fixes to:
- *
- * UUCP: {seismo,mcvax,cernvax,diku,ukc,unido}!enea!ttds!zap
- * ARPA: enea!ttds!zap@seismo.CSS.GOV
- *  or   Svante_Lindahl_NADA%QZCOM.MAILNET@MIT-MULTICS.ARPA
- * EAN:  zap@cs.kth.sunet
  */