aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac6
-rw-r--r--doc/Makefile.am7
-rw-r--r--doc/cpio.texi4
-rwxr-xr-xdoc/gendocs_template2
-rw-r--r--headers/Makefile.am7
-rw-r--r--headers/fnmatch.h8
-rw-r--r--lib/Makefile.tmpl4
-rw-r--r--lib/mkdir.c7
-rw-r--r--lib/strdup.c7
-rw-r--r--lib/strerror.c7
-rw-r--r--src/Makefile.am7
-rw-r--r--src/copyin.c7
-rw-r--r--src/copyout.c7
-rw-r--r--src/copypass.c7
-rw-r--r--src/cpio.h7
-rw-r--r--src/cpiohdr.h7
-rw-r--r--src/defer.c7
-rw-r--r--src/defer.h7
-rw-r--r--src/dstring.c7
-rw-r--r--src/dstring.h7
-rw-r--r--src/extern.h7
-rw-r--r--src/filemode.c7
-rw-r--r--src/filetypes.h7
-rw-r--r--src/global.c7
-rw-r--r--src/idcache.c7
-rw-r--r--src/main.c11
-rw-r--r--src/makepath.c7
-rw-r--r--src/mt.c5
-rw-r--r--src/tar.c7
-rw-r--r--src/tar.h8
-rw-r--r--src/tarhdr.h7
-rw-r--r--src/userspec.c7
-rw-r--r--src/util.c7
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/inout.at6
-rw-r--r--tests/testsuite.at4
-rw-r--r--tests/version.at6
39 files changed, 152 insertions, 111 deletions
diff --git a/ChangeLog b/ChangeLog
index 00b2df3..8119a74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2005-05-19 Sergey Poznyakoff <gray@Mirddin.farlep.net>
+ * Makefile.am, configure.ac, doc/Makefile.am,
+ doc/cpio.texi, doc/gendocs_template, headers/Makefile.am,
+ headers/fnmatch.h, lib/Makefile.tmpl, lib/mkdir.c,
+ lib/strdup.c, lib/strerror.c, src/Makefile.am,
+ src/copyin.c, src/copyout.c, src/copypass.c, src/cpio.h,
+ src/cpiohdr.h, src/defer.c, src/defer.h, src/dstring.c,
+ src/dstring.h, src/extern.h, src/filemode.c,
+ src/filetypes.h, src/global.c, src/idcache.c,
+ src/main.c, src/makepath.c, src/mt.c, src/tar.c,
+ src/tar.h, src/tarhdr.h, src/userspec.c, src/util.c,
+ tests/Makefile.am, tests/inout.at, tests/testsuite.at,
+ tests/version.at: Updated FSF postal mail address.
+
* bootstrap: Port recent changes from tar bootstrap.
* gnulib.modules: New file
* tests/Makefile.am (genfile_SOURCES,LDADD): Updated
diff --git a/Makefile.am b/Makefile.am
index e8f90cb..3edf5c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,10 @@
# 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.
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 6f3f52b..9de53b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,9 +12,9 @@ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
dnl
-dnl You should have received a copy of the GNU General Public License along
-dnl with this program; if not, write to the Free Software Foundation, Inc.,
-dnl 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software Foundation,
+dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
AC_INIT([GNU cpio], [2.6], [bug-cpio@gnu.org], [cpio])
AC_CONFIG_SRCDIR(src/cpio.h)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d8629cc..e0bfee8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -11,9 +11,10 @@
# 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.
info_TEXINFOS = cpio.texi
man_MANS = cpio.1 mt.1
diff --git a/doc/cpio.texi b/doc/cpio.texi
index 993d25c..90f8634 100644
--- a/doc/cpio.texi
+++ b/doc/cpio.texi
@@ -41,8 +41,8 @@ Software Foundation raise funds for GNU development.''
@insertcopying
@sp 2
Published by the Free Software Foundation @*
-59 Temple Place - Suite 330, @*
-Boston, MA 02111-1307, USA @*
+51 Franklin Street, Fifth Floor, @*
+Boston, MA 02110-1301, USA @*
@end titlepage
@node Top, Introduction, (dir), (dir)
diff --git a/doc/gendocs_template b/doc/gendocs_template
index 036bd0c..894cc18 100755
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -90,7 +90,7 @@ Please send broken links and other corrections (or suggestions) to
<p>
Copyright (C) 2004 Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111, USA
+51 Franklin Street, Fifth Floor, Boston, MA 02111, USA
<br />
Verbatim copying and distribution of this entire article is
permitted in any medium, provided this notice is preserved.
diff --git a/headers/Makefile.am b/headers/Makefile.am
index d2b31c0..5ff1df1 100644
--- a/headers/Makefile.am
+++ b/headers/Makefile.am
@@ -11,8 +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.
EXTRA_DIST=fnmatch.h
diff --git a/headers/fnmatch.h b/headers/fnmatch.h
index 578aca1..f20da8f 100644
--- a/headers/fnmatch.h
+++ b/headers/fnmatch.h
@@ -10,10 +10,10 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this 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. */
+You should have received a copy of the GNU Library General
+Public License along with this library; see the file COPYING.LIB.
+If not, write to the Free Software Foundation, Inc., 51 Franklin
+Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#ifndef _FNMATCH_H
diff --git a/lib/Makefile.tmpl b/lib/Makefile.tmpl
index 6770574..96f42db 100644
--- a/lib/Makefile.tmpl
+++ b/lib/Makefile.tmpl
@@ -14,8 +14,8 @@
## 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.
noinst_LIBRARIES = libcpio.a
noinst_HEADERS = system.h localedir.h rmt.h
diff --git a/lib/mkdir.c b/lib/mkdir.c
index aa1c4ff..7f82432 100644
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -11,9 +11,10 @@
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. */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/lib/strdup.c b/lib/strdup.c
index 6b486ca..2fdba41 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -11,9 +11,10 @@
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. */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/lib/strerror.c b/lib/strerror.c
index a838ed5..4e3d98c 100644
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -13,9 +13,10 @@
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 GNU Radius; 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 GNU Radius; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index 692e463..01335e5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,9 +11,10 @@
# 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.
INCLUDES=-I. -I.. -I$(top_srcdir)/lib
diff --git a/src/copyin.c b/src/copyin.c
index 87dd189..488e7f1 100644
--- a/src/copyin.c
+++ b/src/copyin.c
@@ -11,9 +11,10 @@
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. */
#include <system.h>
diff --git a/src/copyout.c b/src/copyout.c
index 2688490..527d490 100644
--- a/src/copyout.c
+++ b/src/copyout.c
@@ -11,9 +11,10 @@
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. */
#include <system.h>
diff --git a/src/copypass.c b/src/copypass.c
index ce24691..b40cf5c 100644
--- a/src/copypass.c
+++ b/src/copypass.c
@@ -11,9 +11,10 @@
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. */
#include <system.h>
diff --git a/src/cpio.h b/src/cpio.h
index 3861ab0..77ad584 100644
--- a/src/cpio.h
+++ b/src/cpio.h
@@ -11,9 +11,10 @@
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. */
#ifndef _CPIO_H
diff --git a/src/cpiohdr.h b/src/cpiohdr.h
index c3943b4..1cb1d35 100644
--- a/src/cpiohdr.h
+++ b/src/cpiohdr.h
@@ -11,9 +11,10 @@
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. */
#ifndef _CPIOHDR_H
diff --git a/src/defer.c b/src/defer.c
index cb6fb40..dde3dac 100644
--- a/src/defer.c
+++ b/src/defer.c
@@ -11,9 +11,10 @@
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. */
#include <system.h>
diff --git a/src/defer.h b/src/defer.h
index 657257f..10cba8b 100644
--- a/src/defer.h
+++ b/src/defer.h
@@ -11,9 +11,10 @@
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. */
struct deferment
{
diff --git a/src/dstring.c b/src/dstring.c
index e3cdae7..4f95539 100644
--- a/src/dstring.c
+++ b/src/dstring.c
@@ -11,9 +11,10 @@
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. */
#if defined(HAVE_CONFIG_H)
# include <config.h>
diff --git a/src/dstring.h b/src/dstring.h
index 1615518..3628b99 100644
--- a/src/dstring.h
+++ b/src/dstring.h
@@ -11,9 +11,10 @@
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. */
#ifndef NULL
#define NULL 0
diff --git a/src/extern.h b/src/extern.h
index 1539d58..79af3c2 100644
--- a/src/extern.h
+++ b/src/extern.h
@@ -11,9 +11,10 @@
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. */
enum archive_format
{
diff --git a/src/filemode.c b/src/filemode.c
index ff4d379..98f2813 100644
--- a/src/filemode.c
+++ b/src/filemode.c
@@ -11,9 +11,10 @@
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. */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/filetypes.h b/src/filetypes.h
index 9f785a1..de6d77f 100644
--- a/src/filetypes.h
+++ b/src/filetypes.h
@@ -11,9 +11,10 @@
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. */
/* Include sys/types.h and sys/stat.h before this file. */
diff --git a/src/global.c b/src/global.c
index 4e84990..85747ec 100644
--- a/src/global.c
+++ b/src/global.c
@@ -11,9 +11,10 @@
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. */
#include <system.h>
diff --git a/src/idcache.c b/src/idcache.c
index d3bf482..17fcc04 100644
--- a/src/idcache.c
+++ b/src/idcache.c
@@ -11,9 +11,10 @@
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. */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/main.c b/src/main.c
index 26d6159..c06334d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,9 +11,10 @@
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. */
/* Written by Phil Nelson <phil@cs.wwu.edu>,
David MacKenzie <djm@gnu.ai.mit.edu>,
@@ -242,8 +243,8 @@ license ()
" GNU General Public License for more details.\n"
"\n"
" You should have received a copy of the GNU General Public License\n"
- " along with GNU cpio; if not, write to the Free Software\n"
- " Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n\n"));
+ " along with GNU cpio; if not, write to the Free Software Foundation,\n"
+ " Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n\n"));
exit (0);
}
diff --git a/src/makepath.c b/src/makepath.c
index 8bd2b63..9bf85ca 100644
--- a/src/makepath.c
+++ b/src/makepath.c
@@ -11,9 +11,10 @@
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. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu> and
Jim Meyering <meyering@cs.utexas.edu>. */
diff --git a/src/mt.c b/src/mt.c
index f68e3ef..c5923e8 100644
--- a/src/mt.c
+++ b/src/mt.c
@@ -13,8 +13,9 @@
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
+*/
/* If -f is not given, the environment variable TAPE is used;
diff --git a/src/tar.c b/src/tar.c
index 5723258..64e1775 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -11,9 +11,10 @@
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. */
#include <system.h>
diff --git a/src/tar.h b/src/tar.h
index 79f289e..7b27e86 100644
--- a/src/tar.h
+++ b/src/tar.h
@@ -14,10 +14,10 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this 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. */
+You should have received a copy of the GNU Library General
+Public License along with this library; see the file COPYING.LIB.
+If not, write to the Free Software Foundation, Inc., 51 Franklin
+Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#ifndef _TAR_H
diff --git a/src/tarhdr.h b/src/tarhdr.h
index 8b1211d..b901739 100644
--- a/src/tarhdr.h
+++ b/src/tarhdr.h
@@ -11,9 +11,10 @@
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. */
#ifndef _TARHDR_H
diff --git a/src/userspec.c b/src/userspec.c
index 2ca402e..d9be4f4 100644
--- a/src/userspec.c
+++ b/src/userspec.c
@@ -12,9 +12,10 @@
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. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
diff --git a/src/util.c b/src/util.c
index 8a41c63..4f5d244 100644
--- a/src/util.c
+++ b/src/util.c
@@ -11,9 +11,10 @@
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. */
#include <system.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8701c1b..25cb198 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,8 +14,8 @@
## 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.
EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4
DISTCLEANFILES = atconfig $(check_SCRIPTS)
diff --git a/tests/inout.at b/tests/inout.at
index 2fce7a4..d84a136 100644
--- a/tests/inout.at
+++ b/tests/inout.at
@@ -13,8 +13,8 @@
# 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.
AT_SETUP([basic functionality: copyin/copyout])
@@ -36,4 +36,4 @@ do
done < filelist |
cpio --quiet -o > archive])
-AT_CLEANUP \ No newline at end of file
+AT_CLEANUP
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 2300169..31b4673 100644
--- a/