[Pkg-voip-commits] r4545 - in /zaptel/trunk/debian: README.Debian patches/00list patches/Makefile_bristuff.dpatch rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Fri Sep 21 09:56:43 2007
New Revision: 4545

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4545
Log:
* Fix building bristuff modules.
* Mention the required bristuffed Asterisk.

Added:
    zaptel/trunk/debian/patches/Makefile_bristuff.dpatch   (with props)
Modified:
    zaptel/trunk/debian/README.Debian
    zaptel/trunk/debian/patches/00list
    zaptel/trunk/debian/rules

Modified: zaptel/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/README.Debian?rev=4545&op=diff
==============================================================================
--- zaptel/trunk/debian/README.Debian (original)
+++ zaptel/trunk/debian/README.Debian Fri Sep 21 09:56:43 2007
@@ -31,6 +31,15 @@
 
 Note, however, that beginning with Sarge, the default udev settings should 
 include those lines.
+
+
+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.
+
 
 FXOTune
 -------

Modified: zaptel/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/00list?rev=4545&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/00list (original)
+++ zaptel/trunk/debian/patches/00list Fri Sep 21 09:56:43 2007
@@ -1,4 +1,5 @@
 ztdiag
+Makefile_bristuff
 oslec_zaptel
 bristuff
 zaphfc-florz

Added: zaptel/trunk/debian/patches/Makefile_bristuff.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/Makefile_bristuff.dpatch?rev=4545&op=file
==============================================================================
--- zaptel/trunk/debian/patches/Makefile_bristuff.dpatch (added)
+++ zaptel/trunk/debian/patches/Makefile_bristuff.dpatch Fri Sep 21 09:56:43 2007
@@ -1,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile_bristuff.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: A bit of extra Makefile changes to build bristuff
+## DP: This copies them from their locations in the subdirectories to the 
+## DP: current directory. They are then added to the prereq and thus copied
+## DP: to the Zaptel tarball.
+
+ at DPATCH@
+diff -urNad zaptel-1.2.9.1.dfsg~/Makefile zaptel-1.2.9.1.dfsg/Makefile
+--- zaptel-1.2.9.1.dfsg~/Makefile	2006-09-23 13:48:37.000000000 +0100
++++ zaptel-1.2.9.1.dfsg/Makefile	2006-09-23 13:48:37.000000000 +0100
+@@ -209,6 +216,20 @@
+ 	tar -zxf mISDNuser-$(MISDNUSERVERSION).tar.gz
+ 	$(MAKE) -C mISDNuser-$(MISDNUSERVERSION) install
+ 
++# copy bristuff files from subdirectories
++# provide zaphfc.[ch] from zaphfc/zaphfc.[ch] etc. Any better way?
++ztgsm.%: ztgsm/ztgsm.%
++	cp $^ $@
++
++zaphfc.%: zaphfc/zaphfc.%
++	cp $^ $@
++
++qozap.%: qozap/qozap.%
++	cp $^ $@
++
++cwain.%: cwain/cwain.%
++	cp $^ $@
++
+ $(UTILS): %: %.o
+ 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+ 

Propchange: zaptel/trunk/debian/patches/Makefile_bristuff.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: zaptel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/rules?rev=4545&op=diff
==============================================================================
--- zaptel/trunk/debian/rules (original)
+++ zaptel/trunk/debian/rules Fri Sep 21 09:56:43 2007
@@ -43,6 +43,7 @@
 
 EXTRA_MODS=ds1x1f opvxa1200
 
+BRISTUFF_MODULES=cwain qozap zaphfc ztgsm
 MOD_EXAMPLES_DIR:=modexamples
 ifeq (1,$(USE_BRISTUFF))
   BRISTUFF_EXAMPLES:=$(MOD_EXAMPLES_DIR)/*