[Pkg-voip-commits] [SCM] UNNAMED PROJECT branch, master, updated. upstream/1.8.0_pre1-5-g55ffd7c

Sun May 20 16:46:04 UTC 2012

The following commit has been merged in the master branch:
commit 42446e4c7eaee79a32907bcc8896530c3e5ba9bc
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Sun May 20 18:32:54 2012 +0200

    Begin revising debian/copyright to DEP-5 format

diff --git a/debian/copyright b/debian/copyright
index cabcc7d..5cb0218 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,107 +1,56 @@
-This package was prepared for Debian by the combined efforts of
-Daniel Pocock <daniel at pocock.com.au> and
-Gregor Jasny <gjasny at googlemail.com>
-
-upstream tarballs downloaded from http://www.resiprocate.org/
-
-Upstream Authors:
-
-    reSIProcate Developers <resiprocate-devel at list.resiprocate.org>
-
-Copyright:
-
-    2000-2007 Vovida Networks, Inc.  All rights reserved.
-    for the main reSIProcate stack
-
-    For some components, contributors have asserted individual copyright,
-    licensing their code under the same terms as the stack itself
-    or under compatible BSD terms (see further below)
-
-    Copyright 2005-2012 Daniel Pocock <daniel at pocock.com.au>
-    Copyright 2005-2012 Scott Godin / SIP Spectrum Inc.
-    Copyright 2007-2008, Plantronics, Inc.
-
-The main license terms:
-
-    The Vovida Software License, Version 1.0
-
-    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. The names "VOCAL", "Vovida Open Communication Application Library",
-       and "Vovida Open Communication Application Library (VOCAL)" must
-       not be used to endorse or promote products derived from this
-       software without prior written permission. For written
-       permission, please contact vocal at vovida.org.
-
-    4. Products derived from this software may not be called "VOCAL", nor
-       may "VOCAL" appear in their name, without prior written
-       permission of Vovida Networks, Inc.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
-    NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL VOVIDA
-    NETWORKS, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT DAMAGES
-    IN EXCESS OF $1,000, NOR FOR ANY 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.
-
-The BSD license terms used in some specific contributions (identical to
-the Vocal terms but using the word `author' in place of `Vovida/VOCAL'):
-
-   BSD License 
-   -----------
-
-   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. Neither the name of the author nor the names of contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
-  
-   THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
-   NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR
-   OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT DAMAGES
-   NOR FOR ANY 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.
-
-The Debian packaging is
-
-    Copyright 2007-2012 Daniel Pocock <daniel at pocock.com.au>
-    Copyright 2009 Gregor Jasny <gjasny at googlemail.com>
-    and is licensed under the General Public License v3
-    which is available in
-    /usr/share/common-licenses/GPL-3
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: reSIProcate
+Upstream-Contact: reSIProcate developers <resiprocate-devel at lists.resiprocate.org>
+Source: https://svn.resiprocate.org/viewsvn/resiprocate/main/
+
+Files: *
+Copyright: 2000, Vovida Networks, Inc.
+           2005, Scott Godin / SIP Spectrum Inc.
+           2007, Plantronics, Inc.
+License: Vovida and BSD
+ The Vovida Software License, Version 1.0
+ .
+ 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. The names "VOCAL", "Vovida Open Communication Application Library",
+    and "Vovida Open Communication Application Library (VOCAL)" must
+    not be used to endorse or promote products derived from this
+    software without prior written permission. For written
+    permission, please contact vocal at vovida.org.
+ .
+ 4. Products derived from this software may not be called "VOCAL", nor
+    may "VOCAL" appear in their name, without prior written
+    permission of Vovida Networks, Inc.
+ .
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
+ NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL VOVIDA
+ NETWORKS, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT DAMAGES
+ IN EXCESS OF $1,000, NOR FOR ANY 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: debian/*
+Copyright: 2012, Daniel Pocock <daniel at pocock.com.au> and
+           2009, Gregor Jasny <gjasny at googlemail.com>
+License: GPL-3+
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
 

-- 
UNNAMED PROJECT

