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

[Mark Purcell]

Author: msp
Date: 2006-09-23 12:54:09 +0000 (Sat, 23 Sep 2006)
New Revision: 2410

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch
Log:
fixup TODO

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

Modified: zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch	2006-09-23 12:49:55 UTC (rev 2409)
+++ zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch	2006-09-23 12:54:09 UTC (rev 2410)
@@ -5,16 +5,14 @@
 ## DP: Add vzaphfc to linux-2.6 modules
 
 @DPATCH@
-diff -urN zaptel/Makefile zaptel.tmp/Makefile
---- zaptel/Makefile     2006-08-01 14:28:39.000000000 +0000
-+++ zaptel.tmp/Makefile 2006-08-03 11:26:34.000000000 +0000
-@@ -142,7 +142,8 @@
- MOD_DESTDIR:=zaptel
-
- EXTRA_CFLAGS:=-I$(SUBDIRS)/include  -I$(SUBDIRS)/include/oct6100api
+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:51:02.000000000 +0100
++++ zaptel-1.2.9.1.dfsg/Makefile	2006-09-23 13:51:53.000000000 +0100
+@@ -151,6 +151,7 @@
+ 
  obj-m:=$(MODULESO)
+ obj-m+=wct4xxp/
 +obj-m += vzaphfc/
- wct4xxp-objs:=wct4xxp_base.o vpm450m.o
  
  # Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
-
+ # for i386. On other archs the module will probably build but panic.