e2fsprogs: fix Free Software Foundation address

This is mostly automatic replace of Free Software Foundation address in all our files with the correct address that can be found at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt Signed-off-by: Lukas Czerner <lczerner@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2024-11-26 19:43:41 +08:00 · 2018-04-10 14:09:33 +02:00 · 2018-04-10 14:09:33 +02:00 · 8785aaead7
commit 8785aaead7
parent d3f01729bf
59 changed files with 65 additions and 65 deletions
--- a/8
+++ b/8
@ -27,7 +27,7 @@ package are flexible, if you give me enough lead time.
 		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, 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.

@ -330,7 +330,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 Street, Fifth Floor, Boston, MA 02110-1301  USA


 Also add information on how to contact you by electronic and paper mail.
@ -370,7 +370,7 @@ Public License instead of this License.
 		       Version 2, June 1991

 Copyright (C) 1991 Free Software Foundation, Inc.
-    		    59 Temple Place, Suite 330, 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.

@ -832,7 +832,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., 59 Temple Place, Suite 330, 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.

--- a/aclocal.m4
+++ b/aclocal.m4
@ -2874,7 +2874,7 @@ AC_DEFUN([AM_NLS],
 #
 # 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 to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
--- a/contrib/fallocate.c
+++ b/contrib/fallocate.c
@ -18,7 +18,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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */

 #ifndef _LARGEFILE_SOURCE
--- a/include/nonunix/getopt.h
+++ b/include/nonunix/getopt.h
@ -14,8 +14,8 @@

   You should have received a copy of the GNU Library General Public
   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street,
+   Fifth Floor, Boston, MA 02110-1301, USA. */

 #ifndef _GETOPT_H
 #define _GETOPT_H 1
--- 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.

 PACKAGE = @PACKAGE@
--- 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
--- a/intl/config.charset
+++ b/intl/config.charset
@ -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 table consists of lines of the form
--- 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
--- 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().
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 @@ */
--- 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
--- 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().
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@ -13,7 +13,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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

 /* Because on some systems (e.g. Solaris) we sometimes have to include
   the systems libintl.h as well as this file we have more complex
--- a/intl/libgnuintl.h.in
+++ b/intl/libgnuintl.h.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.  */

 #ifndef _LIBINTL_H
--- 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
--- 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().
--- 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>.  */
--- 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
--- 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
--- 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().
--- 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.  */
--- 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>.  */
--- 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
--- a/intl/os2compat.c
+++ b/intl/os2compat.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.  */

 #define OS2_AWARE
--- a/intl/os2compat.h
+++ b/intl/os2compat.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.  */

 /* When included from os2compat.h we need all the original definitions */
--- 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__
--- 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
--- 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
--- 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
@ -315,8 +315,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.
--- 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
--- a/intl/printf-args.c
+++ b/intl/printf-args.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
--- a/intl/printf-args.h
+++ b/intl/printf-args.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 _PRINTF_ARGS_H
--- a/intl/printf-parse.c
+++ b/intl/printf-parse.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
--- a/intl/printf-parse.h
+++ b/intl/printf-parse.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 _PRINTF_PARSE_H
--- a/intl/printf.c
+++ b/intl/printf.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
--- a/intl/ref-add.sin
+++ b/intl/ref-add.sin
@ -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 <haible@clisp.cons.org>.
--- a/intl/ref-del.sin
+++ b/intl/ref-del.sin
@ -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 <haible@clisp.cons.org>.
--- 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.  */


--- 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
--- 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
--- a/intl/vasnprintf.c
+++ b/intl/vasnprintf.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 <stdio.h> to provide a prototype for snprintf().
--- a/intl/vasnprintf.h
+++ b/intl/vasnprintf.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 _VASNPRINTF_H
--- a/intl/vasnwprintf.h
+++ b/intl/vasnwprintf.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 _VASNWPRINTF_H
--- a/intl/wprintf-parse.h
+++ b/intl/wprintf-parse.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 _WPRINTF_PARSE_H
--- a/intl/xsize.h
+++ b/intl/xsize.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 _XSIZE_H
--- a/lib/ext2fs/rbtree.c
+++ b/lib/ext2fs/rbtree.c
@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA

  linux/lib/rbtree.c
 */
--- a/lib/ext2fs/rbtree.h
+++ b/lib/ext2fs/rbtree.h
@ -14,7 +14,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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA

  linux/include/linux/rbtree.h

--- a/lib/ext2fs/tdb.c
+++ b/lib/ext2fs/tdb.c
@ -26,7 +26,7 @@ Last Changed Date: 2007-06-22 13:36:10 -0400 (Fri, 22 Jun 2007)

   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */

 #ifdef CONFIG_STAND_ALONE
--- a/lib/ext2fs/tdb.h
+++ b/lib/ext2fs/tdb.h
@ -24,7 +24,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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */

 #ifdef  __cplusplus
--- a/lib/ext2fs/tdb/patches/replace-includes
+++ b/lib/ext2fs/tdb/patches/replace-includes
@ -3,7 +3,7 @@ Index: tdb/tdb.c
 --- tdb.orig/tdb.c
 +++ tdb/tdb.c
@@ -29,11 +29,82 @@ Last Changed Date: 2007-06-22 13:36:10 -
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
 -#include "replace.h"