Fixed remaining GPL address zip codes

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1070598 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

14 files changed, 20 insertions, 20 deletions

diff --git a/COPYING b/COPYING
index 40094ae2..5185fd3f 100644
--- a/COPYING
+++ b/COPYING
@@ -8,7 +8,7 @@ by the authors who actually wrote it.
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-               51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+               51 Franklin Street, 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.
 
@@ -311,7 +311,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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/cervisia/COPYING b/cervisia/COPYING
index a78b29be..0b84a43f 100644
--- a/cervisia/COPYING
+++ b/cervisia/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-               51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+               51 Franklin Street, 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.
 
diff --git a/kapptemplate/appframework/no-exe/COPYING b/kapptemplate/appframework/no-exe/COPYING
index a78b29be..0b84a43f 100644
--- a/kapptemplate/appframework/no-exe/COPYING
+++ b/kapptemplate/appframework/no-exe/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-               51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+               51 Franklin Street, 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.
 
diff --git a/kbabel/common/libgettext/pofiles.ll b/kbabel/common/libgettext/pofiles.ll
index 6b07f852..2c9082ad 100644
--- a/kbabel/common/libgettext/pofiles.ll
+++ b/kbabel/common/libgettext/pofiles.ll
@@ -16,7 +16,7 @@
 
   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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp
index b11935b6..be6ca67e 100644
--- a/kbabel/kbabeldict/main.cpp
+++ b/kbabel/kbabeldict/main.cpp
@@ -19,7 +19,7 @@
   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., 51 Franklin Street, Fifth Floor, Boston,
-  MA  02111-1307, USA.
+  MA  02110-1301, USA.
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
diff --git a/kbugbuster/COPYING b/kbugbuster/COPYING
index 49dc0471..37ba36f1 100644
--- a/kbugbuster/COPYING
+++ b/kbugbuster/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-               51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+               51 Franklin Street, 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.
 
@@ -305,7 +305,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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/kcachegrind/COPYING b/kcachegrind/COPYING
index 60d3c876..c13faf0d 100644
--- a/kcachegrind/COPYING
+++ b/kcachegrind/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+                       51 Franklin Street, 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.
 
@@ -305,7 +305,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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/kioslave/svn/COPYING b/kioslave/svn/COPYING
index d3fcb723..38db8225 100644
--- a/kioslave/svn/COPYING
+++ b/kioslave/svn/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
-    		    51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+    		    51 Franklin Street, 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.
 
@@ -464,7 +464,7 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/kompare/COPYING b/kompare/COPYING
index 49dc0471..37ba36f1 100644
--- a/kompare/COPYING
+++ b/kompare/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-               51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+               51 Franklin Street, 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.
 
@@ -305,7 +305,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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/kunittest/dcopinterface.h b/kunittest/dcopinterface.h
index 5378e4ef..e18c0d5a 100644
--- a/kunittest/dcopinterface.h
+++ b/kunittest/dcopinterface.h
@@ -15,7 +15,7 @@
  *   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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 #ifndef KUNITTEST_DCOPINTERFACE_H
 #define KUNITTEST_DCOPINTERFACE_H
diff --git a/scripts/fixfsfaddr.sed b/scripts/fixfsfaddr.sed
index 4525fe62..62d0cae9 100644
--- a/scripts/fixfsfaddr.sed
+++ b/scripts/fixfsfaddr.sed
@@ -13,12 +13,12 @@
 
 # Current FSF address: 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
 
-# Old address: 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307
+# Old address: 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
 s/59 Temple Place,/51 Franklin Street,/
 s/59 Temple Place -/51 Franklin Street,/
 s/Suite 330,/Fifth Floor,/
 s/Suite 330$/Fifth Floor/
-s/02111-1307/02110-1301/
+s/02110-1301/02110-1301/
 
 # Very old address: 675 Mass Ave, Cambridge, MA  02139
 s/675 Mass Ave/51 Franklin Street, Fifth Floor/
diff --git a/scripts/licensecheck b/scripts/licensecheck
index 1640d9f5..85524d19 100755
--- a/scripts/licensecheck
+++ b/scripts/licensecheck
@@ -23,7 +23,7 @@ sub checklicense($)
    $gl = " (v2.1)" if ($text =~ /version 2\.1 as published by the Free Software Foundation/);
    $gl = " (v2.1+)" if ($text =~ /either version 2\.1 of the License, or .at your option. any later version/);
    $qte = " (+Qt exception)" if ($text =~ /([Pp]ermission is given|[pP]ermission is also granted|[pP]ermission) to link (the code of )?this program with (any edition of )?(Qt|the Qt library)/);
-   $massave = " (wrong address)" if ($text =~ /(?:675 Mass Ave|59 Temple Place|51 Franklin Steet|02139|02111-1307)/i); # "51 Franklin Street, 02110-1301" is the right FSF address
+   $massave = " (wrong address)" if ($text =~ /(?:675 Mass Ave|59 Temple Place|51 Franklin Steet|02139|02110-1301)/i); # "51 Franklin Street, 02110-1301" is the right FSF address
 
    $license="GENERATED FILE" if ($text =~ /(All changes made in this file will be lost|DO NOT EDIT|DO NOT delete this file|[Gg]enerated by)/);
    $license="LGPL$gl$massave $license" if ($text =~ /is free software.? you can redistribute it and.?or modify it under the terms of the GNU (Library|Lesser) General Public License/);
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
index ab74a992..8831e6f3 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
index dc071ad8..225c3ab0 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */