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

[Mark Purcell]

Author: msp
Date: 2006-09-23 12:44:00 +0000 (Sat, 23 Sep 2006)
New Revision: 2408

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/Makefile_uname.dpatch
Log:
* TODO: applying patch Makefile_bristuff to ./ ... failed.

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-09-22 08:40:19 UTC (rev 2407)
+++ zaptel/trunk/debian/changelog	2006-09-23 12:44:00 UTC (rev 2408)
@@ -3,9 +3,9 @@
   * NOT RELEASED YET
   * New Upstream Release
   * firmware removed from wct4xxp/OCT6114-128D.ima
-  * TODO: applying patch Makefile_uname to ./ ... failed.
+  * TODO: applying patch Makefile_bristuff to ./ ... failed.
 
- -- Mark Purcell <msp at debian.org>  Fri, 15 Sep 2006 19:07:53 +0100
+ -- Mark Purcell <msp at debian.org>  Sat, 23 Sep 2006 13:43:40 +0100
 
 zaptel (1:1.2.8.dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/Makefile_uname.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_uname.dpatch	2006-09-22 08:40:19 UTC (rev 2407)
+++ zaptel/trunk/debian/patches/Makefile_uname.dpatch	2006-09-23 12:44:00 UTC (rev 2408)
@@ -8,10 +8,10 @@
 ## DP: no. 2.6.2-4) and will also consider 2.5 as linux26 BUILDVER .
 
 @DPATCH@
-diff -urNad zaptel-1.2.0-rc1~/Makefile zaptel-1.2.0-rc1/Makefile
---- zaptel-1.2.0-rc1~/Makefile	2005-11-09 21:22:00.000000000 +0000
-+++ zaptel-1.2.0-rc1/Makefile	2005-11-09 21:24:20.000000000 +0000
-@@ -7,6 +7,11 @@
+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:40:07.000000000 +0100
++++ zaptel-1.2.9.1.dfsg/Makefile	2006-09-23 13:42:13.000000000 +0100
+@@ -9,6 +9,11 @@
  HOSTCC=gcc
  PWD:=$(shell pwd)
  
@@ -23,14 +23,14 @@
  # If you want to build for a kernel other than the current kernel, set KVERS
  ifndef KVERS
  KVERS:=$(shell uname -r)
-@@ -19,11 +24,16 @@
-     KSRC:=$(shell for dir in $(KSRC_SEARCH_PATH); do if [ -d $$dir ]; then echo $dir; break; fi; done)
+@@ -21,11 +26,16 @@
+     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. -Iinclude -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+ CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
 -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)
 +ifneq (,$(findstring ppc,$(UNAME_M)))
@@ -40,9 +40,9 @@
 +CFLAGS_X86-64:=-m64
 +endif
  CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
- LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
- KFLAGS=-I$(KINCLUDES) -O6
-@@ -32,9 +42,15 @@
+ LCFLAGS:=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
+ KFLAGS:=-I$(KINCLUDES) -O6
+@@ -34,9 +44,15 @@
  ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h))
    KFLAGS+=-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h
  endif
@@ -60,8 +60,8 @@
  
  #
  # Features are now configured in zconfig.h
-@@ -49,10 +65,10 @@
- CONFIG_FILE=$(INSTALL_PREFIX)/etc/zaptel.conf
+@@ -53,10 +69,10 @@
+ CONFIG_FILE:=$(INSTALL_PREFIX)/etc/zaptel.conf
  CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
  
 -ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
@@ -73,4 +73,4 @@
 +  BUILDVER:=linux26
  endif
  
- ifeq ($(BUILDVER),linux26)
+ ifeq ($(BUILDVER),linux24)