[Pkg-voip-commits] r6396 - in /dahdi-tools/trunk: ./ debian/

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Thu Nov 6 21:16:33 UTC 2008 

Author: tzafrir-guest
Date: Thu Nov  6 21:16:33 2008
New Revision: 6396

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6396
Log:
* Set SONAME to 2.0: libtonezone2.0 .
* Drop ztpty.c until someone asks for it.
* Remove the useless dahdi_speed.
* Some more updates to the copyrights file.

Added:
    dahdi-tools/trunk/debian/libtonezone2.0.docs   (props changed)
      - copied unchanged from r6382, dahdi-tools/trunk/debian/libtonezone1.docs
    dahdi-tools/trunk/debian/libtonezone2.0.install   (props changed)
      - copied unchanged from r6382, dahdi-tools/trunk/debian/libtonezone1.install
    dahdi-tools/trunk/debian/libtonezone2.0.links   (props changed)
      - copied unchanged from r6382, dahdi-tools/trunk/debian/libtonezone1.links
Removed:
    dahdi-tools/trunk/debian/libtonezone1.docs
    dahdi-tools/trunk/debian/libtonezone1.install
    dahdi-tools/trunk/debian/libtonezone1.links
    dahdi-tools/trunk/ztpty.c
Modified:
    dahdi-tools/trunk/debian/README.Debian
    dahdi-tools/trunk/debian/copyright
    dahdi-tools/trunk/debian/dahdi.doc-base.readme
    dahdi-tools/trunk/debian/rules

Modified: dahdi-tools/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/README.Debian?rev=6396&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/README.Debian (original)
+++ dahdi-tools/trunk/debian/README.Debian Thu Nov  6 21:16:33 2008
@@ -42,10 +42,9 @@
 
 Bristuff
 --------
-This version has the the bristuff patch and kernel modules. The bristuffed 
-modules require a bristuffed Asterisk to work. For the older asterisk 1.2 
-this is the package asterisk-bristuff . Current asterisk 1.4 packages 
-include  support for bristuff.
+The dahdi-linux package includes support for bristuff drivers. However 
+ztpty that has been part of our patch to Zaptel has been removed. It may 
+be added if someone actively uses it and helps testing that it works.
 
 
 FXOTune

Modified: dahdi-tools/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/copyright?rev=6396&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/copyright (original)
+++ dahdi-tools/trunk/debian/copyright Thu Nov  6 21:16:33 2008
@@ -2,94 +2,56 @@
 Tue, 26 Aug 2008 10:06:40 +0300
 
 It was downloaded from
-  http://www.asterisk.org/
-bristuff patch was downloaded from
-  http://www.junghanns.net/download/
+  http://downloads.digium.com/pub/telephony/dahdi-tools/
 
 FIXME: UPDATE THIS FILE. Make Lintian remind that:
 Upstream Author(s):
 
-Upstream Authors: Jim Dixon / Zapate Telephony, Linux Support Services, Inc.
+Copyright: (from dahdi_cfg.c)
 
-Copyright (from zaptel.c):
-
+ * Written by Mark Spencer <markster at digium.com>
+ * Based on previous works, designs, and architectures 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.
  *
  * 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.
- * 
- * 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.
+ * Primary Author: Mark Spencer <markster at digium.com>
+ * Radio Support by Jim Dixon <jim at lambdatel.com>
+ *
+ * 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.
 
-On Debian systems, a copy of the GNU General Public License may be found in
-/usr/share/common-licenses/GPL.
+On Debian systems, a copy of the GNU General Public License Version 2 
+may be found in /usr/share/common-licenses/GPL-2 .
 
 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>
+dahdi_monitor.c: * Copyright (C) 2001 Jim Dixon / Zapata Telephony.
+dahdi_monitor.c: * Copyright (C) 2001-2008 Digium, Inc.
+dahdi_scan.c: * Copyright (C) 2007 Digium, Inc.
+dahdi_tool.c: * Copyright (C) 2001 Jim Dixon / Zapata Telephony.
+dahdi_tool.c: * Copyright (C) 2001-2008 Digium, Inc.
+sethdlc.c: * Copyright (C) 1999 - 2002 Krzysztof Halasa <khc at pm.waw.pl>
+sethdlc.c:              "Copyright (C) 2000 - 2003 Krzysztof Halasa <khc at pm.waw.pl>\n"
 
 Files in the xpp/ subdirectory:
 
 * Written by Oron Peled <oron at actcom.co.il>
