[Glibc-bsd-commits] r6108 - trunk/freebsd-manpages/debian

abe at alioth.debian.org abe at alioth.debian.org
Sat Sep 17 22:41:55 UTC 2016 

Author: abe
Date: 2016-09-17 22:41:55 +0000 (Sat, 17 Sep 2016)
New Revision: 6108

Modified:
   trunk/freebsd-manpages/debian/changelog
   trunk/freebsd-manpages/debian/copyright
Log:
Update license and copyright years in debian/copyright wrt. to COPYRIGHT file in BASE.txz

Modified: trunk/freebsd-manpages/debian/changelog
===================================================================
--- trunk/freebsd-manpages/debian/changelog	2016-09-17 22:26:01 UTC (rev 6107)
+++ trunk/freebsd-manpages/debian/changelog	2016-09-17 22:41:55 UTC (rev 6108)
@@ -7,6 +7,8 @@
     + Update versioned debhelper build-dependency accordingly.
   * Declare compliance with Debian Policy 3.9.8. (No changes needed.)
   * Convert debian/copyright to machine-readable DEP5 format.
+  * Update license and copyright years in debian/copyright wrt. to
+    COPYRIGHT file in BASE.txz
 
  -- Axel Beckert <abe at debian.org>  Sat, 17 Sep 2016 23:38:41 +0200
 

Modified: trunk/freebsd-manpages/debian/copyright
===================================================================
--- trunk/freebsd-manpages/debian/copyright	2016-09-17 22:26:01 UTC (rev 6107)
+++ trunk/freebsd-manpages/debian/copyright	2016-09-17 22:41:55 UTC (rev 6108)
@@ -4,17 +4,78 @@
 Source: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/
 
 Files: *
-Copyright: 2000-2008 The FreeBSD Documentation Project
-License: BSD-3-Clause
+Copyright: 1979-1994 The Regents of the University of California.
+           1992-2016 The FreeBSD Documentation Project
+License: BSD-2-Clause-FreeBSD and BSD-4-Clause
+Comment:
+ All of the documentation and software included in the 4.4BSD and
+ 4.4BSD-Lite Releases is copyrighted by The Regents of the University
+ of California.
+ .
+ The Institute of Electrical and Electronics Engineers and the American
+ National Standards Committee X3, on Information Processing Systems have
+ given us permission to reprint portions of their documentation.
+ .
+ In the following statement, the phrase ``this text'' refers to portions
+ of the system documentation.
+ .
+ Portions of this text are reprinted and reproduced in electronic form in
+ the second BSD Networking Software Release, from IEEE Std 1003.1-1988, IEEE
+ Standard Portable Operating System Interface for Computer Environments
+ (POSIX), copyright C 1988 by the Institute of Electrical and Electronics
+ Engineers, Inc.  In the event of any discrepancy between these versions
+ and the original IEEE Standard, the original IEEE Standard is the referee
+ document.
+ .
+ In the following statement, the phrase ``This material'' refers to portions
+ of the system documentation.
+ .
+ This material is reproduced with permission from American National
+ Standards Committee X3, on Information Processing Systems.  Computer and
+ Business Equipment Manufacturers Association (CBEMA), 311 First St., NW,
+ Suite 500, Washington, DC 20001-2178.  The developmental work of
+ Programming Language C was completed by the X3J11 Technical Committee.
+ .
+ The views and conclusions contained in the software and documentation are
+ those of the authors and should not be interpreted as representing official
+ policies, either expressed or implied, of the Regents of the University
+ of California.
+ .
+ NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD")
+ source has been updated.  The copyright addendum may be found at
+ ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change and is
+ included below.
+ .
+ July 22, 1999
+ .
+ To All Licensees, Distributors of Any Version of BSD:
+ .
+ As you know, certain of the Berkeley Software Distribution ("BSD") source
+ code files require that further distributions of products containing all or
+ portions of the software, acknowledge within their advertising materials
+ that such products contain software developed by UC Berkeley and its
+ contributors.
+ .
+ Specifically, the provision reads:
+ .
+ "     * 3. All advertising materials mentioning features or use of this software
+       *    must display the following acknowledgement:
+       *    This product includes software developed by the University of
+       *    California, Berkeley and its contributors."
+ .
+ Effective immediately, licensees and distributors are no longer required to
+ include the acknowledgement within advertising materials.  Accordingly, the
+ foregoing paragraph of those BSD Unix files containing it is hereby deleted
+ in its entirety.
 
 Files: debian/*
 Copyright: 2006-2011 Gürkan Sengün <gurkan at phys.ethz.ch>
            2013-2016 Axel Beckert <abe at debian.org>
-License: BSD-3-Clause
+License: BSD-2-Clause-FreeBSD and BSD-4-Clause
 Comment: It is assumed that the Debian packaging is under the same
  license as the upstream code unless declared otherwise.
 
-License: BSD-3-Clause
+License: BSD-2-Clause-FreeBSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -23,7 +84,33 @@
  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
+ .
+ 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.
+
+License: BSD-4-Clause
+ 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. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+ This product includes software developed by the University of
+ California, Berkeley and its contributors.
+ 4. 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.
  .

More information about the Glibc-bsd-commits mailing list