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

Mark Purcell msp at costa.debian.org
Thu Dec 1 17:44:42 UTC 2005


Author: msp
Date: 2005-12-01 17:44:40 +0000 (Thu, 01 Dec 2005)
New Revision: 1040

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/Makefile_targets.dpatch
Log:
releasing version 1:1.2.0-2

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2005-12-01 17:38:02 UTC (rev 1039)
+++ zaptel/trunk/debian/changelog	2005-12-01 17:44:40 UTC (rev 1040)
@@ -1,12 +1,9 @@
 zaptel (1:1.2.0-2) unstable; urgency=low
 
+  [ Kilian Krause ]
   * Added bristuff 0.3.0-PRE1 for Asterisk 1.2.0 support.
 
- -- Kilian Krause <kilian at debian.org>  Sat, 26 Nov 2005 10:20:12 +0000
-
-zaptel (1:1.2.0-1) unstable; urgency=low
-
-  * New upstream release
+  [Tzafrir Cohen]
   * fix Makefile_deps_kern.dpatch
   * remove .rej from Makefile.uname.dpatch
   * do install genzaptelconf man page
@@ -14,12 +11,22 @@
   * echocan_env.dpatch: allow changing the echo canceller at zaptel-modules
     build time
   * Makefile_kbuild.dpatch: use kbuild for 2.6 modules build. used for:
-  * Makefile_xpp.dpatch: (not applied by default) 
+  * Makefile_xpp.dpatch: (not applied by default)
     a small patch to enable the build of:
   * xpp.dpatch: drivers for Xorcom Asteribank
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Fri, 18 Nov 2005 04:11:52 +0200
+  [ Mark Purcell ]
+  * Build and package libtonezone.so
 
+ -- Mark Purcell <msp at debian.org>  Wed, 30 Nov 2005 16:28:51 +0000
+
+zaptel (1:1.2.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove Makefile_deps_kern.dpatch as it doesnt apply upstream
+
+ -- Mark Purcell <msp at debian.org>  Thu, 17 Nov 2005 17:50:00 +0000
+
 zaptel (1:1.2.0-rc2-1) experimental; urgency=low
 
   * New upstream release

Modified: zaptel/trunk/debian/patches/Makefile_targets.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_targets.dpatch	2005-12-01 17:38:02 UTC (rev 1039)
+++ zaptel/trunk/debian/patches/Makefile_targets.dpatch	2005-12-01 17:44:40 UTC (rev 1040)
@@ -6,11 +6,94 @@
 ## DP: allow separate installation of the programs and the modules
 
 @DPATCH@
-diff -urNad zaptel-1.2.0-beta2~/Makefile zaptel-1.2.0-beta2/Makefile
---- zaptel-1.2.0-beta2~/Makefile	2005-11-01 20:12:06.000000000 +0000
-+++ zaptel-1.2.0-beta2/Makefile	2005-11-01 20:12:06.000000000 +0000
-@@ -118,6 +118,16 @@
+diff -urNad zaptel-1.2.0~/Makefile zaptel-1.2.0/Makefile
+--- zaptel-1.2.0~/Makefile	2005-11-30 16:24:28.000000000 +0000
++++ zaptel-1.2.0/Makefile	2005-11-30 16:24:29.000000000 +0000
+@@ -7,11 +7,6 @@
+ BASEADDR=0xd0000
+ 
+ HOSTCC=gcc
+-ifeq ($(DEB_HOST_GNU_TYPE),)
+-UNAME_M:=$(shell uname -m)
+-else
+-UNAME_M:=$(DEB_HOST_GNU_TYPE)
+-endif
+ # If you want to build for a kernel other than the current kernel, set KVERS
+ ifndef KVERS
+ KVERS:=$(shell uname -r)
+@@ -24,16 +19,11 @@
+     KSRC:=$(shell for dir in $(KSRC_SEARCH_PATH); do if [ -d $$dir ]; then echo $dir; break; fi; done)
+   endif
  endif
+-KVERS_MAJ:=$(shell echo $(KVERS) | cut -d. -f1-2)
+ KINCLUDES:=$(KSRC)/include
+ 
+ CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+-ifneq (,$(findstring ppc,$(UNAME_M)))
+-CFLAGS_PPC:=-fsigned-char
+-endif
+-ifneq (,$(findstring x86_64,$(UNAME_M)))
+-CFLAGS_X86-64:=-m64
+-endif
++CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
++CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
+ CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
+ LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
+ KFLAGS=-I$(KINCLUDES) -O6
+@@ -42,15 +32,9 @@
+ ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h))
+   KFLAGS+=-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h
+ endif
+-ifneq (,$(findstring ppc,$(UNAME_M)))
+-KFLAGS_PPC:=-msoft-float -fsigned-char
+-endif
++KFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-msoft-float -fsigned-char"; fi)
+ KFLAGS+=$(KFLAGS_PPC)
+-ifeq ($(KVERS_MAJ),2.4)
+-  ifneq (,$(findstring x86_64,$(UNAME_M)))
+-    KFLAGS+=-mcmodel=kernel
+-  endif
+-endif
++KFLAGS+=$(shell if uname -r | grep -q 2.4; then if uname -m | grep -q x86_64; then echo "-mcmodel=kernel"; fi; fi)
+ 
+ #
+ # Features are now configured in zconfig.h
+@@ -65,10 +49,10 @@
+ CONFIG_FILE=$(INSTALL_PREFIX)/etc/zaptel.conf
+ CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
+ 
+-ifeq ($(KVERS_MAJ),2.4)
+-  BUILDVER:=linux24
+-else
++ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
+   BUILDVER:=linux26
++else
++  BUILDVER:=linux24
+ endif
+ 
+ ifeq ($(BUILDVER),linux26)
+@@ -93,11 +77,14 @@
+   endif
+ endif
+ 
+-# This is not related to the version that we build. Rather, to the 
+-# version that we runs. If we build for 2.4 using 2.4 headers on a 2.6
+-# system with udev mounted on /dev , no point in installing files to /dev
+-# because they'll be wiped at next reboot.
+-DYNFS=$(shell ps ax | grep -v grep | grep -qw 'devfsd\|udevd' && echo "yes")
++ifeq (${BUILDVER},linux24)
++#We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
++DYNFS:=$(shell ps ax | grep -v grep | grep -q devfsd && echo "yes")
++endif
++ifeq (${BUILDVER},linux26)
++#Tests for newer linux-2.6 udev support
++DYNFS:=$(shell ps ax | grep -v grep | grep udevd && echo "yes")
++endif
+ 
+ CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
+ ifndef CHKCONFIG
+@@ -118,21 +105,32 @@
+ endif
  MODULESO:=$(MODULES:%=%.o)
  MODULESKO:=$(MODULES:%=%.ko)
 +ifeq ($(BUILDVER),linux26)
