[Pkg-voip-commits] r8204 - in /dahdi-linux/trunk/debian: changelog copyright

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Sun Mar 14 19:23:47 UTC 2010 

Author: tzafrir-guest
Date: Sun Mar 14 19:23:47 2010
New Revision: 8204

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

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

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=8204&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Sun Mar 14 19:23:47 2010
@@ -1,8 +1,12 @@
 dahdi-linux (1:2.2.1+dfsg-2) UNRELEASED; urgency=low
 
+  [ Mark Purcell ]
   * NOT RELEASED YET
 
- -- Mark Purcell <msp at debian.org>  Sun, 07 Mar 2010 04:47:12 +1100
+  [ Tzafrir Cohen ]
+  * Updated copyrights file
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 14 Mar 2010 21:23:30 +0200
 
 dahdi-linux (1:2.2.1+dfsg-1) unstable; urgency=low
 

Modified: dahdi-linux/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/copyright?rev=8204&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/copyright (original)
+++ dahdi-linux/trunk/debian/copyright Sun Mar 14 19:23:47 2010
@@ -2,29 +2,110 @@
 Mon, 17 Jun 2002 10:31:21 -0400.
 
 It was downloaded from
-  http://www.asterisk.org/
-bristuff patch was downloaded from
-  http://www.junghanns.net/download/
-zaphfc driver was downloaded from
-  http://zaphfc.googlecode.com/
-OpenVox drivers were downloaded from
-  http://www.openvox.cn/viewvc/dahdi/trunk/opvxa1200.c?view=co
+  http://downloads.asterisk.org/pub/telephony/dahdi-linux/
+
+The DAHDI-extra patch was generated from the repository:
+  http://git.tzafrir.org.il/?p=dahdi-extra.git;a=summary
+  http://git.tzafrir.org.il/git/dahdi-extra.git
+
+DAHDI-extra includes the following:
+
+* drivers/staging/echo: echo.ko (OSLEC)
+* drivers/dahdi/opvxa1200.c: opvxa1200.ko (OpenVox A800P/A1200P)
+* drivers/dahdi/wcopenpci.c: wcopenpci.ko (Voicetronix OpenPCI)
+* drivers/dahdi/zaphfc/: zaphfc.c (HFC-S-based PCI cards)
 
 Upstream source has been modified to comply with the Debian Free 
 Software Guildlines (DFSG), by the removal of the firmware files:
 
