[Pkg-voip-commits] r2843 - in openh323/trunk/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2006-12-26 13:57:40 +0100 (Tue, 26 Dec 2006)
New Revision: 2843

Added:
   openh323/trunk/debian/patches/ixjlid.h.dpatch
Modified:
   openh323/trunk/debian/changelog
   openh323/trunk/debian/patches/00list
Log:
backport the compiler.h removal from CVS HEAD to fix compilation on Ubuntu


Modified: openh323/trunk/debian/changelog
===================================================================
--- openh323/trunk/debian/changelog	2006-12-26 12:05:18 UTC (rev 2842)
+++ openh323/trunk/debian/changelog	2006-12-26 12:57:40 UTC (rev 2843)
@@ -1,7 +1,8 @@
 openh323 (1.18.0.dfsg-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-  * ixjuser.h.dpatch: Fix compilation without compiler.h header on Ubuntu.
+  * ixjuser.h.dpatch, ixjlid.h.dpatch: Fix compilation without compiler.h
+    header on Ubuntu.
 
  -- Kilian Krause <kilian at debian.org>  Tue, 26 Dec 2006 13:03:33 +0100
 

Modified: openh323/trunk/debian/patches/00list
===================================================================
--- openh323/trunk/debian/patches/00list	2006-12-26 12:05:18 UTC (rev 2842)
+++ openh323/trunk/debian/patches/00list	2006-12-26 12:57:40 UTC (rev 2843)
@@ -2,3 +2,4 @@
 03_Makefile.in
 10_openh323u.mak
 ixjuser.h
+ixjlid.h

Added: openh323/trunk/debian/patches/ixjlid.h.dpatch
===================================================================
--- openh323/trunk/debian/patches/ixjlid.h.dpatch	2006-12-26 12:05:18 UTC (rev 2842)
+++ openh323/trunk/debian/patches/ixjlid.h.dpatch	2006-12-26 12:57:40 UTC (rev 2843)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ixjlid.h.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compilation of IXJ on Ubuntu
+
+ at DPATCH@
+diff -urN openh323.old/include/ixjlid.h openh323-1.18.0.dfsg/include/ixjlid.h
+--- openh323.old/include/ixjlid.h	2006-03-02 12:12:52.000000000 +0100
++++ openh323-1.18.0.dfsg/include/ixjlid.h	2006-12-26 13:55:31.000000000 +0100
+@@ -274,7 +274,6 @@
+ 
+ #ifdef P_LINUX
+ #include <linux/telephony.h>
+-#include <linux/compiler.h>
+ #include <linux/ixjuser.h>
+ #endif
+