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

Mark Purcell msp at costa.debian.org
Mon Oct 9 02:52:12 UTC 2006 

Author: msp
Date: 2006-10-09 02:52:10 +0000 (Mon, 09 Oct 2006)
New Revision: 2517

Added:
   zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch
Removed:
   zaptel/trunk/debian/patches/wctellxp.dpatch
Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
   zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch
   zaptel/trunk/debian/rules
Log:
* the package doesn't compile  (Closes: #390903)

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-10-08 17:43:16 UTC (rev 2516)
+++ zaptel/trunk/debian/changelog	2006-10-09 02:52:10 UTC (rev 2517)
@@ -6,8 +6,11 @@
   - zaptelh_14.dpatch: declare some zaptel 1.4 interfaces (not implemented
     anywhere, though).
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat,  7 Oct 2006 22:40:57 +0200
+  [ Mark Purcell ]
+  * the package doesn't compile  (Closes: #390903)
 
+ -- Mark Purcell <msp at debian.org>  Mon,  9 Oct 2006 09:40:48 +1000
+
 zaptel (1:1.2.9.1.dfsg-1) unstable; urgency=low
 
   * New Upstream Release

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2006-10-08 17:43:16 UTC (rev 2516)
+++ zaptel/trunk/debian/patches/00list	2006-10-09 02:52:10 UTC (rev 2517)
@@ -12,5 +12,5 @@
 bristuff
 bristuff_local_zaptelh
 Makefile_vzaphfc.dpatch
-wctellxp.dpatch
 zaptelh_14
+wct4xxp-dfsg.dpatch

Modified: zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch	2006-10-08 17:43:16 UTC (rev 2516)
+++ zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch	2006-10-09 02:52:10 UTC (rev 2517)
@@ -6,13 +6,12 @@
 
 @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 15:44:17.000000000 +0100
-+++ zaptel-1.2.9.1.dfsg/Makefile	2006-09-23 15:47:38.000000000 +0100
-@@ -150,7 +150,7 @@
- MOD_DESTDIR:=zaptel
+--- zaptel-1.2.9.1.dfsg~/Makefile	2006-10-09 10:31:49.000000000 +1000
++++ zaptel-1.2.9.1.dfsg/Makefile	2006-10-09 10:32:29.000000000 +1000
+@@ -151,6 +151,7 @@
  
  obj-m:=$(MODULESO)
--obj-m+=wct4xxp/
+ obj-m+=wct4xxp/
 +obj-m += vzaphfc/
  
  # Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 

Added: zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch
===================================================================
--- zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch	                        (rev 0)
+++ zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch	2006-10-09 02:52:10 UTC (rev 2517)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## wct4xxp-nofw.dpatch by  <msp at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP:  This patch builds the wct4xxp module without firmware support
+## DP: The module is completely usable without the firmware, as long 
+## DP: as the user does not have the optional Octasic module on their 
+## DP: TE4XXP card (and most users do not have those modules).
+
+ at DPATCH@
+diff -urNad zaptel-1.2.9.1.dfsg~/wct4xxp/Kbuild zaptel-1.2.9.1.dfsg/wct4xxp/Kbuild
+--- zaptel-1.2.9.1.dfsg~/wct4xxp/Kbuild	2006-08-27 12:02:42.000000000 +1000
++++ zaptel-1.2.9.1.dfsg/wct4xxp/Kbuild	2006-10-09 11:08:11.000000000 +1000
+@@ -12,7 +12,7 @@
+ $(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
+ $(obj)/base.o: $(src)/../zaptel.h
+ 
+-$(obj)/vpm450m.o: $(obj)/vpm450m_fw.h $(src)/vpm450m.h
++$(obj)/vpm450m.o: $(src)/vpm450m.h
+ $(obj)/vpm450m.o: $(src)/../oct612x/include/oct6100api/oct6100_api.h
+ 
+ $(obj)/vpm450m_fw.h: $(src)/OCT6114-128D.ima $(obj)/fw2h
+diff -urNad zaptel-1.2.9.1.dfsg~/wct4xxp/Makefile zaptel-1.2.9.1.dfsg/wct4xxp/Makefile
+--- zaptel-1.2.9.1.dfsg~/wct4xxp/Makefile	2006-08-27 12:27:23.000000000 +1000
++++ zaptel-1.2.9.1.dfsg/wct4xxp/Makefile	2006-10-09 11:07:27.000000000 +1000
+@@ -14,16 +13,13 @@
+ 
+ base.o: ../zaptel.h vpm450m.h wct4xxp.h
+ 
+-vpm450m.o: vpm450m.h vpm450m_fw.h ../oct612x/include/oct6100api/oct6100_api.h
++vpm450m.o: vpm450m.h 
+ 
+ wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS)
+ 	$(LD) -r -o $@ $^
+ 
+ fw2h: CFLAGS=
+ 
+-vpm450m_fw.h: OCT6114-128D.ima fw2h
+-	./fw2h $< $@
+-
+ clean:
+ 	rm -f *.o fw2h
+ 	rm -f vpm450m_fw.h


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

Deleted: zaptel/trunk/debian/patches/wctellxp.dpatch
===================================================================
--- zaptel/trunk/debian/patches/wctellxp.dpatch	2006-10-08 17:43:16 UTC (rev 2516)
+++ zaptel/trunk/debian/patches/wctellxp.dpatch	2006-10-09 02:52:10 UTC (rev 2517)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## wctellxp.dpatch by  <msp at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad zaptel-1.2.9.1.dfsg~/wcte11xp.c zaptel-1.2.9.1.dfsg/wcte11xp.c
---- zaptel-1.2.9.1.dfsg~/wcte11xp.c	2006-08-27 03:02:42.000000000 +0100
-+++ zaptel-1.2.9.1.dfsg/wcte11xp.c	2006-09-23 15:38:45.000000000 +0100
-@@ -44,7 +44,7 @@
- #endif
- 
- /* XXX: fix this */
--#include "wct4xxp/wct4xxp.h"	/* For certain definitions */
-+#include "wct4xxp.h"	/* For certain definitions */
- 
- #define WC_MAX_CARDS	32
- 

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2006-10-08 17:43:16 UTC (rev 2516)
+++ zaptel/trunk/debian/rules	2006-10-09 02:52:10 UTC (rev 2517)
@@ -8,6 +8,7 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=4
 USE_BRISTUFF=1
+export HOTPLUG_FIRMWARE=1
 
 -include /usr/share/dpatch/dpatch.make
 
@@ -129,7 +130,7 @@
 	# driver source code
 	mkdir -p $(TARDIR)/debian
 	cp Makefile .version *.c *.h *.rbt $(TARDIR)/
-	for dir in build_tools include cwain qozap vzaphfc xpp zaphfc ztgsm; do \
+	for dir in build_tools include cwain qozap vzaphfc wct4xxp xpp zaphfc ztgsm; do \
 	  if [ -d $$dir ]; then cp -r $$dir $(TARDIR); fi; \
 	done
 	dh_install -i zaptel.h torisa.h usr/include/linux/

More information about the Pkg-voip-commits mailing list