From ba7971208ea5f3b84f02e99f2c3b5c51f23496f9 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Fri, 4 Jul 2014 17:31:47 +0300
Subject: [PATCH] Updates deb-src build to avoid duplicate files(g722) and adds
 statement that package jitsi-jni replaces old libjitsi-jni.

---
 resources/install/build.xml               | 1 -
 resources/install/debian/control-src.tmpl | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/install/build.xml b/resources/install/build.xml
index c54bf44d5..49e23b746 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -3138,7 +3138,6 @@
         <antcall target="unbound"/>
         <antcall target="hwaddressretriever"/>
 
-        <antcall target="g722"/>
     </target>
 
     <!-- target to rebuild the jna bundle reusing debian package -->
diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl
index de41103d9..ac9be5b57 100644
--- a/resources/install/debian/control-src.tmpl
+++ b/resources/install/debian/control-src.tmpl
@@ -70,8 +70,8 @@ Package: _PACKAGE_NAME_
 Architecture: all
 Depends: ${misc:Depends},
          _PACKAGE_NAME_-jni (>= ${source:Version}),
-         libjitsi,
-         libjitsi-jni,
+         libjitsi (>= 415-0),
+         libjitsi-jni (>= 415-0),
          default-jre | java6-runtime,
          libunixsocket-java,
          libhttpcore-java,
@@ -103,6 +103,7 @@ Description: VoIP and Instant Messaging client
  messaging protocols such as SIP/SIMPLE, XMPP/Jabber, AIM/ICQ, Yahoo and others.
 
 Package: _PACKAGE_NAME_-jni
+Replaces: libjitsi-jni (<< 415)
 Section: libs
 Architecture: amd64 i386
 Depends: ${misc:Depends}, ${shlibs:Depends}