Bump to version 1.22.1

[platform/upstream/busybox.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index 375ad2a..6f50a71 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,44 +1,16 @@
-Original release code (unless otherwise noted)
-Copyright 1995, 1996 Bruce Perens <bruce@pixar.com>
-
-mkswap
-Copyright 1991 Linus Torvalds
-
-tiny-ls(ls)
-Copyright 1996 Brian Candler <B.Candler@pobox.com>
-
-tarcat, loadkmap, various fixes, Debian maintenance
-Copyright 1998 Enrique Zanardi <ezanardi@ull.es>
-
-more(v2), makedevs, dutmp, modularization, auto links file, 
-various fixes, Linux Router Project maintenance
-Copyright 1998 Dave Cinege <dcinege@psychosis.com>     
-
-mini-gzip(gzip), mini-netcat(mnc)
-Copyright 1998 Charles P. Wright <cpwright@villagenet.com>
-
-Tons of new stuff as noted in header files 
-Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen and Erik Andersen
-Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
-
-
-Please feed suggestions, bug reports, insults, and bribes back to:
-       Erik Andersen 
-       <andersen@codepoet.org>
-       <andersee@debian.org>
-
-
-
-Busybox may be used and distributed under the GNU General Public License.
-
----------------------------------------------------------------------------
+--- A note on GPL versions
 
+BusyBox is distributed under version 2 of the General Public License (included
+in its entirety, below).  Version 2 is the only version of this license which
+this version of BusyBox (or modified versions derived from this one) may be
+distributed under.
 
+------------------------------------------------------------------------
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -341,7 +313,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     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
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -374,4 +346,3 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
-