From 5d684e5b4dd0f870f18667a378b9149aa727a5ae Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sat, 28 Mar 2009 08:45:46 -0600 Subject: [PATCH] clean up the packaging a bit, reflect changes in list of doc files provided --- debian/copyright | 55 +++++++++++------------------- debian/sudo-ldap.docs | 6 ++-- debian/{dirs => sudo.dirs} | 0 debian/{docs => sudo.docs} | 3 +- debian/{postinst => sudo.postinst} | 0 debian/{prerm => sudo.prerm} | 0 6 files changed, 23 insertions(+), 41 deletions(-) rename debian/{dirs => sudo.dirs} (100%) rename debian/{docs => sudo.docs} (80%) rename debian/{postinst => sudo.postinst} (100%) rename debian/{prerm => sudo.prerm} (100%) diff --git a/debian/copyright b/debian/copyright index bd2245c..8e76500 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,47 +5,32 @@ Bdale Garbee maintains this package using sources from http://www.sudo.ws/ -Sudo is distributed under the following BSD-style license: +Sudo is distributed under the following ISC-style license: - Copyright (c) 1994-1996,1998-2005,2007 Todd C. Miller - All rights reserved. + Copyright (c) 1994-1996, 1998-2008 + Todd C. Miller - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission - from the author. - - 4. Products derived from this software may not be called "Sudo" nor - may "Sudo" appear in their names without specific prior written - permission from the author. + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. - THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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 SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + Sponsored in part by the Defense Advanced Research Projects + Agency (DARPA) and Air Force Research Laboratory, Air Force + Materiel Command, USAF, under agreement number F39502-99-1-0512. -Additionally, lsearch.c, fnmatch.c, getcwd.c, snprintf.c, strcasecmp.c -and fnmatch.3 bear the following UCB license: +Additionally, fnmatch.c, fnmatch.h, getcwd.c, glob.c, glob.h and snprintf.c +bear the following UCB license: - Copyright (c) 1987, 1989, 1990, 1991, 1993, 1994 - The Regents of the University of California. All rights reserved. + Copyright (c) 1987, 1989, 1990, 1991, 1992, 1993, 1994 + The Regents of the University of California. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/debian/sudo-ldap.docs b/debian/sudo-ldap.docs index 9752622..22596bf 100644 --- a/debian/sudo-ldap.docs +++ b/debian/sudo-ldap.docs @@ -1,11 +1,9 @@ debian/OPTIONS -BUGS UPGRADE -PORTING HISTORY README README.LDAP TROUBLESHOOTING +WHATSNEW sudoers2ldif -schema.iPlanet -schema.OpenLDAP +schema.* diff --git a/debian/dirs b/debian/sudo.dirs similarity index 100% rename from debian/dirs rename to debian/sudo.dirs diff --git a/debian/docs b/debian/sudo.docs similarity index 80% rename from debian/docs rename to debian/sudo.docs index b0507e0..19cb16b 100644 --- a/debian/docs +++ b/debian/sudo.docs @@ -1,7 +1,6 @@ debian/OPTIONS -BUGS UPGRADE -PORTING HISTORY README TROUBLESHOOTING +WHATSNEW diff --git a/debian/postinst b/debian/sudo.postinst similarity index 100% rename from debian/postinst rename to debian/sudo.postinst diff --git a/debian/prerm b/debian/sudo.prerm similarity index 100% rename from debian/prerm rename to debian/sudo.prerm -- 2.47.2