@@ -26,20 +109,160 @@
  
  ifneq (,$(wildcard /usr/include/newt.h))
  ZTTOOL:=zttool
-@@ -132,7 +142,11 @@
+ endif
+-BINS:=ztcfg sethdlc-new ztmonitor ztspeed $(ZTTOOL) zttest fxotune
+-UTILS:=tor2ee ztspeed zttool ztmonitor sethdlc-new \
+-  usbfxstest fxstest fxotune fxsdump ztdiag
+-UTILSO:=$(UTILS:%=%.o)
++BINS=ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL) zttest fxotune
+ 
+ #PRIMARY=wcfxsusb
+ PRIMARY=torisa
  #PRIMARY=wcfxo
  PWD:=$(shell pwd)
  
 -all: $(BUILDVER) $(LIBTONEZONE_SO)
 +all: modules $(LIBTONEZONE_SO)
 +
-+programs: $(BINS)
++programs: $(BINS) $(LIBTONEZONE_SO)
 +
 +modules: $(BUILDVER)
  
  linux24: $(MODULESO) $(BINS)
  
-@@ -378,6 +392,20 @@
+@@ -153,30 +151,47 @@
+ 
+ tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
+ 
+-tor2.o: tor2-hw.h tor2fw.h
++tor2.o: tor2-hw.h tor2fw.h zaptel.h
+ 
+-zaptel.o: digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
++zaptel.o: zaptel.h digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
+ 
+-torisa.o: torisa.h
++torisa.o: zaptel.h torisa.h
+ 
+-wcusb.o: wcusb.h
++wcusb.o: wcusb.h zaptel.h
+ 
+-wcfxsusb.o: wcfxsusb.h
++wcfxsusb.o: wcfxsusb.h zaptel.h
+ 
+-wctdm.o: wctdm.h
++wcfxo.o: zaptel.h
+ 
+-wctdm24xxp.o: wctdm.h
++wct1xxp.o: zaptel.h
+ 
+-pciradio.o: radfw.h
++wcte11xp.o: zaptel.h
++
++ztd-loc.o: zaptel.h
++
++wct4xxp.o: zaptel.h
++
++wctdm.o: zaptel.h wctdm.h
++
++wctdm24xxp.o: zaptel.h wctdm.h
++
++pciradio.o: zaptel.h radfw.h
++
++wcs3200p.o: zaptel.h
+ 
+ ztdummy.o: ztdummy.h
+ 
++ztdynamic.o: zaptel.h
++
++ztd-eth.o: zaptel.h
++
+ $(MODULESO): %.o: %.c zaptel.h
+ 	$(HOSTCC) $(KFLAGS) -o $@ -c $<
+ 
+ tor2ee.o: tor2-hw.h
+ 
+-tor2ee: LDFLAGS+=-lpci
++tor2ee: tor2ee.o
++	$(CC) $(CFLAGS) -o $@ $^ -lpci
+ 
+ zonedata.lo: zonedata.c
+ 	$(CC) -c $(LCFLAGS) -o $@ $^
+@@ -196,7 +211,8 @@
+ radfw.h: makefw pciradio.rbt
+ 	./makefw pciradio.rbt radfw > radfw.h
+ 
+-gendigits: LDFLAGS+=-lm
++gendigits: gendigits.o
++	$(CC) -o $@ $^ -lm
+ 
+ zaptel.c: tones.h 
+ 
+@@ -208,10 +224,23 @@
+ 
+ ztmonitor.o: ztmonitor.c zaptel.h
+ 
+-ztspeed: CFLAGS=
+-ztspeed.o: CFLAGS=
+-zttool: LDFLAGS+=-lnewt
+-sethdlc-new.o: CFLAGS+=-I$(KINCLUDES)
++ztspeed.o: ztspeed.c
++	$(CC) -o $@ -c $^
++
++zttool: zttool.o
++	$(CC) -o $@ $^ -lnewt
++
++ztmonitor: ztmonitor.o
++	$(CC) -o $@ $^
++
++ztspeed: ztspeed.o
++	$(CC) -o $@ $^
++
++sethdlc-new: sethdlc-new.o
++	$(CC) -o $@ $^
++
++sethdlc-new.o: sethdlc-new.c
++	$(CC) -o $@ -c $(CFLAGS) -I$(KINCLUDES) $^
+ 
+ libtonezone.a: $(TZOBJS)
+ 	ar rcs libtonezone.a $^
+@@ -236,20 +265,26 @@
+ complex.o: complex.cc
+ 	$(CC) -o $@ -c $^
+ 
+-usbfxstest: LDFLAGS+=-lzap
+-fxstest: $(LIBTONEZONE_SO)
+-fxstest: LDFLAGS+=-lm
+-fxotune: LDFLAGS+=-lm
+-fxsdump: LDFLAGS+=-lm
++usbfxstest.o: usbfxstest.c
++	$(CC) -o $@ -g -c $^
++
++usbfxstest: usbfxstest.o 
++	$(CC) -o $@ $^ -lzap
++
++fxstest: fxstest.o $(LIBTONEZONE_SO)
++	$(CC) -o $@ $^ -lm
++
++fxotune: fxotune.o
++	$(CC) -o $@ $^ -lm
++
++fxsdump: fxsdump.o
++	$(CC) -o $@ $^ -lm
+ 
+ stackcheck: checkstack $(BUILDVER)
+ 	./checkstack *.o
+ 
+-$(UTILS): %: %.o
+-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+-
+-$(UTILSO): %.o: %.c
+-	$(CC) $(CFLAGS) -o $@ -c $<
++ztdiag: ztdiag.o 
++	$(CC) -o $@ $^
+ 
+ devices:
+ ifndef DYNFS
+@@ -380,6 +415,21 @@
  		echo "Not CVS";  \
  	fi
  
@@ -49,6 +272,7 @@
 +	install $(BINS) $(BIN_DIR)
 +	install -d $(LIB_DIR)
 +	install -m 755 $(LIBTONEZONE) libtonezone.a $(LIB_DIR)
++	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
 +	install -d $(INC_DIR)/linux
 +	install -m 644 tonezone.h $(INC_DIR)
 +	install -m 644 zaptel.h torisa.h $(INC_DIR)/linux




More information about the Pkg-voip-commits mailing list