metasearch: fix fsf address

jef-n · jef-n · commit 9bbefeff003f · 2014-06-29T20:53:00.000+02:00
diff --git a/ms-windows/Installer-Files/LICENSE.txt b/ms-windows/Installer-Files/LICENSE.txt
@@ -11,9 +11,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     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
+    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 02110-1301 USA.
 
    In addition, as a special exception, the QGIS Development Team gives
    permission to link the code of this program with the Qt library,
diff --git a/python/plugins/MetaSearch/__init__.py b/python/plugins/MetaSearch/__init__.py
@@ -17,10 +17,9 @@
 # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
 # details.
 #
-# A copy of the GNU General Public License is available on the World Wide Web
-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
+# 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 02110-1301 USA.
 #
 ###############################################################################
 
diff --git a/python/plugins/MetaSearch/dialogs/__init__.py b/python/plugins/MetaSearch/dialogs/__init__.py
@@ -13,9 +13,8 @@
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
-# A copy of the GNU General Public License is available on the World Wide Web
-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
+# 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 02110-1301 USA.
 #
 ###############################################################################
diff --git a/python/plugins/MetaSearch/dialogs/maindialog.py b/python/plugins/MetaSearch/dialogs/maindialog.py
@@ -21,10 +21,9 @@
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
-# A copy of the GNU General Public License is available on the World Wide Web
-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
+# 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 02110-1301 USA.
 #
 ###############################################################################
 
diff --git a/python/plugins/MetaSearch/dialogs/manageconnectionsdialog.py b/python/plugins/MetaSearch/dialogs/manageconnectionsdialog.py
@@ -21,10 +21,9 @@
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
-# A copy of the GNU General Public License is available on the World Wide Web
-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
+# 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 02110-1301 USA.
 #
 ###############################################################################
 
diff --git a/python/plugins/MetaSearch/dialogs/newconnectiondialog.py b/python/plugins/MetaSearch/dialogs/newconnectiondialog.py
@@ -21,10 +21,9 @@
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
-# A copy of the GNU General Public License is available on the World Wide Web
-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
+# 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 02110-1301 USA.
 #
 ###############################################################################
 
diff --git a/python/plugins/MetaSearch/dialogs/recorddialog.py b/python/plugins/MetaSearch/dialogs/recorddialog.py
@@ -21,10 +21,9 @@
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
-# A copy of the GNU General Public License is available on the World Wide Web
-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
+# 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 02110-1301 USA.
 #
 ###############################################################################
 
diff --git a/python/plugins/MetaSearch/dialogs/xmldialog.py b/python/plugins/MetaSearch/dialogs/xmldialog.py
@@ -17,10 +17,9 @@
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
-# A copy of the GNU General Public License is available on the World Wide Web
-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
+# 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 02110-1301 USA.
 #
 ###############################################################################
 
diff --git a/python/plugins/MetaSearch/plugin.py b/python/plugins/MetaSearch/plugin.py
@@ -17,10 +17,9 @@
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
-# A copy of the GNU General Public License is available on the World Wide Web
-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
+# 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 02110-1301 USA.
 #
 ###############################################################################
 
diff --git a/python/plugins/MetaSearch/ui/__init__.py b/python/plugins/MetaSearch/ui/__init__.py
@@ -13,9 +13,8 @@
 # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
 # details.
 #
-# A copy of the GNU General Public License is available on the World Wide Web
-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
+# 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 02110-1301 USA.
 #
 ###############################################################################
diff --git a/python/plugins/MetaSearch/util.py b/python/plugins/MetaSearch/util.py
@@ -18,10 +18,9 @@
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
-# A copy of the GNU General Public License is available on the World Wide Web
-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
+# 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 02110-1301 USA.
 #
 ###############################################################################
 

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,9 @@`
`17`	`17`	`# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more`
`18`	`18`	`# details.`
`19`	`19`	`#`
`20`		`-# A copy of the GNU General Public License is available on the World Wide Web`
`21`		`-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing`
`22`		`-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,`
`23`		`-# MA 02111-1307, USA.`
	`20`	`+# You should have received a copy of the GNU General Public License along`
	`21`	`+# with this program; if not, write to the Free Software Foundation, Inc.,`
	`22`	`+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.`
`24`	`23`	`#`
`25`	`24`	`###############################################################################`
`26`	`25`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,8 @@`
`13`	`13`	`# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more`
`14`	`14`	`# details.`
`15`	`15`	`#`
`16`		`-# A copy of the GNU General Public License is available on the World Wide Web`
`17`		`-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing`
`18`		`-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,`
`19`		`-# MA 02111-1307, USA.`
	`16`	`+# You should have received a copy of the GNU General Public License along`
	`17`	`+# with this program; if not, write to the Free Software Foundation, Inc.,`
	`18`	`+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.`
`20`	`19`	`#`
`21`	`20`	`###############################################################################`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,9 @@`
`21`	`21`	`# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more`
`22`	`22`	`# details.`
`23`	`23`	`#`
`24`		`-# A copy of the GNU General Public License is available on the World Wide Web`
`25`		`-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing`
`26`		`-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,`
`27`		`-# MA 02111-1307, USA.`
	`24`	`+# You should have received a copy of the GNU General Public License along`
	`25`	`+# with this program; if not, write to the Free Software Foundation, Inc.,`
	`26`	`+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.`
`28`	`27`	`#`
`29`	`28`	`###############################################################################`
`30`	`29`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,9 @@`
`18`	`18`	`# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more`
`19`	`19`	`# details.`
`20`	`20`	`#`
`21`		`-# A copy of the GNU General Public License is available on the World Wide Web`
`22`		`-# at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing`
`23`		`-# to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,`
`24`		`-# MA 02111-1307, USA.`
	`21`	`+# You should have received a copy of the GNU General Public License along`
	`22`	`+# with this program; if not, write to the Free Software Foundation, Inc.,`
	`23`	`+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.`
`25`	`24`	`#`
`26`	`25`	`###############################################################################`
`27`	`26`