[Pkg-voip-commits] r8477 - in /sip-tester/trunk/debian: changelog copyright

[msp at alioth.debian.org]

Author: msp
Date: Sun Jun 13 05:28:10 2010
New Revision: 8477

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8477
Log:
Update debian/copyright

Modified:
    sip-tester/trunk/debian/changelog
    sip-tester/trunk/debian/copyright

Modified: sip-tester/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/changelog?rev=8477&op=diff
==============================================================================
--- sip-tester/trunk/debian/changelog (original)
+++ sip-tester/trunk/debian/changelog Sun Jun 13 05:28:10 2010
@@ -10,8 +10,9 @@
     - Add Homepage:
     - Add Vcs- headers
     - debian/compat -> 7 
+  * Update debian/copyright
 
- -- Mark Purcell <msp at debian.org>  Sun, 13 Jun 2010 15:11:01 +1000
+ -- Mark Purcell <msp at debian.org>  Sun, 13 Jun 2010 15:23:14 +1000
 
 sip-tester (3.1.r590-1) unstable; urgency=low
 

Modified: sip-tester/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/copyright?rev=8477&op=diff
==============================================================================
--- sip-tester/trunk/debian/copyright (original)
+++ sip-tester/trunk/debian/copyright Sun Jun 13 05:28:10 2010
@@ -4,10 +4,66 @@
 It was downloaded from http://sourceforge.net/projects/sipp/ .
 
 Copyright: Copyright (C) 2003 Richard GAYRAUD
+           Copyright (c) 2001-2004 Aaron Turner.
 
-Upstream Author: Richard GAYRAUD
 
-License: GPL2 or any later version.
+LICENCE.txt
+===========
+SIPp is licensed under GNU General Public License version 2 or later
+except send_packets.c and send_packets.h:
 
-See /usr/share/common-licenses/GPL-2.
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
 
+
+------ Copyright notice for send_packets.c and send_packets.h --------
+ * Copyright (c) 2001-2004 Aaron Turner.
+ * All rights reserved.
+ *
+ * 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 names of the copyright owners 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 ``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 AUTHORS OR COPYRIGHT HOLDERS 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.
+----------------------------------------------------------------------
+
+    You should have received a copy of the GNU General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Mark Purcell <msp at debian.org>
+
+you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.