[Pkg-voip-commits] r4722 - in /srtp/trunk/debian: changelog copyright

js at alioth.debian.org js at alioth.debian.org
Sat Oct 13 15:17:37 UTC 2007 

Author: js
Date: Sat Oct 13 15:17:37 2007
New Revision: 4722

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4722
Log:
* Rewrite debian/copyright:
  + Restructure to conform to proposed new format at
    http://wiki.debian.org/Proposals/CopyrightFormat
  + Drop unneeded triling disclaimers from verbatim licensing texts.

Modified:
    srtp/trunk/debian/changelog
    srtp/trunk/debian/copyright

Modified: srtp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/srtp/trunk/debian/changelog?rev=4722&op=diff
==============================================================================
--- srtp/trunk/debian/changelog (original)
+++ srtp/trunk/debian/changelog Sat Oct 13 15:17:37 2007
@@ -3,8 +3,12 @@
   * Move Homepage to own field (from pseudo-field in long description).
   * Add patch 1003 to correct printf integer type in test/srtp_driver.
   * Move X-Vcs-* control fields to Vcs-*.
+  * Rewrite debian/copyright:
+    + Restructure to conform to proposed new format at
+      http://wiki.debian.org/Proposals/CopyrightFormat
+    + Drop unneeded triling disclaimers from verbatim licensing texts.
 
- -- Jonas Smedegaard <dr at jones.dk>  Sat, 29 Sep 2007 13:36:44 +0200
+ -- Jonas Smedegaard <dr at jones.dk>  Sat, 13 Oct 2007 17:11:41 +0200
 
 srtp (1.4.2.dfsg-5) unstable; urgency=low
 

Modified: srtp/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/srtp/trunk/debian/copyright?rev=4722&op=diff
==============================================================================
--- srtp/trunk/debian/copyright (original)
+++ srtp/trunk/debian/copyright Sat Oct 13 15:17:37 2007
@@ -1,81 +1,55 @@
 This is libSRTP packaged for Debian GNU systems.
-
-Initially packaged by Mikael Magnusson <mikma at users.sourceforge.net>
-on Sun, 10 Jul 2005 11:18:39 +0200.
-
 
 Upstream source: http://srtp.sourceforge.net/download.html
 
-
 Upstream author: David A. McGrew <mcgrew at cisco.com>
 
+Files: debian/*
+Copyright: © 2005 Mikael Magnusson <mikma at users.sourceforge.net>
+	   © 2007 Jonas Smedegaard <dr at jones.dk>
+License: The Debian packaging information is under the GPL, version 2 or
+	 later
 
-Copyright and licensing info, most files:
+Files: *
+Copyright: © 2001-2005, Cisco Systems, Inc.
+License: BSD-3
+  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.
 
- * 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.
-
-
-Copyright and licensing info, crypto/rng/rand_linux_kernel.c and
-crypto/include/kernel-compat.h:
-
- * Copyright(c) 2005 Ingate Systems AB
- * 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 author(s) 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.
+Files: crypto/rng/rand_linux_kernel.c, crypto/include/kernel-compat.h
+Copyright: © 2001-2005, Cisco Systems, Inc.
+License: BSD-3
+  Copyright(c) 2005 Ingate Systems AB
+  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 author(s) 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 Pkg-voip-commits mailing list