Update license for lpr to GPLv3+

diff --git a/AUTHORS b/AUTHORS
index a62bdc52f7021c5a99c4d47f3b4fe08fdd60347e..8f4bc49291a09416cad0a6e056ab584917e1834d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,7 +16,7 @@ Steven Barker  <scbarker@uiuc.edu>
 
 Rick Rankin  <rick_rankin@yahoo.com>
   lpr.c
-  (GPLv2)
+  (GPLv3+)
 
 Joshua Danial Franklin  <joshuadfranklin@yahoo.com>
   mkshortcut.c, mkshortcut.1

diff --git a/ChangeLog b/ChangeLog
index b3fa007942241f390e65ac93678ecc2c86f65c86..cca6fe02a1a679d3c01a4cb9f5f6de8efd29be70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-15  Charles Wilson  <cwilson@...>
+
+       * src/lpr/lpr.cc: Update license to GPLv3+.
+       * src/lpr/Printer.hh: Ditto.
+       * src/lpr/Printer.cc: Ditto.
+       * src/lpr/PrinterException.hh: Ditto.
+       * src/lpr/Win32Utils.hh: Ditto.
+       * src/lpr/Win32Utils.cc: Ditto.
+       * AUTHORS: Update licensing info for lpr.
+       * NEWS: Ditto.
+       * PROGLIST: Ditto.
+       * README: Ditto.
+       * TODO: Ditto.
+
 2010-08-15  Charles Wilson  <cwilson@...>
 
        Devel 1.4.5

diff --git a/NEWS b/NEWS
index bdfc5a7e3a0674afc0c04d8e8fca9e1b6d06a077..3a1ab362d3d2d6f623599fa6916e038f90eb3945 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+1.4.6
+  * Updated license for lpr to GPLv3+ (with permission from
+    Rick Rankin)
+
 1.4.4
   * Fix longstanding bug in mkshortcut, in which failure was
     reported even on success (Andy Koppe).

diff --git a/PROGLIST b/PROGLIST
index 664a218feeb2a5e293e51615fe0a6b7f7dcb441e..d54a1bc6a588575f548b1791315f1c33aa740f23 100644 (file)
--- a/PROGLIST
+++ b/PROGLIST
@@ -66,7 +66,7 @@ realpath.exe
 
 lpr.exe
   can be used to spool to a windows printer
-  (GPLv2)
+  (GPLv3+)
 
 mkshortcut.exe
   can be used to create "full featured" windows 

diff --git a/README b/README
index d4caff7333db123a9acb71fb0335832dbda3d0ad..3b5a9062d3a2a299ccdf0b947bb04562b6e23d22 100644 (file)
--- a/README
+++ b/README
@@ -51,11 +51,13 @@ GPLv3+:
  conv      unix2dos   dos2unix      d2u         u2d
  ipck      msgtool    semstat       semtool     shmtool
 
+ lpr
+
 GPLv2+:
- cygstart  cygdrop    mkshortcut    cygicons.dll
+ cygstart  cygdrop    mkshortcut    cygicons.dll  realpath
 
 GPLv2:
- banner    lpr        readshortcut  realpath
+ banner    readshortcut
 
 PublicDomain-now-GPL:
  <none>

diff --git a/TODO b/TODO
index eabc4d588426e2b78e743b591c20f7ea7f74ef07..9ed77f22900a48ef39e260b5065ed848afbac44e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -16,7 +16,6 @@
 
 * GPLv3 conversion:
   - banner is GPLv2 only. Contact original author.
-  - lpr is GPLv2 only. Contact original author.
   - readshortcut is GPLv2 only. Contact original author.
   - realpath is GPLv2+, but courtesy contact original author
   - cygstart is GPLv2+, but courtesy contact original author

diff --git a/src/lpr/Printer.cc b/src/lpr/Printer.cc
index 5e37fe7bc6e0a54d777241fd4b563e90a0813c47..2dd0b8b63fa0a5c39e0fab503d9ad897534edd07 100644 (file)
--- a/src/lpr/Printer.cc
+++ b/src/lpr/Printer.cc
@@ -4,9 +4,10 @@
  * Copyright (C) 2000-2003 Rick Rankin
  * http://www.cygwin.com/ml/cygwin/2000-07/msg00320.html
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation in version 2 of the License.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * See the COPYING file for full license information.
  */
 
 #include "src/lpr/Printer.hh"

diff --git a/src/lpr/Printer.hh b/src/lpr/Printer.hh
index 3640cc339553f90e49839a1f99376bfe8e896290..28ce9d1534fc072805a7d21baec7ac8d14847641 100644 (file)
--- a/src/lpr/Printer.hh
+++ b/src/lpr/Printer.hh
@@ -4,9 +4,10 @@
  * Copyright (C) 2000-2003 Rick Rankin
  * http://www.cygwin.com/ml/cygwin/2000-07/msg00320.html
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation in version 2 of the License.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * See the COPYING file for full license information.
  */
 
 #if !defined(Printer_hh)

diff --git a/src/lpr/PrinterException.hh b/src/lpr/PrinterException.hh
index 055b54e3a9cbab9822a64e1ca5b88ff14aacf39e..4595665061b908e8038f9aef1fd34da391250bf2 100644 (file)
--- a/src/lpr/PrinterException.hh
+++ b/src/lpr/PrinterException.hh
@@ -4,9 +4,10 @@
  * Copyright (C) 2000-2003 Rick Rankin
  * http://www.cygwin.com/ml/cygwin/2000-07/msg00320.html
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation in version 2 of the License.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * See the COPYING file for full license information.
  */
 
 #if !defined(PrinterException_hh)

diff --git a/src/lpr/Win32Utils.cc b/src/lpr/Win32Utils.cc
index 1c33f00a5a9d4d53363d1e9c0e11251ad6f90879..9c55376f28e76f32beb66b07156dd027b74e1e2e 100644 (file)
--- a/src/lpr/Win32Utils.cc
+++ b/src/lpr/Win32Utils.cc
@@ -4,9 +4,10 @@
  * Copyright (C) 2000-2003 Rick Rankin
  * http://www.cygwin.com/ml/cygwin/2000-07/msg00320.html
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation in version 2 of the License.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * See the COPYING file for full license information.
  */
 
 #include "src/lpr/Win32Utils.hh"

diff --git a/src/lpr/Win32Utils.hh b/src/lpr/Win32Utils.hh
index e1e5a81105efd46ae19c5f63d44ff6779808c898..bb2909703135da4f2b35275155799365de8b32b2 100644 (file)
--- a/src/lpr/Win32Utils.hh
+++ b/src/lpr/Win32Utils.hh
@@ -4,9 +4,10 @@
  * Copyright (C) 2000-2003 Rick Rankin
  * http://www.cygwin.com/ml/cygwin/2000-07/msg00320.html
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation in version 2 of the License.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * See the COPYING file for full license information.
  */
 
 #if !defined(Win32Utils_hh)

diff --git a/src/lpr/lpr.cc b/src/lpr/lpr.cc
index 88c96842e75f02043ea850c210e53556359c9054..ac7e6fb8e588920c4d34dc382867bf42efe6eb47 100644 (file)
--- a/src/lpr/lpr.cc
+++ b/src/lpr/lpr.cc
@@ -4,9 +4,10 @@
  * Copyright (C) 2000-2003 Rick Rankin
  * http://www.cygwin.com/ml/cygwin/2000-07/msg00320.html
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation in version 2 of the License.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * See the COPYING file for full license information.
  */
 
 #if HAVE_CONFIG_H