diff options
| author | Damian Minkov <damencho@jitsi.org> | 2014-07-04 17:31:47 +0300 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2014-07-04 17:31:47 +0300 |
| commit | ba7971208ea5f3b84f02e99f2c3b5c51f23496f9 (patch) | |
| tree | e5d1c2ee2cf73a99a6f1fe344845833f9baec828 /resources | |
| parent | de4cbe96b3f10c50b603791e2785f46f48569a2e (diff) | |
| download | jitsi-ba7971208ea5f3b84f02e99f2c3b5c51f23496f9.zip jitsi-ba7971208ea5f3b84f02e99f2c3b5c51f23496f9.tar.gz jitsi-ba7971208ea5f3b84f02e99f2c3b5c51f23496f9.tar.bz2 | |
Updates deb-src build to avoid duplicate files(g722) and adds statement that package jitsi-jni replaces old libjitsi-jni.
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/install/build.xml | 1 | ||||
| -rw-r--r-- | 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 c54bf44..49e23b7 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 de41103..ac9be5b 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} |