[Pkg-voip-commits] r2750 - in asterisk/trunk/debian: backports patches

[Kilian Krause]

Author: kilian
Date: 2006-11-26 15:44:27 +0100 (Sun, 26 Nov 2006)
New Revision: 2750

Added:
   asterisk/trunk/debian/patches/fix_linux_compiler.h_include.dpatch
Modified:
   asterisk/trunk/debian/backports/edgy
   asterisk/trunk/debian/patches/backport_playdtmf.dpatch
   asterisk/trunk/debian/patches/brazilian_syntax.dpatch
   asterisk/trunk/debian/patches/correct_pid_display.dpatch
   asterisk/trunk/debian/patches/patch.CVE-2006-2898.dpatch
   asterisk/trunk/debian/patches/zap_restart.dpatch
Log:
document patching of kernel-header include more cleanly. 
add missing executable bits of dpatches.


Modified: asterisk/trunk/debian/backports/edgy
===================================================================
--- asterisk/trunk/debian/backports/edgy	2006-11-26 14:28:06 UTC (rev 2749)
+++ asterisk/trunk/debian/backports/edgy	2006-11-26 14:44:27 UTC (rev 2750)
@@ -5,6 +5,6 @@
 # Target dist: Ubuntu Edgy
 
 # Move linux/compiler.h to use asterisk/compiler.h in channels/chan_phone.c
-sed -i -e 's#linux/compiler.h#asterisk/compiler.h#' channels/chan_phone.c
+echo 'fix_linux_compiler.h_include' >>debian/patches/00list
 
 exit 0


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


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


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

Added: asterisk/trunk/debian/patches/fix_linux_compiler.h_include.dpatch
===================================================================
--- asterisk/trunk/debian/patches/fix_linux_compiler.h_include.dpatch	2006-11-26 14:28:06 UTC (rev 2749)
+++ asterisk/trunk/debian/patches/fix_linux_compiler.h_include.dpatch	2006-11-26 14:44:27 UTC (rev 2750)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_linux_compiler.h_include.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix kernel header include location for Edgy
+
+ at DPATCH@
+--- asterisk-1.2.13~dfsg.orig/channels/chan_phone.c
++++ asterisk-1.2.13~dfsg/channels/chan_phone.c
+@@ -38,7 +38,7 @@
+ /* Still use some IXJ specific stuff */
+ #include <linux/version.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+-# include <linux/compiler.h>
++# include <asterisk/compiler.h>
+ #endif
+ #include <linux/ixjuser.h>
+ 
+


Property changes on: asterisk/trunk/debian/patches/fix_linux_compiler.h_include.dpatch
___________________________________________________________________
Name: svn:executable
   + *


Property changes on: asterisk/trunk/debian/patches/patch.CVE-2006-2898.dpatch
___________________________________________________________________
Name: svn:executable
   + *


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