[Pkg-voip-commits] r1821 - zaptel/trunk/debian/patches
Kilian Krause
kilian at costa.debian.org
Sat Jun 10 13:56:25 UTC 2006
Author: kilian
Date: 2006-06-10 13:56:24 +0000 (Sat, 10 Jun 2006)
New Revision: 1821
Removed:
zaptel/trunk/debian/patches/Makefile_deps_kern.dpatch
zaptel/trunk/debian/patches/Makefile_gendigits.dpatch
zaptel/trunk/debian/patches/Makefile_kbuild.dpatch
zaptel/trunk/debian/patches/Makefile_xpp.dpatch
zaptel/trunk/debian/patches/gendigits.dpatch
zaptel/trunk/debian/patches/xpp_fixes.dpatch
Modified:
zaptel/trunk/debian/patches/00list
Log:
everything but bristuff now updated to new version.
Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list 2006-06-10 13:51:41 UTC (rev 1820)
+++ zaptel/trunk/debian/patches/00list 2006-06-10 13:56:24 UTC (rev 1821)
@@ -1,15 +1,9 @@
-Makefile_deps_kern
Makefile_deps_utils
Makefile_uname
Makefile_targets
-Makefile_kbuild
-Makefile_xpp
# probably depends on previus Makefile_* patches (specifically: Makefile_targets)
Makefile_bristuff
# touches the Makefile as well:
echocan_env
ukcid
-xpp_fixes
bristuff
-Makefile_gendigits
-gendigits
Deleted: zaptel/trunk/debian/patches/Makefile_deps_kern.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_deps_kern.dpatch 2006-06-10 13:51:41 UTC (rev 1820)
+++ zaptel/trunk/debian/patches/Makefile_deps_kern.dpatch 2006-06-10 13:56:24 UTC (rev 1821)
@@ -1,62 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_deps.dpatch by <tzafrir at localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove unnecessary dependencies of kernel modules.
-## DP: Patch has no functional effect as the rule below already adds
-## DP: dependency on zaptel.h .
-## -- applied upstream in 1.2 branch
-
- at DPATCH@
-diff -urNad zaptel-1.2.2~/Makefile zaptel-1.2.2/Makefile
---- zaptel-1.2.2~/Makefile 2006-01-10 20:32:34.000000000 +0000
-+++ zaptel-1.2.2/Makefile 2006-01-29 16:08:28.000000000 +0000
-@@ -169,40 +169,24 @@
-
- tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
-
--tor2.o: tor2-hw.h tor2fw.h zaptel.h
--
--zaptel.o: zaptel.h digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h version.h
--
--torisa.o: zaptel.h torisa.h
--
--wcusb.o: wcusb.h zaptel.h
--
--wcfxsusb.o: wcfxsusb.h zaptel.h
--
--wcfxo.o: zaptel.h
--
--wct1xxp.o: zaptel.h
-+tor2.o: tor2-hw.h tor2fw.h
-
--wcte11xp.o: zaptel.h
-+zaptel.o: digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h version.h
-
--ztd-loc.o: zaptel.h
-+torisa.o: torisa.h
-
--wct4xxp.o: zaptel.h
-+wcusb.o: wcusb.h
-
--wctdm.o: zaptel.h wctdm.h
-+wcfxsusb.o: wcfxsusb.h
-
--wctdm24xxp.o: zaptel.h wctdm.h
-+wctdm.o: wctdm.h
-
--pciradio.o: zaptel.h radfw.h
-+wctdm24xxp.o: wctdm.h
-
--wcs3200p.o: zaptel.h
-+pciradio.o: radfw.h
-
- ztdummy.o: ztdummy.h
-
--ztdynamic.o: zaptel.h
--
--ztd-eth.o: zaptel.h
--
- $(MODULESO): %.o: %.c zaptel.h
- $(HOSTCC) $(KFLAGS) -o $@ -c $<
-
Deleted: zaptel/trunk/debian/patches/Makefile_gendigits.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_gendigits.dpatch 2006-06-10 13:51:41 UTC (rev 1820)
+++ zaptel/trunk/debian/patches/Makefile_gendigits.dpatch 2006-06-10 13:56:24 UTC (rev 1821)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefiles_gendigits.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: complementary patch to gendigits.dpatch
-## -- applied upstream in 1.2 branch
-
- at DPATCH@
-diff -urNad zaptel-1.2.5/Makefile /tmp/dpep.lRxQzx/zaptel-1.2.5/Makefile
---- zaptel-1.2.5/Makefile 2006-02-18 19:02:23.000000000 +0200
-+++ /tmp/dpep.lRxQzx/zaptel-1.2.5/Makefile 2006-03-30 23:47:34.000000000 +0300
-@@ -229,7 +229,7 @@
- $(CC) -o $@ $^
-
- tones.h: gendigits
-- ./gendigits
-+ ./gendigits >$@
-
- tor2fw.h: makefw tormenta2.rbt
- ./makefw tormenta2.rbt tor2fw > tor2fw.h
Deleted: zaptel/trunk/debian/patches/Makefile_kbuild.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_kbuild.dpatch 2006-06-10 13:51:41 UTC (rev 1820)
+++ zaptel/trunk/debian/patches/Makefile_kbuild.dpatch 2006-06-10 13:56:24 UTC (rev 1821)
@@ -1,71 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_kbuild.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use kbuild (the kernel build system) more extensively. This will
-## DP: be useful for recursive builds.
-## -- applied upstream in 1.2 branch
-
- at DPATCH@
-diff -urNad zaptel-1.2.0/Makefile /tmp/dpep.UEJtoR/zaptel-1.2.0/Makefile
---- zaptel-1.2.0/Makefile 2005-11-18 03:55:06.922498053 +0200
-+++ /tmp/dpep.UEJtoR/zaptel-1.2.0/Makefile 2005-11-18 03:59:07.152581731 +0200
-@@ -58,6 +58,10 @@
-
- KFLAGS+=-DSTANDALONE_ZAPATA
- CFLAGS+=-DSTANDALONE_ZAPATA
-+KMAKE = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
-+KMAKE_INST = $(KMAKE) \
-+ INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
-+EXTRA_CFLAGS=-I$(src)
-
- ROOT_PREFIX=
- INSTALL_PREFIX=$(DESTDIR)
-@@ -153,9 +156,9 @@
- 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
-- $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) XPPMOD=$(XPPMOD) modules
-+ $(KMAKE) modules
-
--xpp: linux26
-+obj-m += $(MODULESO)
-
- #ifneq ($(TOPDIR),)
- #include $(TOPDIR)/Rules.make
-@@ -303,7 +306,7 @@
- for x in $(MODULESKO); do \
- rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/extra/$$x ; \
- done; \
-- $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install; \
-+ $(KMAKE_INST); \
- if ! [ -f wcfxsusb.ko ]; then \
- rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.ko; \
- fi; \
-@@ -404,18 +407,22 @@
- install -m 644 tonezone.h $(INC_DIR)
- install -m 644 zaptel.h torisa.h $(INC_DIR)/linux
-
--install-modules: $(MODULES_BUILD)
-+install-modules: install-$(BUILDVER)
-+install-linux24: $(MODULES_BUILD)
- install -d $(MOD_DIR)
- install -m 644 $(MODULES_BUILD) $(MOD_DIR)
-
-+install-linux26: $(MODULESKO)
-+ $(KMAKE_INST)
-+
- clean:
- rm -f torisatool makefw tor2fw.h radfw.h
- rm -f ${BINS}
- rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
- rm -f $(TZOBJS) $(LIBTONEZONE_SO) *.lo
-- rm -f *.ko *.mod.c .*o.cmd
-- rm -f xpp/*.ko xpp/*.mod.c xpp/.*o.cmd
-- rm -f xpp/*.o xpp/*.mod.o
-+ifeq (${BUILDVER},linux26)
-+ $(KMAKE) clean
-+endif
- rm -rf .tmp_versions
- rm -f gendigits tones.h
- rm -f libtonezone*
Deleted: zaptel/trunk/debian/patches/Makefile_xpp.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_xpp.dpatch 2006-06-10 13:51:41 UTC (rev 1820)
+++ zaptel/trunk/debian/patches/Makefile_xpp.dpatch 2006-06-10 13:56:24 UTC (rev 1821)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_xpp.dpatch by <tzafrir at localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: patch the makefile to build (using kbuild on 2.6) the xpp modules
-## DP: in the subdirectory xpp/
-## -- applied upstream in 1.2 branch
-
- at DPATCH@
-diff -urNad zaptel-1.2.0/Makefile /tmp/dpep.HPVfs0/zaptel-1.2.0/Makefile
---- zaptel-1.2.0/Makefile 2005-11-16 20:09:29.000000000 +0200
-+++ /tmp/dpep.HPVfs0/zaptel-1.2.0/Makefile 2005-11-18 02:43:44.385305666 +0200
-@@ -95,10 +95,13 @@
-
- MOD_DESTDIR:=zaptel
-
--obj-m:=$(MODULESO) ${XPPMOD}
--
--ifneq ($(filter xpp,${MAKECMDGOALS}),)
--XPPMOD=xpp/
-+# 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.
-+# This line is only meaningful when this Makefile is used as kconfig for
-+# 2.6 build
-+
-+ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && echo 1))
-+obj-m += xpp/
- endif
-
- #ifneq ($(TOPDIR),)
Deleted: zaptel/trunk/debian/patches/gendigits.dpatch
===================================================================
--- zaptel/trunk/debian/patches/gendigits.dpatch 2006-06-10 13:51:41 UTC (rev 1820)
+++ zaptel/trunk/debian/patches/gendigits.dpatch 2006-06-10 13:56:24 UTC (rev 1821)
@@ -1,60 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gendigits.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix writing to be on stdout rather than some file which fails eventually.
-## -- applied upstream in 1.2 branch
-
- at DPATCH@
---- ../build-area/zaptel-1.2.5/gendigits.c 2005-11-29 19:42:08.000000000 +0100
-+++ zaptel/gendigits.c 2006-03-30 22:30:51.000000000 +0200
-@@ -95,7 +95,7 @@
- return(ulawbyte);
- }
-
--int process(FILE *f, char *label, ZAP_DIAL z[], float low_tone_level, float high_tone_level)
-+int process(char *label, ZAP_DIAL z[], float low_tone_level, float high_tone_level)
- {
- char c;
- float gain;
-@@ -119,7 +119,7 @@
- init_v2_2 = sin(-4.0 * M_PI * (z->f2 / 8000.0)) * gain;
- init_v3_2 = sin(-2.0 * M_PI * (z->f2 / 8000.0)) * gain;
-
-- fprintf(f, "\t /* %s_%c */ { %d, %d, %d, %d, %d, %d, DEFAULT_DTMF_LENGTH, &%s_silence }, \n", label, c,
-+ printf("\t /* %s_%c */ { %d, %d, %d, %d, %d, %d, DEFAULT_DTMF_LENGTH, &%s_silence }, \n", label, c,
- fac1, init_v2_1, init_v3_1,
- fac2, init_v2_2, init_v3_2,
- label);
-@@ -141,23 +141,15 @@
-
- int main(int argc, char *argv[])
- {
-- FILE *f;
--
-- if ((f = fopen("tones.h", "w"))) {
-- fprintf(f, "/* DTMF and MF tones used by the Tormenta Driver, in static tables.\n"
-+ printf("/* DTMF and MF tones used by the Tormenta Driver, in static tables.\n"
- " Generated automatically from gendigits. Do not edit by hand. */\n");
-- fprintf(f, "static struct zt_tone dtmf_tones[16] = {\n");
-- process(f, "dtmf", dtmf_dial, LEVEL_DTMF_LOW, LEVEL_DTMF_HIGH);
-- fprintf(f, "};\n\n");
-- fprintf(f, "static struct zt_tone mfv1_tones[15] = {\n");
-- process(f, "mfv1", mf_dial, LEVEL_MF, LEVEL_MF);
-- fprintf(f, "};\n\n");
-- fprintf(f, "/* END tones.h */\n");
-- fclose(f);
-- } else {
-- fprintf(stderr, "Unable to open tones.h for writing\n");
-- return 1;
-- }
-+ printf("static struct zt_tone dtmf_tones[16] = {\n");
-+ process("dtmf", dtmf_dial, LEVEL_DTMF_LOW, LEVEL_DTMF_HIGH);
-+ printf("};\n\n");
-+ printf("static struct zt_tone mfv1_tones[15] = {\n");
-+ process("mfv1", mf_dial, LEVEL_MF, LEVEL_MF);
-+ printf("};\n\n");
-+ printf("/* END tones.h */\n");
-
- return 0;
- }
Deleted: zaptel/trunk/debian/patches/xpp_fixes.dpatch
===================================================================
--- zaptel/trunk/debian/patches/xpp_fixes.dpatch 2006-06-10 13:51:41 UTC (rev 1820)
+++ zaptel/trunk/debian/patches/xpp_fixes.dpatch 2006-06-10 13:56:24 UTC (rev 1821)
@@ -1,52 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## xpp_fixes.dpatch by <tzafrir at localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes in the XPP drivers that were already merged into the stable
-## DP: Zaptel tree
-Index: xpp_usb.c
-===================================================================
---- zaptel-1.2.5/xpp/xpp_usb.c (.../tags/1.2.5/xpp) (revision 1006)
-+++ zaptel-1.2.5/xpp/xpp_usb.c (.../branches/1.2/xpp) (revision 1006)
-@@ -43,13 +43,13 @@
-
- static const char revision[] = "$Revision$";
-
--DEF_PARM(int, print_dbg, 1, "Print DBG statements"); /* must be before zap_debug.h */
-+DEF_PARM(int, print_dbg, 0, "Print DBG statements"); /* must be before zap_debug.h */
-
- #include "zap_debug.h"
-
- /* FIXME: A flag that was deprecated at some point, and rather useless */
- /* anyway. Only used in the code or-ed to other flags */
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
- # define URB_ASYNC_UNLINK 0
- #endif
-
-Index: xpp_zap.c
-===================================================================
---- zaptel-1.2.5/xpp/xpp_zap.c (.../tags/1.2.5/xpp) (revision 1006)
-+++ zaptel-1.2.5/xpp/xpp_zap.c (.../branches/1.2/xpp) (revision 1006)
-@@ -73,7 +73,7 @@
-
- static LIST_HEAD(xpd_list);
-
--DEF_PARM(int, print_dbg, 1, "Print DBG statements");
-+DEF_PARM(int, print_dbg, 0, "Print DBG statements");
- DEF_PARM(int, max_queue_len, MAX_QUEUE_LEN, "Maximum Queue Length.");
- DEF_PARM(int, xbus_err_disable_bus, 1000, "Number of errors needed to disable bus");
- DEF_PARM(int, ignore_xpds, 0, "a bitmask of xpd numbers to ignore");
-Index: card_fxs.c
-===================================================================
---- zaptel-1.2.5/xpp/card_fxs.c (.../tags/1.2.5/xpp) (revision 1006)
-+++ zaptel-1.2.5/xpp/card_fxs.c (.../branches/1.2/xpp) (revision 1006)
-@@ -31,7 +31,7 @@
- static const char rcsid[] = "$Id$";
- static const char revision[] = "$Revision$";
-
--DEF_PARM(int, print_dbg, 1, "Print DBG statements"); /* must be before zap_debug.h */
-+DEF_PARM(int, print_dbg, 0, "Print DBG statements"); /* must be before zap_debug.h */
-
- #define LINES_REGULAR 8
- #define LINES_DIGI_OUT 2
More information about the Pkg-voip-commits
mailing list