diff --git a/intl/ChangeLog b/intl/ChangeLog
index e3efd1fb4a809a2485dbb95508f278831474c30f..8ccdb81c5993bd6beb92930da78e06ab6c8a8e4a 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,16 @@
+2005-05-13 Nick Clifton <nickc@redhat.com>
+
+ * Update the address and phone number of the FSF organization in
+ the GPL notices in the following files:
+ Makefile.in, bindtextdom.c, dcgettext.c, dcigettext.c,
+ dcngettext.c, dgettext.c, dngettext.c, eval-plural.h,
+ explodename.c, finddomain.c, gettext.c, gettextP.h, gmo.h,
+ hash-string.h, intl-compat.c, l10nflist.c, libgnuintl.h,
+ loadinfo.h, loadmsgcat.c, localcharset.c, localcharset.h,
+ locale.alias, localealias.c, localename.c, log.c, ngettext.c,
+ osdep.c, plural-exp.c, plural-exp.h, plural.c, plural.y,
+ relocatable.c, relocatable.h, textdomain.c
+
2004-11-24 Kelley Cook <kcook@gcc.gnu.org>
* aclocal.m4: Regenerate.
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 7c4723d34616814124df4eb7d8ef89b5cb5cbbcd..77dc1542f4bea4c4ddad650e710d2110ec45e058 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU Library 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,
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
# USA.
# This Makefile has been modified from the original shipped with
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 250f5e863b19491cd558804c19fa0e41a5d381ba..6faac5756a3199e4c123f07a935f95e66328c3f3 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index ca6a1c82d460cefeb1a8c4cc68ecb28b0af14531..338fd7c615f11bf260410d9a2c9b0c9a3e63d091 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index f6edb95c005996f72716d29a35fa3918752c49f5..a8d4a14d273b153b117b507ec76356635ccd876e 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
index 3a3404e2cc244af4047791d50b207816e8f8315d..d2fb0f9a9961ea51443e00a8475bea8ea869d0b6 100644
--- a/intl/dcngettext.c
+++ b/intl/dcngettext.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/intl/dgettext.c b/intl/dgettext.c
index cf5b4037f07c6f9346c0809c53e1cdfb2cfb1f21..1b6ce038820d4864d7975b24dffdfb020496591e 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/intl/dngettext.c b/intl/dngettext.c
index 67fd030f255fc9efc322b5e3db5c050cab46b180..2c304e8dd0ad124d7f995a99903b19dde57dd924 100644
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/intl/eval-plural.h b/intl/eval-plural.h
index 19c7ca6aee34c79295dab941b0471acaf64d254e..5bf1dd1616268cc79c9f88e845e04f8a2ae3fc58 100644
--- a/intl/eval-plural.h
+++ b/intl/eval-plural.h
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef STATIC
diff --git a/intl/explodename.c b/intl/explodename.c
index 2985064c924952a07d171e26f27ad159da6d4867..c577c54f529646f08d2547802bb3c60fd44fae19 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/intl/finddomain.c b/intl/finddomain.c
index d24276442cb19c0038fe48b224744da953abe7de..e12a638d5c302b3cdce0a721bafc55475da5decb 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/intl/gettext.c b/intl/gettext.c
index 43d689f55201f34c77b863c30f0717fe7fdc106b..57130f40a122c76c40c2ecd39e3c9e62819cc33b 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/intl/gettextP.h b/intl/gettextP.h
index 82135aa0f42ea7502afac89d59638e2d9093c326..3ff2dd77a694457ea09e4b8554c33e234fce7c70 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef _GETTEXTP_H
diff --git a/intl/gmo.h b/intl/gmo.h
index d1fe4d6b8fd4a23eac6a13b8cd6114629d7c1ffe..ccebb3aa6ad1ee5560eba68509b0490b58a82198 100644
--- a/intl/gmo.h
+++ b/intl/gmo.h
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef _GETTEXT_H
diff --git a/intl/hash-string.h b/intl/hash-string.h
index b267a87788f1c7eec5d8d3068577c264eeec429e..6eab80f96e352f9277ca54bf850f5e7e11232f34 100644
--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
/* @@ end of prolog @@ */
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
index 36b7af0f83ba45a509229861895232cde048426d..71a621a32beea78b5e3e247c092fe5228311a443 100644
--- a/intl/intl-compat.c
+++ b/intl/intl-compat.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index ec8713f8ecf2e3ad135c6cb5da4585cda99247b7..e858a991aa23e3fb181e7fd083ffdf19018824a2 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
/* Tell glibc's <string.h> to provide a prototype for stpcpy().
diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
index f596cfcb2c66564c53e8f94e43bb4af93816668c..f6138affb5918fa9ab980b7bcf58ed22c3a41f13 100644
--- a/intl/libgnuintl.h
+++ b/intl/libgnuintl.h
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef _LIBINTL_H
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 1d3ba6162499a63f69bc3089727a2fdd4aa586ae..5ad5fba76bd0dea1b05d2b93aa788de56b6678de 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef _LOADINFO_H
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 8509bd34587e46cf8187c146c770b1e804bb2a6e..536ee12621da0d84116daec94d41ae5d2344fc06 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/localcharset.c b/intl/localcharset.c
index d04d05368f96b53fa19b61ea254dee638920a69c..8ece6e39f69abf76922deb68bcbbce1331600c13 100644
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
/* Written by Bruno Haible <bruno@clisp.org>. */
diff --git a/intl/localcharset.h b/intl/localcharset.h
index 3b137e73c552c9b1f37d33b379ee34dc586eaa01..47b21a0a93f1bee8c10da32342935adf7f355f07 100644
--- a/intl/localcharset.h
+++ b/intl/localcharset.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef _LOCALCHARSET_H
diff --git a/intl/locale.alias b/intl/locale.alias
index bd7b9b31eb31edc971d28f1abc295ced77ad7210..0f15635d98cead6139f4a6df380b4aaf2895255d 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU Library 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,
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
# USA.
# The format of this file is the same as for the corresponding file of
diff --git a/intl/localealias.c b/intl/localealias.c
index 7c4ce58f2a67ee15e50113a77d1a68dc6452b4c1..5af5b5b6af33e9d13da6a68691a0f19300d1fc50 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
diff --git a/intl/localename.c b/intl/localename.c
index faacecd507a03d5703a1be629625067cbdcc6a15..28c4ca7aab6ea3304b774ef4911ac0548603bc26 100644
--- a/intl/localename.c
+++ b/intl/localename.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
/* Written by Ulrich Drepper <drepper@gnu.org>, 1995. */
diff --git a/intl/log.c b/intl/log.c
index 9c84791b9d7f0709fd93c4293ed63f643023100a..2ce2d02c5862cbd583a51e173717f91fcf37e30e 100644
--- a/intl/log.c
+++ b/intl/log.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
/* Written by Bruno Haible <bruno@clisp.org>. */
diff --git a/intl/ngettext.c b/intl/ngettext.c
index 17a27f4aa138d1d1b65fbef9c4f4c46c9844a421..4a3186c03b518860860a528b708fdc6494425256 100644
--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/intl/osdep.c b/intl/osdep.c
index b3725983818d3df65a2e20d4ce82e9041492bea4..83a96a73e0389cd50d8e4d8d82a9e2ea455c7afa 100644
--- a/intl/osdep.c
+++ b/intl/osdep.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#if defined __EMX__
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
index c937c011ac5d1e611cd1ebc2c1fe64f3081d9dca..be96173e4d6eac31fe733905213b6ef77859a99d 100644
--- a/intl/plural-exp.c
+++ b/intl/plural-exp.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H
diff --git a/intl/plural-exp.h b/intl/plural-exp.h
index 9e5d1658344adb8df09b4f8ef84c9cdc742a6531..cedc0db68824222607499c8df0069f122d405ac5 100644
--- a/intl/plural-exp.h
+++ b/intl/plural-exp.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef _PLURAL_EXP_H
diff --git a/intl/plural.c b/intl/plural.c
index 3a4fa20cae94ad2fba00dcf4686a55b67a6c4f5d..951303a16f5ee0f5418c64023ed2b430a5bb71cd 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -34,7 +34,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
/* The bison generated parser uses alloca. AIX 3 forces us to put this
@@ -339,8 +339,8 @@ static const short yycheck[] =
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 Street - Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
diff --git a/intl/plural.y b/intl/plural.y
index 616b7c11a21f103aef63e6bb86313afac4ceb0f2..3f75cf3dbbe4a1195a4c7437f4a68e5d708608d8 100644
--- a/intl/plural.y
+++ b/intl/plural.y
@@ -15,7 +15,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
/* The bison generated parser uses alloca. AIX 3 forces us to put this
diff --git a/intl/relocatable.c b/intl/relocatable.c
index 16f79a528f0c6aac25308b2b045d9e5611207906..e131a30a94ce9c6c7d93e2c098ddc81136594b22 100644
--- a/intl/relocatable.c
+++ b/intl/relocatable.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
diff --git a/intl/relocatable.h b/intl/relocatable.h
index d141200a64235d6820be3406436f839632e775c8..5ac0b0445fa54c3c7b80c6588ade6d727d21792e 100644
--- a/intl/relocatable.h
+++ b/intl/relocatable.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef _RELOCATABLE_H
diff --git a/intl/textdomain.c b/intl/textdomain.c
index f259c696d945cd711b016df916247fc2262df4c4..a06d129f31fd53672235c5915e2f6e47f2fd5197 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Library 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,
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifdef HAVE_CONFIG_H