Imported Debian patch 1.1.5-2

diff --git a/debian/changelog b/debian/changelog
index 27271f4c1e47769cf4741907ac75499baf50542c..fa6dd018ea8d86834279d15d7e36157d9ebfd7ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.1.5-2) unstable; urgency=low
+
+  * Standards version is 3.8.1
+  * Set -x in nfs-{common,server}.{pre,post}rm scripts
+  * Add copyright notices
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Sat, 04 Apr 2009 15:29:57 +1100
+
 nfs-utils (1:1.1.5-1) experimental; urgency=low
 
   * New upstream release 

diff --git a/debian/control b/debian/control
index 7062153d6f779878c135bc2038f6da555477cbd8..e6e855c8c43691f2771fbf0935ab9a5cd9644c33 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Priority: standard
 Section: net
 Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Steinar H. Gunderson <sesse@debian.org>, Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssglue-dev (>= 0.1-1), librpcsecgss-dev (>= 0.16-1), libblkid-dev, libkeyutils-dev, pkg-config, quilt (>= 0.40), libldap2-dev
-Standards-Version: 3.8.0.1
+Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssglue-dev, librpcsecgss-dev (>= 0.17), libblkid-dev, libkeyutils-dev, pkg-config, quilt (>= 0.40), libldap2-dev
+Standards-Version: 3.8.1
 Homepage: http://nfs.sourceforge.net/
 
 Package: nfs-kernel-server

diff --git a/debian/copyright b/debian/copyright
index b01120056cb56a578b395ada75b832a9c006743a..e4617c0e8f8c06b43a35eddff239503ce0abe7c7 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,3 +9,46 @@ 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.

diff --git a/debian/nfs-common.postrm b/debian/nfs-common.postrm
index aeb9848bf3eabccf10fe3cc5156971ee13086fe9..1f8f1ebd506495c3b950f8cd234b16877ab8e615 100644 (file)
--- a/debian/nfs-common.postrm
+++ b/debian/nfs-common.postrm
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 #DEBHELPER#
 
 case "$1" in

diff --git a/debian/nfs-common.prerm b/debian/nfs-common.prerm
index c3c15ba3ec2dd655dbb00027331550894792f934..08e0ca9112ee919a18a839b20856e00fd88c14b6 100644 (file)
--- a/debian/nfs-common.prerm
+++ b/debian/nfs-common.prerm
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 #DEBHELPER#
 
 case "$1" in

diff --git a/debian/nfs-kernel-server.postrm b/debian/nfs-kernel-server.postrm
index 4a79162ecd3589c6c6368c3d207476f1c30f9c30..12049b89af81797319b62b2d0bc64e1fe486979d 100644 (file)
--- a/debian/nfs-kernel-server.postrm
+++ b/debian/nfs-kernel-server.postrm
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 #DEBHELPER#
 
 case "$1" in

diff --git a/debian/nfs-kernel-server.prerm b/debian/nfs-kernel-server.prerm
index 80878e6687cff79ec785dea865171e89163f1e52..b5a6eed3eda3f4735d3146cbbcf938855d9efdc6 100644 (file)
--- a/debian/nfs-kernel-server.prerm
+++ b/debian/nfs-kernel-server.prerm
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 #DEBHELPER#
 
 case "$1" in