-* Copyright (C) 2004-2006, Xorcom
+* Copyright (C) 2004-2008, Xorcom
 
-opvxa1200.c:
-* OpenVox A1200P FXS/FXO Interface Driver for Zapata Telephony interface
-*
-* Modify from wctdm.c by MiaoLin<miaolin at openvox.com.cn>
+Perl programs and modules in the xpp/ directory:
+# This program is free software; you can redistribute and/or
+# modify it under the same terms as Perl itself.
 
-opvxa1200.c is available for download from 
-http://www.openvox.com.cn/members_downloads.php
-(requires no login. Does require javascript)
+Other scripts in the xpp directory:
+# 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.
 
-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
-
-
-Files in oslec/ subdirectory and oslec patches:
-Part of the Open Source Line Echo Canceller (OSLEC) project:
-http://www.rowetel.com/ucasterisk/oslec.html
-Current version downloaded from the subversion repository at:
-http://svn.rowetel.com/software/oslec/trunk
-
-oslec/echo.c: * Copyright (C) 2001, 2003 Steve Underwood, 2007 David Rowe
-oslec/oslec-ctrl-panel.sh:#  Copyright (C) 2007 David Rowe
-oslec/oslec.h:  Copyright (C) 2007 David Rowe
-oslec/oslec_wrap.c:  Copyright (C) 2007 David Rowe
-oslec/spandsp/fir.h: * Copyright (C) 2002 Steve Underwood
-oslec/spandsp/bit_operations.h: * Copyright (C) 2006 Steve Underwood
-oslec/spandsp/echo.h: * Copyright (C) 2001 Steve Underwood and 2007 David Rowe
-
-oslec/spandsp/mmx.h:
-* mmx.h
- * Copyright (C) 1997-2001 H. Dietz and R. Fisher
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * 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.
+On Debian systems, a copy of the GNU General Public License may be found in
+/usr/share/common-licenses/GPL.

Modified: dahdi-tools/trunk/debian/dahdi.doc-base.readme
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/dahdi.doc-base.readme?rev=6396&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/dahdi.doc-base.readme (original)
+++ dahdi-tools/trunk/debian/dahdi.doc-base.readme Thu Nov  6 21:16:33 2008
@@ -2,7 +2,7 @@
 Title: Zapata Telephony Interface Driver
 Author: Tzafrir Cohen
 Abstract: Basic documentation of the Zaptel telephony interface
-Section: Comm
+Section: Network/Communication
 
 Format: HTML
 Index: /usr/share/doc/zaptel/README.html

Propchange: dahdi-tools/trunk/debian/libtonezone2.0.docs
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: dahdi-tools/trunk/debian/libtonezone2.0.install
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: dahdi-tools/trunk/debian/libtonezone2.0.links
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: dahdi-tools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/rules?rev=6396&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/rules (original)
+++ dahdi-tools/trunk/debian/rules Thu Nov  6 21:16:33 2008
@@ -66,6 +66,8 @@
 	# Add here commands to install the package into debian/tmp
 	
 	$(MAKE) install-programs DESTDIR=$(CURDIR)/debian/tmp
+	# Until upstream kill this stupid thing:
+	rm -f $(CURDIR)/debian/tmp/usr/sbin/dahdi_speed
 	$(MAKE) install-libs DESTDIR=$(CURDIR)/debian/tmp
 	/sbin/ldconfig -n $(CURDIR)/debian/tmp/usr/lib
 	install -D -m 644 tonezone.h $(CURDIR)/debian/tmp/usr/include/zaptel/tonezone.h
@@ -123,7 +125,7 @@
 	dh_fixperms -a
 	dh_makeshlibs -a -V
 	dh_installdeb -a
-	dh_shlibdeps -a -ldebian/libtonezone1/usr/lib
+	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a

More information about the Pkg-voip-commits mailing list