[Pkg-voip-commits] r1089 - in zaptel/trunk/debian: . patches

Fri Dec 30 17:18:17 UTC 2005

Author: tzafrir-guest
Date: 2005-12-30 17:18:16 +0000 (Fri, 30 Dec 2005)
New Revision: 1089

Modified:
   zaptel/trunk/debian/README.Debian
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/control
   zaptel/trunk/debian/patches/00list
   zaptel/trunk/debian/rules
Log:
* reenabled bristuff. I believe that the patch is harmless to non-bristuffed 
  asterisk. And modules are not loaded automatically by hotplug/discover 
  anyway.
* Documentation fixes
* readded bristuff examples. with cwain this time


Modified: zaptel/trunk/debian/README.Debian
===================================================================

--- zaptel/trunk/debian/README.Debian	2005-12-30 17:10:57 UTC (rev 1088)
+++ zaptel/trunk/debian/README.Debian	2005-12-30 17:18:16 UTC (rev 1089)
@@ -7,7 +7,15 @@
 following command:
 # module-assistant a-i zaptel
 
+It may be handy (for e.g., testing purposes) to build the module packages
+for all of the kernel-header packages installed on your system. Something 
+in the lines of:
 
+  m-a -u . -t -i -f -k "`echo usr/src/kernel-headers-*`" build zaptel
+
+You can also use the environment variable TARBALL to build the modules 
+with a custom zaptel.tar.bz2 tarball with some local modifications.
+
 Using udev
 ----------
 
@@ -20,17 +28,27 @@
 # zaptel devices -- asterisk is expected to be part of 'dialout' group
 zap/*:root:dialout:660
 
-Please, read README.udev for more info about this topic.
+Note, however, that sarting from Sarge, the defualt udev settings should 
+include those lines.
 
 
 Bristuff
 --------
-Currently disabled until we have a version for HEAD.
+This version has the bristuff (0.3.0-PRE1d) of the bristuff patch and 
+kernel modules. The bristuffed modules require a bristuffed Asterisk
+to work.
+(TODO: what about standard Digium cards? can they work with a non-bristuffed 
+chn_zap?)
 
-
 fxotune
 -------
-See README.fxotune. Still needs to be integrated into the init.d script.
+fxotune is a utulity provided by Digium for fine-tuning parameters of the 
+FXO modules of their TDM cards.
 
+This package includes the fxotune binary. It will also load configuration
+from /etc/fxotune.conf if fxotune was used to tune the FXO modules. Note
+that fxotune onlt works with the newer wctdm driver of zaptel 1.2 and will
+not work ith X100P and clones.
+
 -- Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
--- 13th September 2005
+-- 30 December 2005

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2005-12-30 17:10:57 UTC (rev 1088)
+++ zaptel/trunk/debian/changelog	2005-12-30 17:18:16 UTC (rev 1089)
@@ -1,3 +1,13 @@
+zaptel (1:1.2.1-2) UNRELEASED; urgency=low
+
+  * Added bristuff 0.3.0-PRE1d patch. bristuff re-enabled.
+  * Documentation fixes
+  * Makefile_targets.dpatch is ba its small self
+  * readded bristuff examples. with cwain this time
+  * zaptel.init: a slightly different test for a zaptel timing source
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Fri, 30 Dec 2005 19:12:54 +0200
+
 zaptel (1:1.2.1-1) unstable; urgency=low
 
   * New upstream release

Modified: zaptel/trunk/debian/control
===================================================================
--- zaptel/trunk/debian/control	2005-12-30 17:10:57 UTC (rev 1088)
+++ zaptel/trunk/debian/control	2005-12-30 17:18:16 UTC (rev 1089)
@@ -43,3 +43,5 @@
  This package contains the source code for zaptel kernel module providing
  device drivers for various telephony hardware, including the Wildcard 
  series of interface cards (X100P, T400P, E400P, S100P, S100U).
+ .
+ It is normally used to build kernel modules package: m-a a-i zaptel

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2005-12-30 17:10:57 UTC (rev 1088)
+++ zaptel/trunk/debian/patches/00list	2005-12-30 17:18:16 UTC (rev 1089)
@@ -8,4 +8,4 @@
 # touches the Makefile as well:
 echocan_env
 xpp
-#bristuff-0.3.0-PRE1
+bristuff-0.3.0-PRE1d

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2005-12-30 17:10:57 UTC (rev 1088)
+++ zaptel/trunk/debian/rules	2005-12-30 17:18:16 UTC (rev 1089)
@@ -7,7 +7,7 @@
 
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=4
-USE_BRISTUFF=0
+USE_BRISTUFF=1
 
 -include /usr/share/dpatch/dpatch.make
 
@@ -28,6 +28,9 @@
 -include $(MA_DIR)/include/common-rules.make
 
 MOD_EXAMPLES_DIR:=modexamples
+ifeq (1,$(USE_BRISTUFF))
+  BRISTUFF_EXAMPLES:=$(MOD_EXAMPLES_DIR)/*
+endif
 
 kdist_clean: clean-unpatched
 
@@ -137,7 +140,7 @@
 	tar cjf debian/$(PREFIX)-source/usr/src/$(PREFIX).tar.bz2 \
 	  -C $(TARPARDIR) modules
 ifeq (1,$(USE_BRISTUFF))
-	set -e; for module in qozap zaphfc; do \
+	set -e; for module in cwain qozap zaphfc; do \
 		mkdir -p $(MOD_EXAMPLES_DIR)/$$module; \
 		cp -a $$module/*.conf* $(MOD_EXAMPLES_DIR)/$$module; \
 	done
@@ -180,7 +183,8 @@
 	
 	# should be removed, eventually. Still left for compatibility
 	dh_installinit --update-rcd-params="defaults 15 30"
-	dh_installexamples -a zaptel.conf.sample
+	dh_installexamples -a zaptel.conf.sample $(BRISTUFF_EXAMPLES)
+	
 	dh_installmodules -a
 	dh_installchangelogs -a ChangeLog
 	dh_link -a


