Imported Debian patch 1.2.0-1

diff --git a/debian/changelog b/debian/changelog
index 169ebfe98953b504d1a285c8f670fc584504cb53..e8c6fc40495b080e6d3c85174436d06e7754122d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.2.0-1) unstable; urgency=low
+
+  * New upstream release
+    - Update Sun Microsystems RPC licenses
+  * Update debian/copyright
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Thu, 04 Jun 2009 20:01:43 +1000
+
 nfs-utils (1:1.1.6-1) unstable; urgency=low
 
   * New upstream release. Patch status:

diff --git a/debian/copyright b/debian/copyright
index e4617c0e8f8c06b43a35eddff239503ce0abe7c7..e412c18d7588e896972683c83d880a4b603521db 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,54 +1,88 @@
-This package was debianized by Chip Salzenberg <chip@debian.org> on Fri,  3 Dec 1999 20:00:00 -0800
-
-The source package was downloaded from http://sourceforge.net/projects/nfs/.
-
-View individual source files for respective authors.
-
-
-You are free to distribute this software under the terms of
-the GNU General Public License, version 2 or later.
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file /usr/share/common-licenses/GPL.
-
-Copyright 1990,1991 by the Massachusetts Institute of Technology.
-Copyright 1993 Rick Sladkey <jrs@world.std.com>
-Copyright 1994 by OpenVision Technologies, Inc.
-Copyright (C) 1984 Sun Microsystems, Inc.
-Copyright (c) 1985, 1990 by Sun Microsystems, Inc.
-Copyright (C) 1986 Sun Microsystems, Inc.
-Copyright (C) 1987, Sun Microsytsems, Inc.
-Copyright (c) 1988,1990 Sun Microsystems, Inc. - All Rights Reserved.
-Copyright (C) 1993 Rick Sladkey <jrs@world.std.com>
-Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
-Copyright (C) 1995, 1997-1999, 2002 Jeffrey A. Uphoff
-Copyright (C) 1995-1997, 1999 Jeffrey A. Uphoff
-Copyright (C) 1995, 1997-1999 Jeffrey A. Uphoff
-Copyright (C) 1995-1999, 2002, 2005 Jeffrey A. Uphoff
-Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
-Copyright (C) 1995-2005 Olaf Kirch <okir@suse.de>
-Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
-Copyright (c) 1998, 1999, 2001 Niklas Hallqvist.  All rights reserved.
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-Copyright (c) 2000, 2001, 2002 Håkan Olsson.  All rights reserved.
-Copyright (c) 2000, 2003 Håkan Olsson.  All rights reserved.
-Copyright (c) 2000-2004 The Regents of the University of Michigan.
-Copyright (c) 2000 Dug Song <dugsong@UMICH.EDU>.
-Copyright (c) 2001 Andy Adamson <andros@UMICH.EDU>.
-Copyright (c) 2002 J. Bruce Fields <bfields@UMICH.EDU>.
-Copyright (c) 2002 Marius Aamodt Eriksen <marius@UMICH.EDU>.
-Copyright (C) 2002 Trond Myklebust <trond.myklebust@fys.uio.no>
-Copyright (C) 2003 J. Bruce Fields <bfields@umich.edu>
-Copyright (C) 2003 Neil Brown <neilb@cse.unsw.edu.au>
-Copyright (C) 2004-2006 Olaf Kirch <okir@suse.de>
-Copyright (c) 2004-2006 The Regents of the University of Michigan.
-Copyright (c) 2004 Andy Adamson <andros@UMICH.EDU>.
-Copyright (c) 2004 Bruce Fields <bfields@umich.edu>
-Copyright (c) 2004 Kevin Coffman <kwc@umich.edu>
-Copyright (C) 2004 Olaf Kirch <okir@suse.de>
-Copyright (c) 2004, Paul Clements, SteelEye Technology
-Copyright (C) 2005, Chuck Lever <cel@netapp.com>
-Copyright (C) 2006 Amit Gud <agud@redhat.com>
-Copyright (c) 2006 Silicon Graphics, Inc.
-Copyright (C) 2007 Chuck Lever <chuck.lever@oracle.com>
-Copyright (C) 2007 Oracle.  All rights reserved.
-Copyright (C) 2008 Oracle Corporation.  All rights reserved.
+This package was debianized by Chip Salzenberg <chip@debian.org>
+on Fri,  3 Dec 1999 20:00:00 -0800
+
+The source package was downloaded from http://sourceforge.net/projects/nfs/
+
+Licenses
+--------
+
+RPC software:
+
+  Copyright (c) 2009, Sun Microsystems, Inc.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+  - Neither the name of Sun Microsystems, Inc. nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+The rest of the software:
+
+  You are free to distribute this software under the terms of
+  the GNU General Public License, version 2 or later.
+  On Debian systems, the complete text of the GNU General Public
+  License can be found in the file /usr/share/common-licenses/GPL.
+
+Copyright Notices
+-----------------
+
+  Copyright 1990,1991 by the Massachusetts Institute of Technology.
+  Copyright 1993 Rick Sladkey <jrs@world.std.com>
+  Copyright 1994 by OpenVision Technologies, Inc.
+  Copyright (C) 1984 Sun Microsystems, Inc.
+  Copyright (c) 1985, 1990 by Sun Microsystems, Inc.
+  Copyright (C) 1986 Sun Microsystems, Inc.
+  Copyright (C) 1987, Sun Microsytsems, Inc.
+  Copyright (c) 1988,1990 Sun Microsystems, Inc. - All Rights Reserved.
+  Copyright (C) 1993 Rick Sladkey <jrs@world.std.com>
+  Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
+  Copyright (C) 1995, 1997-1999, 2002 Jeffrey A. Uphoff
+  Copyright (C) 1995-1997, 1999 Jeffrey A. Uphoff
+  Copyright (C) 1995, 1997-1999 Jeffrey A. Uphoff
+  Copyright (C) 1995-1999, 2002, 2005 Jeffrey A. Uphoff
+  Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
+  Copyright (C) 1995-2005 Olaf Kirch <okir@suse.de>
+  Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
+  Copyright (c) 1998, 1999, 2001 Niklas Hallqvist.  All rights reserved.
+  Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+  Copyright (c) 2000, 2001, 2002 Håkan Olsson.  All rights reserved.
+  Copyright (c) 2000, 2003 Håkan Olsson.  All rights reserved.
+  Copyright (c) 2000-2004 The Regents of the University of Michigan.
+  Copyright (c) 2000 Dug Song <dugsong@UMICH.EDU>.
+  Copyright (c) 2001 Andy Adamson <andros@UMICH.EDU>.
+  Copyright (c) 2002 J. Bruce Fields <bfields@UMICH.EDU>.
+  Copyright (c) 2002 Marius Aamodt Eriksen <marius@UMICH.EDU>.
+  Copyright (C) 2002 Trond Myklebust <trond.myklebust@fys.uio.no>
+  Copyright (C) 2003 J. Bruce Fields <bfields@umich.edu>
+  Copyright (C) 2003 Neil Brown <neilb@cse.unsw.edu.au>
+  Copyright (C) 2004-2006 Olaf Kirch <okir@suse.de>
+  Copyright (c) 2004-2006 The Regents of the University of Michigan.
+  Copyright (c) 2004 Andy Adamson <andros@UMICH.EDU>.
+  Copyright (c) 2004 Bruce Fields <bfields@umich.edu>
+  Copyright (c) 2004 Kevin Coffman <kwc@umich.edu>
+  Copyright (C) 2004 Olaf Kirch <okir@suse.de>
+  Copyright (c) 2004, Paul Clements, SteelEye Technology
+  Copyright (C) 2005, Chuck Lever <cel@netapp.com>
+  Copyright (C) 2006 Amit Gud <agud@redhat.com>
+  Copyright (c) 2006 Silicon Graphics, Inc.
+  Copyright (C) 2007 Chuck Lever <chuck.lever@oracle.com>
+  Copyright (C) 2007 Oracle.  All rights reserved.
+  Copyright (C) 2008 Oracle Corporation.  All rights reserved.