Copyright notice updates

18 files changed, 34 insertions, 28 deletions

diff --git a/AUTHORS b/AUTHORS
index 1cc569b..fd6b34c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,3 +7,5 @@ better to POSIX.
 Wayne Davison added unidiff support.
 
 David MacKenzie added configuration and backup support.
+
+Andreas Gruenbacher added merge support.
diff --git a/ChangeLog b/ChangeLog
index d313e7f..10640a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,9 @@
 	* patch.man: Document the asymmetric hunk behavior.
 	* NEWS: Update.
 
+	Copyright notice updates.
+	* README, AUTHORS: Updates.
+
 2009-04-04  Andreas Gruenbacher  <agruen@suse.de>
 
 	* pch.c (another_hunk): Add (back) the line number ranges to the
@@ -2861,5 +2864,5 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
diff --git a/Makefile.in b/Makefile.in
index 82ed318..c2b96c1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile for GNU patch.
 
-# Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003 Free Software
-# Foundation, Inc.
+# Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2009
+# Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; see the file COPYING.
 # If not, write to the Free Software Foundation,
-# 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 #### Start of system configuration section. ####
 
diff --git a/NEWS b/NEWS
index 6144684..fd549ea 100644
--- a/NEWS
+++ b/NEWS
@@ -261,7 +261,7 @@ Changes in version 2.0.12g8:
 
 
 
-Copyright (C) 1992, 1993, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
+Copyright (C) 1992, 1993, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2009
 Free Software Foundation, Inc.
 
 This file is part of GNU Patch.
diff --git a/README b/README
index dfe9e1d..bb64cfa 100644
--- a/README
+++ b/README
@@ -2,6 +2,7 @@ This version of `patch' has many changes made by the Free Software Foundation.
 They add support for:
  * handling arbitrary binary data and large files
  * the unified context diff format that GNU diff can produce
+ * merging into files instead of creating reject files
  * making GNU Emacs-style backup files
  * improved interaction with RCS and SCCS
  * the GNU conventions for option parsing and configuring and compilation.
@@ -35,8 +36,8 @@ Public License.
 
 Copyright (C) 1984, 1985, 1986, 1987, 1988 Larry Wall
 
-Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1999, 2002 Free
-Software Foundation, Inc.
+Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1999, 2002, 2009
+Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/configure.ac b/configure.ac
index 0753660..e445dc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Configure `patch'.
 
-# Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2006, 2009
+# Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/m4/setmode.m4 b/m4/setmode.m4
index 1af6bca..74ead44 100644
--- a/m4/setmode.m4
+++ b/m4/setmode.m4
@@ -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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 AC_DEFUN([AC_FUNC_SETMODE_DOS],
   [AC_CHECK_HEADERS(fcntl.h unistd.h)
diff --git a/patch.man b/patch.man
index 1f71a4e..014de60 100644
--- a/patch.man
+++ b/patch.man
@@ -1177,7 +1177,7 @@ Copyright
 .ie t \(co
 .el (C)
 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-2000, 2001, 2002 Free Software Foundation, Inc.
+2000, 2001, 2002, 2009 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
diff --git a/src/common.h b/src/common.h
index 68c9066..b9684de 100644
--- a/src/common.h
+++ b/src/common.h
@@ -3,7 +3,7 @@
 /* Copyright (C) 1986, 1988 Larry Wall
 
    Copyright (C) 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2002, 2003,
-   2006 Free Software Foundation, Inc.
+   2006, 2009 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/diffseq.h b/src/diffseq.h
index 8e9d449..e3557c4 100644
--- a/src/diffseq.h
+++ b/src/diffseq.h
@@ -1,7 +1,7 @@
 /* Analyze differences between two vectors.
 
-   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2008 Free
-   Software Foundation, Inc.
+   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2008, 2009
+   Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/inp.c b/src/inp.c
index 5ecf84a..4eb18bb 100644
--- a/src/inp.c
+++ b/src/inp.c
@@ -1,8 +1,8 @@
 /* inputting files to be patched */
 
 /* Copyright (C) 1986, 1988 Larry Wall
-   Copyright (C) 1991, 1992, 1993, 1997, 1998, 1999, 2002, 2003, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1993, 1997, 1998, 1999, 2002, 2003, 2006,
+   2009 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/inp.h b/src/inp.h
index 0bf7547..e768848 100644
--- a/src/inp.h
+++ b/src/inp.h
@@ -1,7 +1,7 @@
 /* inputting files to be patched */
 
 /* Copyright (C) 1986, 1988 Larry Wall
-   Copyright (C) 1991, 1992, 1993, 1997, 1998, 1999, 2002, 2003
+   Copyright (C) 1991, 1992, 1993, 1997, 1998, 1999, 2002, 2003, 2009
    Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/src/patch.c b/src/patch.c
index e197741..3426537 100644
--- a/src/patch.c
+++ b/src/patch.c
@@ -3,7 +3,7 @@
 /* Copyright (C) 1984, 1985, 1986, 1987, 1988 Larry Wall
 
    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2002,
-   2003, 2006 Free Software Foundation, Inc.
+   2003, 2006, 2009 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #define XTERN
 #include <common.h>
diff --git a/src/pch.c b/src/pch.c
index 4626910..5ea2222 100644
--- a/src/pch.c
+++ b/src/pch.c
@@ -3,7 +3,7 @@
 /* Copyright (C) 1986, 1987, 1988 Larry Wall
 
    Copyright (C) 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2006 Free Software Foundation, Inc.
+   2002, 2003, 2006, 2009 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/pch.h b/src/pch.h
index fec08c7..3020bf6 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -3,7 +3,7 @@
 /* Copyright (C) 1986, 1987, 1988 Larry Wall
 
    Copyright (C) 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003 Free Software Foundation, Inc.
+   2002, 2003, 2009 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/quotesys.c b/src/quotesys.c
index 528f382..7de202f 100644
--- a/src/quotesys.c
+++ b/src/quotesys.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.
    If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
diff --git a/src/util.c b/src/util.c
index 7cf790c..daf37c8 100644
--- a/src/util.c
+++ b/src/util.c
@@ -2,8 +2,8 @@
 
 /* Copyright (C) 1986 Larry Wall
 
-   Copyright (C) 1992, 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2006,
+   2009 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/util.h b/src/util.h
index 1f6bd88..fc69e53 100644
--- a/src/util.h
+++ b/src/util.h
@@ -2,8 +2,8 @@
 
 /* Copyright (C) 1986 Larry Wall
 
-   Copyright (C) 1992, 1993, 1997, 1998, 1999, 2001, 2002, 2003 Free
-   Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2009
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by