summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-01-06 06:05:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-01-06 06:05:05 +0000
commitac3810bb690b55a64d1e84f760c749a24c0a4084 (patch)
tree3d81744603332eeb28b3168d18acecab2dbb30c7 /scripts
parent3c5092f65b00e5de825a415990bcda0186e9272f (diff)
downloadtdesdk-ac3810bb690b55a64d1e84f760c749a24c0a4084.tar.gz
tdesdk-ac3810bb690b55a64d1e84f760c749a24c0a4084.zip
Fixed remaining GPL address zip codes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1070598 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'scripts')
-rw-r--r--scripts/fixfsfaddr.sed4
-rwxr-xr-xscripts/licensecheck2
2 files changed, 3 insertions, 3 deletions
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/);