[Pkg-voip-commits] r3078 - srtp/trunk/debian

[Jonas Smedegaard]

Author: js
Date: 2007-01-29 15:54:26 +0100 (Mon, 29 Jan 2007)
New Revision: 3078

Modified:
   srtp/trunk/debian/copyright
Log:
Replace explicit URL to initial packaged version with general URL to download page, Copyright holder with upstream author, and license text with verbatim copy of both copyright and licensing info (grabbed from srtp/srtp.c). Separate each with double spacing, to better keep them apart also if e.g. Upstream author grows to multiple lines with mailinglist info.

Modified: srtp/trunk/debian/copyright
===================================================================
--- srtp/trunk/debian/copyright	2007-01-29 14:44:15 UTC (rev 3077)
+++ srtp/trunk/debian/copyright	2007-01-29 14:54:26 UTC (rev 3078)
@@ -1,39 +1,45 @@
 This is libSRTP packaged for Debian GNU systems.
 
-It was initially packaged by Mikael Magnusson
-<mikma at users.sourceforge.net> on Sun, 10 Jul 2005 11:18:39 +0200.
+Initially packaged by Mikael Magnusson <mikma at users.sourceforge.net>
+on Sun, 10 Jul 2005 11:18:39 +0200.
 
-It was downloaded from http://srtp.sourceforge.net/srtp-1.4.2.tgz
 
-Copyright Holder: Cisco Systems, Inc.
+Upstream source: http://srtp.sourceforge.net/download.html
 
-License:
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Upstream author: David A. McGrew <mcgrew at cisco.com>
 
-  Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
 
-  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.
+Copyright and licensing info:
 
-  Neither the name of the Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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
-COPYRIGHT HOLDERS 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.
+ * Copyright (c) 2001-2005, Cisco Systems, Inc.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ *   Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ *   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.
+ * 
+ *   Neither the name of the Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.