[Glibc-bsd-commits] r3116 - trunk/freebsd-buildutils/debian

[Aurelien Jarno]

Author: aurel32
Date: 2010-07-29 19:33:18 +0000 (Thu, 29 Jul 2010)
New Revision: 3116

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
   trunk/freebsd-buildutils/debian/copyright
Log:
  * Update debian/copyright.
  * Bumped Standard-Versions to 3.9.1 (no changes).



Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2010-07-29 18:59:44 UTC (rev 3115)
+++ trunk/freebsd-buildutils/debian/changelog	2010-07-29 19:33:18 UTC (rev 3116)
@@ -3,8 +3,12 @@
   [ Petr Salinger ]
   * New upstream version (RELENG_8_1_0_RELEASE)
 
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 12 Apr 2010 23:53:50 +0200
+  [ Aurelien Jarno ]
+  * Update debian/copyright.
+  * Bumped Standard-Versions to 3.9.1 (no changes).
 
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 29 Jul 2010 21:30:15 +0200
+
 freebsd-buildutils (8.0-1) unstable; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2010-07-29 18:59:44 UTC (rev 3115)
+++ trunk/freebsd-buildutils/debian/control	2010-07-29 19:33:18 UTC (rev 3116)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5.0.0), pmake, flex, bison, libbsd-dev, quilt
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-buildutils/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-buildutils/
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 
 Package: freebsd-buildutils
 Architecture: any

Modified: trunk/freebsd-buildutils/debian/copyright
===================================================================
--- trunk/freebsd-buildutils/debian/copyright	2010-07-29 18:59:44 UTC (rev 3115)
+++ trunk/freebsd-buildutils/debian/copyright	2010-07-29 19:33:18 UTC (rev 3116)
@@ -7,32 +7,41 @@
 
 Copyright:
 
-	Copyright (c) 1980, 1983, 1985, 1987, 1988, 1989, 1990, 1991, 1993
-		The Regents of the University of California
-	Copyright (c) 1988, 1989 Adam de Boor
-	Copyright (c) 1989 by Berkeley Softworks
-	Copyright (c) 1995 Peter Wemm
-	Copyright (c) 1996 Søren Schmidt
-	Copyright (c) 1998 John D. Polstra.
-	Copyright (c) 1997 John-Mark Gurney
-	Copyright (c) 1998, 2000 Robert Nordier
-	Copyright (c) 1999 Global Technology Associates, Inc.
-	Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav
-	Copyright (c) 2000 Massachusetts Institute of Technology
- 	Copyright (c) 2000, 2001 David O'Brien
- 	Copyright (c) 2002 Juli Mallett
-	Copyright (c) 2003 Joseph Koshy
-	Copyright (c) 2003 Poul-Henning Kamp
-	Copyright (c) 2003 Dan Nelson
- 	Copyright (c) 2005 Max Okumoto
-	Copyright (c) 2006 Daniel M. Eischen
+    Copyright (c) 1980, 1983, 1985, 1987, 1988, 1989, 1990, 1991, 1993
+        The Regents of the University of California
+    Copyright (c) 1988, 1989 Adam de Boor
+    Copyright (c) 1989 by Berkeley Softworks
+    Copyright (c) 1995 Peter Wemm
+    Copyright (c) 1996 Søren Schmidt
+    Copyright (c) 1998 John D. Polstra.
+    Copyright (c) 1997 John-Mark Gurney
+    Copyright (c) 1998, 2000 Robert Nordier
+    Copyright (c) 1999 Global Technology Associates, Inc.
+    Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav
+    Copyright (c) 2000 Massachusetts Institute of Technology
+    Copyright (c) 2000, 2001 David O'Brien
+    Copyright (c) 2002 Juli Mallett
+    Copyright (c) 2003 Joseph Koshy
+    Copyright (c) 2003 Poul-Henning Kamp
+    Copyright (c) 2003 Dan Nelson
+    Copyright (c) 2005 Max Okumoto
+    Copyright (c) 2006 Daniel M. Eischen
 
 
 License:
 
     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
     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -44,7 +53,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'.
-