[Glibc-bsd-commits] r3622 - trunk/freebsd-quota/debian

Mats Erik Andersson meand-guest at alioth.debian.org
Wed Jul 20 23:30:40 UTC 2011


Author: meand-guest
Date: 2011-07-20 23:30:39 +0000 (Wed, 20 Jul 2011)
New Revision: 3622

Modified:
   trunk/freebsd-quota/debian/copyright
Log:
Resolved all aggregated copyrights.


Modified: trunk/freebsd-quota/debian/copyright
===================================================================
--- trunk/freebsd-quota/debian/copyright	2011-07-20 18:57:01 UTC (rev 3621)
+++ trunk/freebsd-quota/debian/copyright	2011-07-20 23:30:39 UTC (rev 3622)
@@ -12,20 +12,44 @@
 License: 4-clause BSD
 
 Files: libexec/rpc.rquotad/rquotad.c
-Copyright: Manuel Bouyer <bouyer at ensta.fr>
+Copyright: none
+Comment: Original author Manuel Bouyer <bouyer at ensta.fr>
 License: public-domain
+ There is no copyright, you can use it as you want.
 
-Files: sbin/fsck/*
-Copyright: 1980-1993, Regents of the Univ. of California
+Files: sbin/fsck/fsck.8, sbin/fsck/fsutil.h
+Copyright: 1996, Christos Zoulas
+License: 4-clause BSD
+
+Files: sbin/fsck/fsck.c
+Copyright: 1980-1994, Regents of the Univ. of California
            1996 Christos Zoulas
-License: 4-clause BSD, 3-clause BSD
+License: 4-clause BSD
 
-Files: sbin/fsck_ffs/*
-Copyright: 1980-1993, Regents of the Univ. of California
-           2002, Poul-Henning Kamp
+Files: sbin/fsck/fsutil.c, sbin/fsck/preen.c
+Copyright: 1990,1993, Regents of the Univ. of California
+License: 3-clause BSD
+
+Files: sbin/fsck_ffs/{SMM.doc/*,dir.c,fsck_ffs.8,fsck.h,fsutil.c}
+ sbin/fsck_fss/{gjournal.c,inode.c,main.c,pass1b.c,pass1.c,pass2.c}
+ sbin/fsck_fss/{pass3.c,pass4.c,pass5.c,setup.c,utilities.c}
+Copyright: 1980-1996, Regents of the Univ. of California
+License: 3-clause BSD
+
+Files: sbin/fsck_ffs/fsck.h
+Copyright: 2002, Networks Associates Technology, Inc.
+License: ISC
+Comment: Shared copyright
+
+Files: sbin/fsck_ffs/gjournal.c
+Copyright: 2006, Pawel Jakub Dawidek <pjd at FreeBSD.org>
+License: ISC
+Comment: Shared copyright
+
+Files: sbin/fsck_ffs/ea.c
+Copyright: 2002, Poul-Henning Kamp
            2002, Networks Associates Technology, Inc.
-           2006, Pawel Jakub Dawidek <pjd at FreeBSD.org>
-License: 4-clause BSD, 3-clause BSD, 2-clause BSD
+License: 3-clause BSD
 
 Files: sbin/quotacheck/*
 Copyright: 1983-1993, Regents of the Univ. of California
@@ -33,10 +57,10 @@
 
 Files: usr.bin/quota/*
 Copyright: 1980-1993, Regents of the Univ. of California
-License: 3-clause BSD
+License: 4-clause BSD
 
 Files: usr.sbin/edquota/*, usr.sbin/quotaon/*, usr.sbin/repquota/*
-Copyright: 1983-1993, Regents of the Univ. of California
+Copyright: 1980-1993, Regents of the Univ. of California
 License: 3-clause BSD
 
 Files: debian/*
@@ -46,12 +70,6 @@
 License: FreeBSD
 
 License: 4-clause BSD
- Copyright (c) 1980, 1990, 1993
- The Regents of the University of California.  All rights reserved.
- .
- This code is derived from software contributed to Berkeley by
- Robert Elz at The University of Melbourne.
- .
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -79,3 +97,52 @@
  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.
+
+License: 3-clause BSD, FreeBSD
+ 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. Neither the name of the University 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 REGENTS 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 REGENTS 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.
+Comment: Some files name the third condition as "4.", but the wording
+ remains the same.
+
+License: ISC
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.




More information about the Glibc-bsd-commits mailing list