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

[Mark Purcell]

Author: msp
Date: 2006-12-02 15:33:50 +0100 (Sat, 02 Dec 2006)
New Revision: 2776

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/control.modules.in
   zaptel/trunk/debian/patches/Makefile_uname.dpatch
Log:
  - Fixes: vzaphfc: error: 'CHECKSUM_HW' undeclared (Closes: #386498)
* Update debian/patches/Makefile_uname.dpatch to force -O2
  - Fixes:  Cannot initiate a call to BRI (Closes: #386052)
* Remove Depends: zaptel from debian/control.modules.in
  - please don't depend on zaptel (Closes: #391826)

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-12-02 14:05:02 UTC (rev 2775)
+++ zaptel/trunk/debian/changelog	2006-12-02 14:33:50 UTC (rev 2776)
@@ -1,7 +1,5 @@
-zaptel (1:1.2.11.dfsg-1) UNRELEASED; urgency=low
+zaptel (1:1.2.11.dfsg-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-
   [ Tzafrir Cohen ]
   * Reverting my changes from 1:1.2.9.1.dfsg-2. Moved to the experimental
     branch.
@@ -15,12 +13,17 @@
     - Fixes: Fails to build with pristine upstream kernel, very recent version
     (Closes: #400705)
     - Fixes: Please package version 1.2.11 (Closes: #399634)
+    - Fixes: vzaphfc: error: 'CHECKSUM_HW' undeclared (Closes: #386498)
   * Cleanup debian/patches/wct4xxp-dfsg.dpatch
   * debian/rules call dh_installmodules from binary_modules:
     - Fixes:  I had to do depmod -a manually after doing m-a a-i zaptel (Closes:
     #332787)
+  * Update debian/patches/Makefile_uname.dpatch to force -O2
+    - Fixes:  Cannot initiate a call to BRI (Closes: #386052)
+  * Remove Depends: zaptel from debian/control.modules.in
+    - please don't depend on zaptel (Closes: #391826)
 
- -- Mark Purcell <msp at debian.org>  Sat,  2 Dec 2006 13:56:26 +0000
+ -- Mark Purcell <msp at debian.org>  Sat,  2 Dec 2006 14:33:30 +0000
 
 zaptel (1:1.2.10.dfsg-2) unstable; urgency=low
 

Modified: zaptel/trunk/debian/control.modules.in
===================================================================
--- zaptel/trunk/debian/control.modules.in	2006-12-02 14:05:02 UTC (rev 2775)
+++ zaptel/trunk/debian/control.modules.in	2006-12-02 14:33:50 UTC (rev 2776)
@@ -8,7 +8,6 @@
 
 Package: zaptel-modules-_KVERS_
 Architecture: any
-Depends: zaptel
 Provides: zaptel-modules
 Description: zaptel modules for Linux (kernel _KVERS_).
  This package contains the set of loadable kernel modules for the

Modified: zaptel/trunk/debian/patches/Makefile_uname.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_uname.dpatch	2006-12-02 14:05:02 UTC (rev 2775)
+++ zaptel/trunk/debian/patches/Makefile_uname.dpatch	2006-12-02 14:33:50 UTC (rev 2776)
@@ -8,13 +8,13 @@
 ## DP: no. 2.6.2-4) and will also consider 2.5 as linux26 BUILDVER .
 
 @DPATCH@
-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)
+diff -urNad zaptel-1.2.11.dfsg~/Makefile zaptel-1.2.11.dfsg/Makefile
+--- zaptel-1.2.11.dfsg~/Makefile	2006-12-02 14:12:47.000000000 +0000
++++ zaptel-1.2.11.dfsg/Makefile	2006-12-02 14:12:54.000000000 +0000
+@@ -11,6 +11,11 @@
  
+ INSTALL_PREFIX:=$(DESTDIR)
+ 
 +ifeq ($(DEB_HOST_GNU_TYPE),)
 +UNAME_M:=$(shell uname -m)
 +else
@@ -23,16 +23,17 @@
  # If you want to build for a kernel other than the current kernel, set KVERS
  ifndef KVERS
  KVERS:=$(shell uname -r)
-@@ -21,11 +26,16 @@
+@@ -23,11 +28,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. -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)
++CFLAGS+=-I. -O2 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
 +ifneq (,$(findstring ppc,$(UNAME_M)))
 +CFLAGS_PPC:=-fsigned-char
 +endif
@@ -42,7 +43,7 @@
  CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
  LCFLAGS:=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
  KFLAGS:=-I$(KINCLUDES) -O6
-@@ -34,9 +44,15 @@
+@@ -36,9 +46,15 @@
  ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h))
    KFLAGS+=-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h
  endif
@@ -60,7 +61,7 @@
  
  #
  # Features are now configured in zconfig.h
-@@ -53,10 +69,10 @@
+@@ -52,10 +68,10 @@
  CONFIG_FILE:=$(INSTALL_PREFIX)/etc/zaptel.conf
  CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"