[Pkg-voip-commits] r1320 - zaptel/trunk/debian

[Tzafrir Cohen]

Hi

After xpp got merged, I went into merging the little changes from the
current xorcom 1.2 zaptel package.

Here's one:

On Thu, Feb 23, 2006 at 11:42:08AM +0000, Tzafrir Cohen wrote:
> Author: tzafrir-guest
> Date: 2006-02-23 11:42:07 +0000 (Thu, 23 Feb 2006)
> New Revision: 1320
> 
> Modified:
>    zaptel/trunk/debian/changelog
>    zaptel/trunk/debian/control
> Log:
> zaptel-source: removing unnecessary dependency on dpatch
> 
> Modified: zaptel/trunk/debian/changelog
> ===================================================================
> --- zaptel/trunk/debian/changelog	2006-02-21 22:55:58 UTC (rev 1319)
> +++ zaptel/trunk/debian/changelog	2006-02-23 11:42:07 UTC (rev 1320)
> @@ -6,11 +6,12 @@
>    * Makefile_kbuild.dpatch: modified, as it was not properly merged in
>      upstream
>    * Makefile_bristuff.dpatch: really build zaptel modules again
> -  * Makefile_xpp: fixed. TODO: limit to version >=2.6.12
> +  * Makefile_xpp: fixed. 
>    * debian/modulestest: a script for postbuild of zaptel modules from a svn
> -    build 
> +    build
> +  * zaptel-source: removing unnecessary dependency on dpatch
>  
> - -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 20 Feb 2006 20:41:23 +0200
> + -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 23 Feb 2006 09:40:47 +0200
>  
>  zaptel (1:1.2.3-2) unstable; urgency=low
>  
> 
> Modified: zaptel/trunk/debian/control
> ===================================================================
> --- zaptel/trunk/debian/control	2006-02-21 22:55:58 UTC (rev 1319)
> +++ zaptel/trunk/debian/control	2006-02-23 11:42:07 UTC (rev 1320)
> @@ -36,7 +36,7 @@
>  Package: zaptel-source
>  Section: devel
>  Architecture: all
> -Depends: debhelper (>> 4.0), module-assistant (>= 0.8.1), bzip2, dpatch (>= 2.0.9)
> +Depends: debhelper (>> 4.0), module-assistant (>= 0.8.1), bzip2
>  Recommends: zaptel
>  Suggests: rtai-source

Could anybody check if RTAI support of bristuff works? I have a feeling 
it doesn't, but I never used it anyway.

>  Description: Zapata telephony interface (source code for kernel driver)

The only remaining change at this point is: don't run ztcfg at modprobe
time. It should be the job of the init.d script. 

This is mainly to avoid false reply from modprobe which will be because
of badly-configured zaptel.conf rather than a real problem of the load
of the module. The module will remain loaded anyway and re-running
modprobe is useless so returning an error here is non-intuitive.

Index: debian/zaptel.modprobe.d
===================================================================
--- debian/zaptel.modprobe.d    (revision 1322)
+++ debian/zaptel.modprobe.d    (working copy)
@@ -1,14 +1,14 @@
 options torisa base=0xd0000
 alias char-major-196 torisa
-install tor2 /sbin/modprobe --ignore-install tor2 && /sbin/ztcfg
-install torisa /sbin/modprobe --ignore-install torisa && /sbin/ztcfg
-install wcusb /sbin/modprobe --ignore-install wcusb && /sbin/ztcfg
-install wcfxo /sbin/modprobe --ignore-install wcfxo && /sbin/ztcfg
-install wcfxs /sbin/modprobe --ignore-install wcfxs && /sbin/ztcfg
-install ztdynamic /sbin/modprobe --ignore-install ztdynamic && /sbin/ztcfg
-install ztd-eth /sbin/modprobe --ignore-install ztd-eth && /sbin/ztcfg
-install wct1xxp /sbin/modprobe --ignore-install wct1xxp && /sbin/ztcfg
-install wct4xxp /sbin/modprobe --ignore-install wct4xxp && /sbin/ztcfg
-install wcte11xp /sbin/modprobe --ignore-install wcte11xp && /sbin/ztcfg
-install zaphfc /sbin/modprobe --ignore-install zaphfc && /sbin/ztcfg
-install qozap /sbin/modprobe --ignore-install qozap && /sbin/ztcfg
+#install tor2 /sbin/modprobe --ignore-install tor2 && /sbin/ztcfg
+#install torisa /sbin/modprobe --ignore-install torisa && /sbin/ztcfg
+#install wcusb /sbin/modprobe --ignore-install wcusb && /sbin/ztcfg
+#install wcfxo /sbin/modprobe --ignore-install wcfxo && /sbin/ztcfg
+#install wcfxs /sbin/modprobe --ignore-install wcfxs && /sbin/ztcfg
+#install ztdynamic /sbin/modprobe --ignore-install ztdynamic && /sbin/ztcfg
+#install ztd-eth /sbin/modprobe --ignore-install ztd-eth && /sbin/ztcfg
+#install wct1xxp /sbin/modprobe --ignore-install wct1xxp && /sbin/ztcfg
+#install wct4xxp /sbin/modprobe --ignore-install wct4xxp && /sbin/ztcfg
+#install wcte11xp /sbin/modprobe --ignore-install wcte11xp && /sbin/ztcfg
+#install zaphfc /sbin/modprobe --ignore-install zaphfc && /sbin/ztcfg
+#install qozap /sbin/modprobe --ignore-install qozap && /sbin/ztcfg
  

-- 
Tzafrir Cohen     icq#16849755  +972-50-7952406
tzafrir.cohen at xorcom.com  http://www.xorcom.com