[Pkg-voip-commits] r8205 - in /dahdi-firmware/trunk/debian: changelog copyright

Sun Mar 14 19:30:06 UTC 2010

Author: tzafrir-guest
Date: Sun Mar 14 19:30:06 2010
New Revision: 8205

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8205
Log:
Updated copyrights file

Modified:
    dahdi-firmware/trunk/debian/changelog
    dahdi-firmware/trunk/debian/copyright

Modified: dahdi-firmware/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-firmware/trunk/debian/changelog?rev=8205&op=diff
==============================================================================

--- dahdi-firmware/trunk/debian/changelog (original)
+++ dahdi-firmware/trunk/debian/changelog Sun Mar 14 19:30:06 2010
@@ -1,8 +1,12 @@
 dahdi-firmware (2.2.1-2) UNRELEASED; urgency=low
 
+  [ Mark Purcell ]
   * NOT RELEASED YET
 
- -- Mark Purcell <msp at debian.org>  Sun, 07 Mar 2010 23:27:35 +1100
+  [ Tzafrir Cohen ]
+  * Updated copyrights file
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 14 Mar 2010 21:29:15 +0200
 
 dahdi-firmware (2.2.1-1) unstable; urgency=low
 

Modified: dahdi-firmware/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-firmware/trunk/debian/copyright?rev=8205&op=diff
==============================================================================
--- dahdi-firmware/trunk/debian/copyright (original)
+++ dahdi-firmware/trunk/debian/copyright Sun Mar 14 19:30:06 2010
@@ -47,16 +47,104 @@
 /****************************************************************************/
 
 
-drivers/dahdi/firmware/Makefile is, as most other parts of DAHDI, 
+drivers/dahdi/firmware/Makefile and README are, as most other parts of DAHDI, 
 is license under the terms of GPLv2 .
 
-I will not include here a complete review of the package. See the
-package dahdi-linux that uses the same source tarball (except those
-firmware files). None of them anyway makes it into the binary package.
+The rest of the files mentioned below are not included in the binary package.
+
+Summary:
+The bulk of the code, under drivers/dahdi/ , is licensed under the terms
+of GPLv2. Various drivers (e.g.: all non-Digium drivers) are licensed as
+GPLv2.+ . Two other files (mmx.h, XppConfig.pm) are licensed under a more
+permissive license.
 
 
+Upstream Authors: Jim Dixon / Zapate Telephony, Linux Support Services, Inc.
+
+Copyright (from drivers/dahdi/tor2.c):
+
+/*
+ * Tormenta 2  Quad-T1 PCI Driver
+ *
+ * Written by Mark Spencer <markster at digium.com>
+ * Based on previous works, designs, and archetectures conceived and
+ * written by Jim Dixon <jim at lambdatel.com>.
+ *
+ * Copyright (C) 2001 Jim Dixon / Zapata Telephony.
+ * Copyright (C) 2001-2008, Digium, Inc.
+ *
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ */
+
+The file LICENSE is a verbatim copy of the GNU General Public License, v.2.
+
+On Debian systems, a copy of the GNU General Public License v.2 may be
+found in /usr/share/common-licenses/GPL-2.
+
+Other Portions:
+
+drivers/dahdi/octapi: GPLv.2+
+
+    Copyright (c) 2001-2007 Octasic Inc.
+
+This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API  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.
+
+The OCT6100 GPL API 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. 
+
+You should have received a copy of the GNU General Public License 
+along with the OCT6100 GPL API; if not, write to the Free Software 
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+drivers/dahdi/datamods/syncppp.c: GPLv.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.
+ *
+ *	Port for Linux-2.1 by Jan "Yenya" Kasprzak <kas at fi.muni.cz>
+ * Copyright (C) 1994 Cronyx Ltd.
+ * Author: Serge Vakulenko, <vak at zebub.msk.su>
+
+
+drivers/dahdi/xpp/XppConfig.pm: GPL 1+ || Artistic
+
+# Written by Oron Peled <oron at actcom.co.il>
+# Copyright (C) 2008, Xorcom
+# This program is free software; you can redistribute and/or
+# modify it under the same terms as Perl itself.
+
+
+Other copyright holders:
+
+drivers/dahdi/dahdi_dummy.c:  * Copyright (C) 2002, Hermes Softlab
+
+drivers/dahdi/dahdi_echocan_sec2.c: Copyright (C) 2001 Steve Underwood
+drivers/dahdi/dahdi_echocan_sec.c: Copyright (C) 2001 Steve Underwood
+drivers/dahdi/ecdis.h: Copyright (C) 2001 Steve Underwood
+drivers/dahdi/datamods/hdlc_*.c: * Copyright (C) 1999 - 2005 Krzysztof Halasa <khc at pm.waw.pl>
+
 The Debian packaging is (C) 2009, Tzafrir Cohen <tzafrir.cohen at xorcom.com> 
-and is licensed under the terms of the GPL.
+and is licensed under the terms of the GPLv2 or any later version.
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+On Debian systems, the complete text of the GNU General Public
+License v.2 can be found in `/usr/share/common-licenses/GPL-2'.


