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

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-03-29 00:34:09 +0000 (Wed, 29 Mar 2006)
New Revision: 1498

Added:
   zaptel/trunk/debian/patches/xpp_fixes.dpatch
Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
   zaptel/trunk/debian/patches/Makefile_xpp.dpatch
Log:
* new upstream version
* Only build xpp for i386, as it currently crashes on other arches.
* Fix compilation of xpp for 2.6.14


Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-03-28 21:38:35 UTC (rev 1497)
+++ zaptel/trunk/debian/changelog	2006-03-29 00:34:09 UTC (rev 1498)
@@ -1,8 +1,12 @@
-zaptel (1:1.2.4-2) UNRELEASED; urgency=low
+zaptel (1:1.2.5-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  [Tzafrir Cohen]
+  * new upstream version
+  * Only build xpp for i386, as it currently crashes on other arches.
+  * Fix compilation of xpp for 2.6.14
 
- -- Kilian Krause <kilian at debian.org>  Mon, 20 Mar 2006 18:58:44 +0100
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 29 Mar 2006 01:41:40 +0200
 
 zaptel (1:1.2.4-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2006-03-28 21:38:35 UTC (rev 1497)
+++ zaptel/trunk/debian/patches/00list	2006-03-29 00:34:09 UTC (rev 1498)
@@ -10,6 +10,6 @@
 # touches the Makefile as well:
 echocan_env
 ukcid
-#xpp
+xpp_fixes
 #dot_version
 bristuff

Modified: zaptel/trunk/debian/patches/Makefile_xpp.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_xpp.dpatch	2006-03-28 21:38:35 UTC (rev 1497)
+++ zaptel/trunk/debian/patches/Makefile_xpp.dpatch	2006-03-29 00:34:09 UTC (rev 1498)
@@ -9,7 +9,7 @@
 diff -urNad zaptel-1.2.0/Makefile /tmp/dpep.HPVfs0/zaptel-1.2.0/Makefile
 --- zaptel-1.2.0/Makefile	2005-11-16 20:09:29.000000000 +0200
 +++ /tmp/dpep.HPVfs0/zaptel-1.2.0/Makefile	2005-11-18 02:43:44.385305666 +0200
-@@ -95,10 +95,11 @@
+@@ -95,10 +95,13 @@
  
  MOD_DESTDIR:=zaptel
  
@@ -17,10 +17,12 @@
 -
 -ifneq ($(filter xpp,${MAKECMDGOALS}),)
 -XPPMOD=xpp/
-+# Also build xpp in the subdirectory xpp/ . But only for >=2.6.12
++# Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
++# for i386. On other archs the module will probably build but panic.
 +# This line is only meaningful when this Makefile is used as kconfig for 
 +# 2.6 build
-+ifneq (,$(shell [ 0$(SUBLEVEL) -ge 12 ] && echo 1))
++
++ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] echo 1))
 +obj-m += xpp/
  endif
  

Added: zaptel/trunk/debian/patches/xpp_fixes.dpatch
===================================================================
--- zaptel/trunk/debian/patches/xpp_fixes.dpatch	2006-03-28 21:38:35 UTC (rev 1497)
+++ zaptel/trunk/debian/patches/xpp_fixes.dpatch	2006-03-29 00:34:09 UTC (rev 1498)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## xpp_fixes.dpatch by  <tzafrir at localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad zaptel-1.2.5/xpp/xpp_usb.c /tmp/dpep.f30gdf/zaptel-1.2.5/xpp/xpp_usb.c
+--- zaptel-1.2.5/xpp/xpp_usb.c	2006-03-29 01:31:11.000000000 +0200
++++ /tmp/dpep.f30gdf/zaptel-1.2.5/xpp/xpp_usb.c	2006-03-29 01:31:45.000000000 +0200
+@@ -49,7 +49,7 @@
+ 
+ /* FIXME: A flag that was deprecated at some point, and rather useless */
+ /* anyway. Only used in the code or-ed to other flags                  */
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
+ #  define URB_ASYNC_UNLINK 0
+ #endif
+ 


Property changes on: zaptel/trunk/debian/patches/xpp_fixes.dpatch
___________________________________________________________________
Name: svn:executable
   + *