-    wct4xxp/OCT6114-128D.ima
+    drivers/dahdi/xpp/firmwares/*.hex
 
-xpp/LICENSE.firmware permits redistribution but does not mention
-modification, which is a requirement of Debian Policy 2.1 ("Derived works").
+drivers/dahdi/xpp/firmwares/LICENSE.firmware permits redistribution but
+does not mention modification, which is a requirement of Debian Policy
+2.1 ("Derived works").
+
+
+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 zaptel.c):
+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 Linux Support Services, Inc.
+ * 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/wcopenpci.c: GPLv.2+
+ * Written by Mark Spencer <markster at linux-support.net>
+ *            Matthew Fredrickson <creslin at linux-support.net>
+ *            Ben Kramer <ben at voicetronix.com.au>
+ *            Ron Lee <ron at voicetronix.com.au>
+ *
+ * Copyright (C) 2001, Linux Support Services, Inc.
+ * Copyright (C) 2005 - 2007, Voicetronix
  *
  * All rights reserved.
  *
@@ -32,67 +113,50 @@
  * 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.
-
-On Debian systems, a copy of the GNU General Public License may be found in
-/usr/share/common-licenses/GPL.
-
-Other Portions:
-
- * Copyright (C) 2001-2005, Digium, Inc.
- * Copyright (C) 2002 Steve Underwood
-sethdlc.c: * Copyright (C) 2000 Krzysztof Halasa <khc at pm.waw.pl>
-ztd-loc.c: * Copyright (C) 2004, Axialys Interactive
-ztdummy.c: * Copyright (C) 2002, Hermes Softlab
-
-debian/patches/bristuff.dpatch, zaphfc, qozap, cwain, ztgsm:
- * Copyright (C) 2002, 2003, 2004, 2005 Junghanns.NET GmbH
-
-debian/patches/zaphfc-florz.dpatch:
- * Copyright (C) 2004, 2005, 2006  Florian Zumbiehl <florz at gmx.de>
-
-vzaphfc is derived from bristuff and since enhanced by:
- * Copyright (C) 2004-2006, Daniele "Vihai" Orlandi <daniele at orlandi.com>
- * Copyright (C) 2006, headissue GmbH; Jens Wilke <jw_vzaphfc at headissue.com>
-
-zaphfc is derived from bristuff and vzaphfc and has been enhanced by:
-  * Copyright (C) 2009, Jose A. Deniz <odicha at hotmail.com>
-
-Files in the xpp/ subdirectory:
-
-* Written by Oron Peled <oron at actcom.co.il>
-* Copyright (C) 2004-2006, Xorcom
-
-opvxa1200.c:
-* OpenVox A1200P FXS/FXO Interface Driver for Zapata Telephony interface
-*
-* Modify from wctdm.c by MiaoLin<miaolin at openvox.com.cn>
-
-opvxa1200.c is available for download from 
-http://www.openvox.com.cn/downloadsFile/a1200p-a800p_driver_with_dahdi.c
-
-wcopenpci.c is from the Voicetronix zaptel distribution at
-http://www.voicetronix.com/Downloads/asterisk/
-Copyright (C) 2001, Linux Support Services, Inc.
-Copyright (C) 2005 - 2007, Voicetronix
 
 
-Patch oslec_kernelorg is based on the Linux Kernel distribution (see 
-README.Debian). Part of the Open Source Line Echo Canceller (OSLEC) project.
+drivers/dahdi/opvxa1200.c: GPLv.2+
+ * Modify from wctdm.c by MiaoLin<miaolin at openvox.com.cn>
+ *
+ * All rights reserved.
+ *
+ * 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.
 
-echo.c: * Copyright (C) 2001, 2003 Steve Underwood, 2007 David Rowe
-oslec.h:  Copyright (C) 2007 David Rowe
-oslec_wrap.c:  Copyright (C) 2007 David Rowe
-fir.h: * Copyright (C) 2002 Steve Underwood
-bit_operations.h: * Copyright (C) 2006 Steve Underwood
-echo.h: * Copyright (C) 2001 Steve Underwood and 2007 David Rowe
+drivers/dahdi/zaphfc/*: GPLv.2
+ * Dahdi rewrite in hardhdlc mode
+ * Jose A. Deniz <odicha at hotmail.com>
+ *
+ * Copyright (C) 2009, Jose A. Deniz
+ * Copyright (C) 2006, headiisue GmbH; Jens Wilke
+ * Copyright (C) 2004 Daniele Orlandi
+ * Copyright (C) 2002, 2003, 2004, Junghanns.NET GmbH
+ *
+ * Jens Wilke <jw_vzaphfc at headissue.com>
+ *
+ * Original author of this code is
+ * Daniele "Vihai" Orlandi <daniele at orlandi.com>
+ *
+ * Major rewrite of the driver made by
+ * Klaus-Peter Junghanns <kpj at junghanns.net>
+ *
+ * This program is free software and may be modified and
+ * distributed under the terms of the GNU Public License.
 
-mmx.h:
-* mmx.h
+
+
+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.
+
+
+drivers/staging/echo/mmx.h:
+
  * Copyright (C) 1997-2001 H. Dietz and R. Fisher
  *
  * This file is part of FFmpeg.
@@ -101,3 +165,21 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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
+ * Lesser General Public License for more details.
+
+
+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>
+
+Other files under drivers/staging/echo/: 
+Copyright (C) 2001, 2003 Steve Underwood, 2007,2008 David Rowe

More information about the Pkg-voip-commits mailing list