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

[Axel Beckert]

Author: abe
Date: 2013-08-30 20:55:22 +0000 (Fri, 30 Aug 2013)
New Revision: 4913

Modified:
   trunk/freebsd-manpages/debian/changelog
   trunk/freebsd-manpages/debian/copyright
Log:
freebsd-manpages: Fix lintian warning copyright-refers-to-deprecated-bsd-license-file

Modified: trunk/freebsd-manpages/debian/changelog
===================================================================
--- trunk/freebsd-manpages/debian/changelog	2013-08-30 20:51:46 UTC (rev 4912)
+++ trunk/freebsd-manpages/debian/changelog	2013-08-30 20:55:22 UTC (rev 4913)
@@ -11,6 +11,7 @@
   * Switch to source format "3.0 (quilt)"
   * Fixes the following lintian warnings:
     + copyright-without-copyright-notice
+    + copyright-refers-to-deprecated-bsd-license-file
     + debian-rules-missing-recommended-target
 
  -- Axel Beckert <abe at debian.org>  Fri, 30 Aug 2013 21:35:08 +0200

Modified: trunk/freebsd-manpages/debian/copyright
===================================================================
--- trunk/freebsd-manpages/debian/copyright	2013-08-30 20:51:46 UTC (rev 4912)
+++ trunk/freebsd-manpages/debian/copyright	2013-08-30 20:55:22 UTC (rev 4913)
@@ -13,7 +13,16 @@
 Copyright: 2000-2008 The FreeBSD Documentation Project
 
     Redistribution and use in source and binary forms, with or without
-    modification, are permitted under the terms of the BSD License.
+    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
@@ -26,6 +35,3 @@
     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.
-
-On Debian systems, the complete text of the BSD License can be
-found in `/usr/share/common-licenses/BSD'.