From 0dba9afa03302f67b20b718adbb690c9a087d4a4 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Mon, 1 Apr 2013 10:32:59 +0000
Subject: [PATCH] Fixes building natives using i386 debian.

---
 resources/install/debian/changelog.tmpl | 14 +++++++++++++-
 src/native/build.xml                    |  3 +++
 src/native/libjunbound/make-linux.sh    |  3 ++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/resources/install/debian/changelog.tmpl b/resources/install/debian/changelog.tmpl
index 5285352e3..879f4a717 100644
--- a/resources/install/debian/changelog.tmpl
+++ b/resources/install/debian/changelog.tmpl
@@ -1,5 +1,17 @@
 _PACKAGE_NAME_ (_VERSION_) unstable; urgency=low
 
+  * Fixes missing dbus headers when building i386 package.
+
+ -- Damian Minkov <damencho@jitsi.org>  _DATE_
+
+jitsi (2.1.4534.10649-1) unstable; urgency=low
+
+  * Removes jdic dependency.
+
+ -- Damian Minkov <damencho@jitsi.org>  Tue, 26 Mar 2013 15:07:14 +0200
+
+jitsi (2.0.4506.10553-1) unstable; urgency=low
+
   * Renames package jitsi-jni to libjitsi-jni.
   * Removes jar-not-in-usr-share overrides, not needed anymore.
   * Moves files from /usr/lib to /usr/share
@@ -7,7 +19,7 @@ _PACKAGE_NAME_ (_VERSION_) unstable; urgency=low
   * Removes embedded dnsjava package and add dependency to libdnsjava-java.
   * Removes duplicate entry in copyright.
 
- -- Damian Minkov <damencho@jitsi.org>  _DATE_
+ -- Damian Minkov <damencho@jitsi.org>  Mon, 18 Mar 2013 16:34:08 +0200
 
 _PACKAGE_NAME_ (1.1.4407.10289-1) unstable; urgency=low
 
diff --git a/src/native/build.xml b/src/native/build.xml
index 308ceb281..6a3e3ad04 100644
--- a/src/native/build.xml
+++ b/src/native/build.xml
@@ -438,6 +438,7 @@
       <compilerarg value="-I/usr/include/dbus-1.0" />
       <compilerarg value="-I/usr/lib/dbus-1.0/include" />
       <compilerarg value="-I/usr/lib/x86_64-linux-gnu/dbus-1.0/include" />
+      <compilerarg value="-I/usr/lib/i386-linux-gnu/dbus-1.0/include" />
       <compilerarg value="-m32" if="cross_32" />
       <compilerarg value="-m64" if="cross_64" />
       <compilerarg value="-I${system.JAVA_HOME}/include" />
@@ -650,6 +651,8 @@
         <compilerarg value="-I/usr/lib/gtk-2.0/include/" if="is.running.linux" />
         <compilerarg value="-I/usr/lib/x86_64-linux-gnu/glib-2.0/include" if="is.running.linux" />
         <compilerarg value="-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include" if="is.running.linux" />
+        <compilerarg value="-I/usr/lib/i386-linux-gnu/glib-2.0/include" if="is.running.linux" />
+        <compilerarg value="-I/usr/lib/i386-linux-gnu/gtk-2.0/include" if="is.running.linux" />
 
         <compilerarg value="-m32" if="cross_32" unless="is.running.macos" />
         <compilerarg value="-m64" if="cross_64" unless="is.running.macos" />
diff --git a/src/native/libjunbound/make-linux.sh b/src/native/libjunbound/make-linux.sh
index 20bb0d867..6f8a36e35 100644
--- a/src/native/libjunbound/make-linux.sh
+++ b/src/native/libjunbound/make-linux.sh
@@ -3,6 +3,7 @@ set -e
 
 out=`pwd`/build/linux
 prefix=$out/libs
+export JAVA_HOME=/usr/lib/jvm/default-java/
 
 mkdir -p $out
 mkdir -p $prefix
@@ -38,6 +39,6 @@ make
 make install
 
 cd $out
-gcc $out/../../src/net_java_sip_communicator_impl_dns_UnboundApi.cpp -fpic -shared -o libjunbound.so -I/usr/lib/jvm/java-6-openjdk/include -Wl,-Bstatic -L$prefix/lib -lunbound -lldns -I$prefix/include -Wl,-Bdynamic -lcrypto
+gcc $out/../../src/net_java_sip_communicator_impl_dns_UnboundApi.cpp -fpic -shared -o libjunbound.so -I$JAVA_HOME/include -Wl,-Bstatic -L$prefix/lib -lunbound -lldns -I$prefix/include -Wl,-Bdynamic -lcrypto
 strip libjunbound.so