[Pkg-voip-commits] r2172 - in zaptel/trunk: debian debian/patches vzaphfc

Kilian Krause kilian at costa.debian.org
Thu Aug 3 11:50:31 UTC 2006 

Author: kilian
Date: 2006-08-03 11:50:29 +0000 (Thu, 03 Aug 2006)
New Revision: 2172

Added:
   zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch
   zaptel/trunk/debian/patches/dfsg_firmwarefree.dpatch
Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
   zaptel/trunk/debian/patches/Makefile_bristuff.dpatch
   zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch
   zaptel/trunk/vzaphfc/fifo.c
   zaptel/trunk/vzaphfc/vzaphfc.h
   zaptel/trunk/vzaphfc/vzaphfc_main.c
Log:
* Fix zaptel-source to build without firmware again. Required dropping
wct4xxp module. Added vzaphfc to linux-2.6 modules. (Closing #381123)
Releasing to unstable.


Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-08-03 10:19:52 UTC (rev 2171)
+++ zaptel/trunk/debian/changelog	2006-08-03 11:50:29 UTC (rev 2172)
@@ -1,13 +1,11 @@
-zaptel (1:1.2.7.dfsg-2) UNRELEASED; urgency=low
+zaptel (1:1.2.7.dfsg-2) unstable; urgency=low
 
-  [ Mark Purcell ]
-  * NOT RELEASED YET
+  * Fix get-orig-source target to make dfsg repacking work
+  * Fix zaptel-source to build without firmware again. Required dropping
+    wct4xxp module. Added vzaphfc to linux-2.6 modules. (Closes: #381123)
 
-  [ Kilian Krause ]
-  * fix get-orig-source target to make dfsg repacking work
+ -- Kilian Krause <kilian at debian.org>  Thu,  3 Aug 2006 11:48:14 +0000
 
- -- Kilian Krause <kilian at debian.org>  Thu,  3 Aug 2006 12:19:21 +0200
-
 zaptel (1:1.2.7.dfsg-1) unstable; urgency=high
 
   * Urgency high as this is blocking a security fix for asterisk

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2006-08-03 10:19:52 UTC (rev 2171)
+++ zaptel/trunk/debian/patches/00list	2006-08-03 11:50:29 UTC (rev 2172)
@@ -1,3 +1,4 @@
+dfsg_firmwarefree.dpatch
 #Makefile_deps_kern
 Makefile_deps_utils
 Makefile_uname
@@ -10,3 +11,5 @@
 ukcid
 bristuff
 bristuff_local_zaptelh
+Makefile_vzaphfc.dpatch
+

Modified: zaptel/trunk/debian/patches/Makefile_bristuff.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_bristuff.dpatch	2006-08-03 10:19:52 UTC (rev 2171)
+++ zaptel/trunk/debian/patches/Makefile_bristuff.dpatch	2006-08-03 11:50:29 UTC (rev 2172)
@@ -11,8 +11,8 @@
 +++ /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 wct4xxp wcte11xp pciradio \
-          ztd-loc # ztdummy
+ 	 ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
+          ztd-loc # wct4xxp ztdummy
 +
 +BRIMODS=cwain qozap zaphfc ztgsm
 +MODULES+=$(BRIMODS)

Added: zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch	2006-08-03 10:19:52 UTC (rev 2171)
+++ zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch	2006-08-03 11:50:29 UTC (rev 2172)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile_vzaphfc.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add vzaphfc to linux-2.6 modules
+
+ at 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$(PWD)/include  -I$(PWD)/include/oct6100api
+-obj-m:=$(MODULESO)
++obj-m:=$(MODULESO) vzaphfc/vzaphfc.o
++vzaphfc/vzaphfc-objs := vzaphfc/vzaphfc_main.o vzaphfc/fifo.o vzaphfc/lapd.o
+ wct4xxp-objs:=wct4xxp_base.o vpm450m.o
+ 
+ # Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
+


Property changes on: zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch
===================================================================
--- zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch	2006-08-03 10:19:52 UTC (rev 2171)
+++ zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch	2006-08-03 11:50:29 UTC (rev 2172)
@@ -38,38 +38,6 @@
  #include "qozap.h"
  
  #if CONFIG_PCI
-diff -urNad trunk/vzaphfc/fifo.c /tmp/dpep.u4G4Tv/trunk/vzaphfc/fifo.c
---- trunk/vzaphfc/fifo.c	2006-06-19 15:54:22.000000000 +0300
-+++ /tmp/dpep.u4G4Tv/trunk/vzaphfc/fifo.c	2006-06-27 18:24:37.470600452 +0300
-@@ -15,7 +15,11 @@
- 
- #include <linux/kernel.h>
- 
--#include <zaptel.h>
-+#ifdef STANDALONE_ZAPATA
-+#include "zaptel.h"
-+#else
-+#include <linux/zaptel.h>
-+#endif
- 
- #include "fifo.h"
- 
-diff -urNad trunk/vzaphfc/vzaphfc_main.c /tmp/dpep.u4G4Tv/trunk/vzaphfc/vzaphfc_main.c
---- trunk/vzaphfc/vzaphfc_main.c	2006-06-19 15:54:22.000000000 +0300
-+++ /tmp/dpep.u4G4Tv/trunk/vzaphfc/vzaphfc_main.c	2006-06-27 18:24:50.110883842 +0300
-@@ -33,7 +33,11 @@
- #include <linux/netdevice.h>
- #include <linux/if_arp.h>
- 
--#include <zaptel.h>
-+#ifdef STANDALONE_ZAPATA
-+#include "zaptel.h"
-+#else
-+#include <linux/zaptel.h>
-+#endif
- 
- #include "vzaphfc.h"
- #include "fifo.h"
 diff -urNad trunk/zaphfc/zaphfc.c /tmp/dpep.u4G4Tv/trunk/zaphfc/zaphfc.c
 --- trunk/zaphfc/zaphfc.c	2006-04-25 16:38:47.000000000 +0300
 +++ /tmp/dpep.u4G4Tv/trunk/zaphfc/zaphfc.c	2006-06-27 18:25:06.105038433 +0300

Added: zaptel/trunk/debian/patches/dfsg_firmwarefree.dpatch
===================================================================
--- zaptel/trunk/debian/patches/dfsg_firmwarefree.dpatch	2006-08-03 10:19:52 UTC (rev 2171)
+++ zaptel/trunk/debian/patches/dfsg_firmwarefree.dpatch	2006-08-03 11:50:29 UTC (rev 2172)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## dfsg_firmwarefree.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove wct4xxp module due to lack of firmware to compile the *.h
+
+ at DPATCH@
+diff -urNad zaptel-1.2.7.dfsg~/Makefile zaptel-1.2.7.dfsg/Makefile
+--- zaptel-1.2.7.dfsg~/Makefile	2006-07-07 18:03:59.000000000 +0000
++++ zaptel-1.2.7.dfsg/Makefile	2006-08-03 11:43:21.000000000 +0000
+@@ -98,8 +98,8 @@
+ LIBTONEZONE_SO_MINOR_VER:=0
+ 
+ MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
+-	 ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp pciradio \
+-         ztd-loc # ztdummy
++	 ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
++         ztd-loc # wct4xxp ztdummy
+ #MODULES+=wcfxsusb
+ # build ztdummy by default for 2.6 kernels
+ ifeq ($(BUILDVER),linux26)
+@@ -131,9 +131,9 @@
+ 
+ all: $(BUILDVER) $(LIBTONEZONE_SO)
+ 
+-linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS)
++linux24: prereq $(MODULESO) $(BINS)
+ 
+-linux26: prereq vpm450m_fw.h $(BINS)
++linux26: prereq $(BINS)
+ 	@echo $(KSRC)
+ 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
+ 	$(KMAKE) modules


Property changes on: zaptel/trunk/debian/patches/dfsg_firmwarefree.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: zaptel/trunk/vzaphfc/fifo.c
===================================================================
--- zaptel/trunk/vzaphfc/fifo.c	2006-08-03 10:19:52 UTC (rev 2171)
+++ zaptel/trunk/vzaphfc/fifo.c	2006-08-03 11:50:29 UTC (rev 2172)
@@ -15,7 +15,7 @@
 
 #include <linux/kernel.h>
 
-#include <zaptel.h>
+#include "../zaptel.h"
 
 #include "fifo.h"
 

Modified: zaptel/trunk/vzaphfc/vzaphfc.h
===================================================================
--- zaptel/trunk/vzaphfc/vzaphfc.h	2006-08-03 10:19:52 UTC (rev 2171)
+++ zaptel/trunk/vzaphfc/vzaphfc.h	2006-08-03 11:50:29 UTC (rev 2172)
@@ -24,7 +24,7 @@
 #include <asm/io.h>
 #include <linux/netdevice.h>
 
-#include "zaptel.h"
+#include "../zaptel.h"
 
 #define hfc_DRIVER_NAME "vzaphfc"
 #define hfc_DRIVER_PREFIX hfc_DRIVER_NAME ": "

Modified: zaptel/trunk/vzaphfc/vzaphfc_main.c
===================================================================
--- zaptel/trunk/vzaphfc/vzaphfc_main.c	2006-08-03 10:19:52 UTC (rev 2171)
+++ zaptel/trunk/vzaphfc/vzaphfc_main.c	2006-08-03 11:50:29 UTC (rev 2172)
@@ -33,7 +33,7 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 
-#include <zaptel.h>
+#include "../zaptel.h"
 
 #include "vzaphfc.h"
 #include "fifo.h"

More information about the Pkg-voip-commits mailing list