[Pkg-voip-commits] r1001 - zaptel/trunk/debian/patches

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2005-11-17 22:29:56 +0000 (Thu, 17 Nov 2005)
New Revision: 1001

Modified:
   zaptel/trunk/debian/patches/Makefile_uname.dpatch
Log:
removed Makefile.rej from the patch

Modified: zaptel/trunk/debian/patches/Makefile_uname.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_uname.dpatch	2005-11-17 18:53:27 UTC (rev 1000)
+++ zaptel/trunk/debian/patches/Makefile_uname.dpatch	2005-11-17 22:29:56 UTC (rev 1001)
@@ -74,37 +74,3 @@
  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