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

[Mark Purcell]

Author: msp
Date: 2005-11-09 21:25:40 +0000 (Wed, 09 Nov 2005)
New Revision: 973

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/Makefile_uname.dpatch
Log:
* Update Makefile_uname.dpatch

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2005-11-09 21:21:24 UTC (rev 972)
+++ zaptel/trunk/debian/changelog	2005-11-09 21:25:40 UTC (rev 973)
@@ -1,8 +1,9 @@
 zaptel (1:1.2.0-rc1-1) UNRELEASED; urgency=low
 
   * (NOT RELEASED YET) New upstream release
+  * Update Makefile_uname.dpatch
 
- -- Mark Purcell <msp at debian.org>  Wed,  9 Nov 2005 20:04:06 +0000
+ -- Mark Purcell <msp at debian.org>  Wed,  9 Nov 2005 21:25:05 +0000
 
 zaptel (1:1.2.0-beta2-3) experimental; urgency=low
 

Modified: zaptel/trunk/debian/patches/Makefile_uname.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_uname.dpatch	2005-11-09 21:21:24 UTC (rev 972)
+++ zaptel/trunk/debian/patches/Makefile_uname.dpatch	2005-11-09 21:25:40 UTC (rev 973)
@@ -8,9 +8,9 @@
 ## DP: no. 2.6.2-4) and will also consider 2.5 as linux26 BUILDVER .
 
 @DPATCH@
-diff -urNad zaptel-1.2.0-0beta1/Makefile /tmp/dpep.bCdlfz/zaptel-1.2.0-0beta1/Makefile
---- zaptel-1.2.0-0beta1/Makefile	2005-09-10 21:02:05.516656400 +0300
-+++ /tmp/dpep.bCdlfz/zaptel-1.2.0-0beta1/Makefile	2005-09-10 21:03:04.254605145 +0300
+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 @@
  BASEADDR=0xd0000
  
@@ -39,7 +39,7 @@
 +ifneq (,$(findstring x86_64,$(UNAME_M)))
 +CFLAGS_X86-64:=-m64
 +endif
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X64-64)
+ CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
  LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
  KFLAGS=-I$(KINCLUDES) -O6
 @@ -32,9 +42,15 @@
@@ -74,3 +74,37 @@
  endif
  
  ifeq ($(BUILDVER),linux26)
+diff -urNad zaptel-1.2.0-rc1~/Makefile.rej zaptel-1.2.0-rc1/Makefile.rej
+--- zaptel-1.2.0-rc1~/Makefile.rej	1970-01-01 01:00:00.000000000 +0100
++++ zaptel-1.2.0-rc1/Makefile.rej	2005-11-09 21:22:00.000000000 +0000
+@@ -0,0 +1,30 @@
++***************
++*** 19,29 ****
++      KSRC:=$(shell for dir in $(KSRC_SEARCH_PATH); do if [ -d $$dir ]; then echo $dir; break; fi; done)
++    endif
++  endif
++  KINCLUDES:=$(KSRC)/include
++  
++  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)
++  CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X64-64)
++  LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
++  KFLAGS=-I$(KINCLUDES) -O6
++--- 24,39 ----
++      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+=$(CFLAGS_PPC) $(CFLAGS_X64-64)
++  LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
++  KFLAGS=-I$(KINCLUDES) -O6