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

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2007-01-20 23:11:09 +0100 (Sat, 20 Jan 2007)
New Revision: 3044

Added:
   zaptel/trunk/debian/patches/xpp_all_platforms.dpatch
   zaptel/trunk/debian/patches/ztpty_ioctl_warn.dpatch
Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
Log:
* Do build xpp/ on all platforms, not just i386.
* Fix a silly ztpty compile warning.


Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2007-01-20 20:16:12 UTC (rev 3043)
+++ zaptel/trunk/debian/changelog	2007-01-20 22:11:09 UTC (rev 3044)
@@ -2,6 +2,9 @@
 
   [Tzafrir Cohen]
   * Bristuff 0.3.0-PRE-1x 
+  * Remove man pages from debian/, as they are included in upstream.
+  * Do build xpp/ on all platforms, not just i386.
+  * Fix a silly ztpty compile warning.
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 20 Jan 2007 21:16:04 +0200
 

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2007-01-20 20:16:12 UTC (rev 3043)
+++ zaptel/trunk/debian/patches/00list	2007-01-20 22:11:09 UTC (rev 3044)
@@ -10,7 +10,9 @@
 bristuff
 bristuff_local_zaptelh
 Makefile_vzaphfc.dpatch
+ztpty_ioctl_warn
 wct4xxp-dfsg.dpatch
 dbug391840.dpatch
 Makefile_hostcc
 xpp_udev
+xpp_all_platforms

Added: zaptel/trunk/debian/patches/xpp_all_platforms.dpatch
===================================================================
--- zaptel/trunk/debian/patches/xpp_all_platforms.dpatch	2007-01-20 20:16:12 UTC (rev 3043)
+++ zaptel/trunk/debian/patches/xpp_all_platforms.dpatch	2007-01-20 22:11:09 UTC (rev 3044)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## xpp_all_platforms.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build the xpp/ subdirectory on all platforms.
+## DP: Does not remove misleading text as to not conflict with Makefile_zaphfc
+## DP: Applied by upstream in 1.4 .
+
+ at DPATCH@
+diff -urNad zaptel-1.2.12~dfsg~/Makefile zaptel-1.2.12~dfsg/Makefile
+--- zaptel-1.2.12~dfsg~/Makefile	2007-01-20 22:27:28.000000000 +0200
++++ zaptel-1.2.12~dfsg/Makefile	2007-01-20 22:27:42.000000000 +0200
+@@ -126,9 +126,7 @@
+ # This line is only meaningful when this Makefile is used as kconfig for 
+ # 2.6 build
+ 
+-ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && echo 1))
+ obj-m+=xpp/
+-endif
+ 
+ ifneq (,$(wildcard /usr/include/newt.h))
+ ZTTOOL:=zttool


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

Added: zaptel/trunk/debian/patches/ztpty_ioctl_warn.dpatch
===================================================================
--- zaptel/trunk/debian/patches/ztpty_ioctl_warn.dpatch	2007-01-20 20:16:12 UTC (rev 3043)
+++ zaptel/trunk/debian/patches/ztpty_ioctl_warn.dpatch	2007-01-20 22:11:09 UTC (rev 3044)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ztpty_ioctl_warn.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Hush a compilation warning of ztpty.
+
+ at DPATCH@
+diff -urNad zaptel-1.2.12~dfsg~/ztpty.c zaptel-1.2.12~dfsg/ztpty.c
+--- zaptel-1.2.12~dfsg~/ztpty.c	2007-01-20 22:22:01.000000000 +0200
++++ zaptel-1.2.12~dfsg/ztpty.c	2007-01-20 22:22:23.000000000 +0200
+@@ -7,6 +7,7 @@
+ #include <sys/time.h>
+ #include <sys/signal.h>
+ #include <sys/select.h>
++#include <sys/ioctl.h>
+ #include <math.h>
+ #include "zaptel.h"
+ 


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