re-mark 1.29b-2 as not yet uploaded (merge madness!)

[debian/tar] / ChangeLog.1

diff --git a/ChangeLog.1 b/ChangeLog.1
index 75c88144077d7135cd02d4e7cf1ac2ff3ca83a73..5e17374c5cfa685c5bb6fed156ac4c15850cd932 100644 (file)
--- a/ChangeLog.1
+++ b/ChangeLog.1
@@ -2,25 +2,22 @@ Currently there is just one ChangeLog file for tar, but
 there used to be separate ChangeLog files for each subdirectory.
 This file records what used to be in those separate files.
 
-Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
-Free Software Foundation, Inc.
+Copyright 1989-1997, 2013 Free Software Foundation, Inc.
 
-This file is part of GNU Tar.
+This file is part of GNU tar.
 
-GNU Tar is free software; you can redistribute it and/or modify
+GNU tar is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
 
-GNU Tar is distributed in the hope that it will be useful,
+GNU tar is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 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 Tar; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 ----- ChangeLog -----
@@ -3189,7 +3186,7 @@ Boston, MA 02110-1301, USA.
        Reported by Jeffrey Goldberg.
 
        * rmt.h (_remdev): A filename is not remote if the colon is
-       preceeded by a slash, to take care of `/:/' which is a shorthand
+       preceded by a slash, to take care of `/:/' which is a shorthand
        for `/.../<CELL-NAME>/fs' on OSF's Distributing Computing
        Environment (DCE) and Distributed File System (DFS).
        Reported by Travis L. Priest.