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

[Mark Purcell]

Author: msp
Date: 2006-09-23 12:49:55 +0000 (Sat, 23 Sep 2006)
New Revision: 2409

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/Makefile_bristuff.dpatch
Log:
* TODO: applying patch Makefile_vzaphfc to ./ ... failed.

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-09-23 12:44:00 UTC (rev 2408)
+++ zaptel/trunk/debian/changelog	2006-09-23 12:49:55 UTC (rev 2409)
@@ -3,9 +3,9 @@
   * NOT RELEASED YET
   * New Upstream Release
   * firmware removed from wct4xxp/OCT6114-128D.ima
-  * TODO: applying patch Makefile_bristuff to ./ ... failed.
+  * TODO: applying patch Makefile_vzaphfc to ./ ... failed.
 
- -- Mark Purcell <msp at debian.org>  Sat, 23 Sep 2006 13:43:40 +0100
+ -- Mark Purcell <msp at debian.org>  Sat, 23 Sep 2006 13:49:36 +0100
 
 zaptel (1:1.2.8.dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/Makefile_bristuff.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_bristuff.dpatch	2006-09-23 12:44:00 UTC (rev 2408)
+++ zaptel/trunk/debian/patches/Makefile_bristuff.dpatch	2006-09-23 12:49:55 UTC (rev 2409)
@@ -6,21 +6,22 @@
 ## DP: Also adds two unrelated modules: opvxa1200
 
 @DPATCH@
-diff -urNad zaptel-1.2.5/Makefile /tmp/dpep.INsmJ5/zaptel-1.2.5/Makefile
---- zaptel-1.2.5/Makefile	2006-05-09 20:59:48.000000000 +0300
-+++ /tmp/dpep.INsmJ5/zaptel-1.2.5/Makefile	2006-05-09 21:00:34.000000000 +0300
-@@ -144,6 +144,10 @@
- MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
- 	 ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
-          ztd-loc # wct4xxp ztdummy
-+
+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
+@@ -129,6 +129,11 @@
+ MODULES+=ztdummy
+ endif
+ 
 +BRIMODS=cwain qozap zaphfc ztgsm
 +MODULES+=$(BRIMODS)
 +MODULES+=opvxa1200
- #MODULES+=wcfxsusb
- # build ztdummy by default for 2.6 kernels
- ifeq (${BUILDVER},linux26)
-@@ -182,6 +185,8 @@
++BINS+=ztpty
++
+ MODULESO:=$(MODULES:%=%.o)
+ MODULESKO:=$(MODULES:%=%.ko)
+ ifeq ($(BUILDVER),linux26)
+@@ -164,6 +169,8 @@
    usbfxstest fxstest fxotune fxsdump ztdiag
  UTILSO:=$(UTILS:%=%.o)
  
@@ -29,7 +30,7 @@
  all: modules $(LIBTONEZONE_SO)
  
  programs: $(BINS) $(LIBTONEZONE_SO)
-@@ -235,6 +239,29 @@
+@@ -209,6 +216,28 @@
  
  ztdummy.o: ztdummy.h
  
@@ -55,7 +56,6 @@
 +cwain.%: cwain/cwain.%
 +	cp $^ $@
 +
-+
- $(filter-out wct4xxp.o,$(MODULESO)) wct4xxp_base.o: %.o: %.c zaptel.h
+ $(MODULESO): %.o: %.c zaptel.h
  	$(CC) $(KFLAGS) -o $@ -c $<