From 15fbe1a1e0a76e32b2878fc46caa2865a71ed31f Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Wed, 17 Sep 2014 15:55:38 +0300 Subject: [PATCH] Provides fixes fo several issues with the package build from debian source package. Fixes starting libjitsi. Removes missing package in bundle import due to older bouncycastle. Removes jmork dependency. Fixes missing build dependencies. Fixes irc manifest file. --- resources/install/build.xml | 31 ++++++++-------- .../install/debian/README.embedded-libraries | 4 +++ resources/install/debian/control-src.tmpl | 3 ++ resources/install/debian/copyright | 4 +++ .../debian/patches/bouncycastle-1.51.patch | 13 +++++++ .../install/debian/patches/removes-jmork-deps | 35 +++++++++++++++++++ resources/install/debian/patches/series | 2 ++ 7 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 resources/install/debian/patches/bouncycastle-1.51.patch create mode 100644 resources/install/debian/patches/removes-jmork-deps diff --git a/resources/install/build.xml b/resources/install/build.xml index ca0edbcc9..8685e11aa 100644 --- a/resources/install/build.xml +++ b/resources/install/build.xml @@ -2374,6 +2374,7 @@ + @@ -2434,6 +2435,7 @@ + @@ -2548,9 +2550,9 @@ --> - + @@ -2613,9 +2615,9 @@ - + @@ -2915,6 +2917,7 @@ value="A Java implementation of the irc api"/> + - + - - + + + link="${debian.bundles.dest}/slf4j-api.jar/slf4j-api.jar"/> + file="${debian.bundles.dest}/slf4j-api.jar/META-INF/MANIFEST.MF"> - - + + + link="${debian.bundles.dest}/slf4j-jdk14.jar/slf4j-jdk14.jar"/> + file="${debian.bundles.dest}/slf4j-jdk14.jar/META-INF/MANIFEST.MF"> = 9), javahelper, libjson-simple-java (>= 1.1.1), libdbus-java, libeasymock-java, + libxt-dev, libxtst-dev, + libxv-dev, libdbus-1-dev, libunbound-dev, libxss-dev, @@ -95,6 +97,7 @@ Description: VoIP and Instant Messaging client Package: _PACKAGE_NAME_-jni Replaces: libjitsi-jni (<< 415) +Conflicts: libjitsi-jni (<< 415) Section: libs Architecture: amd64 i386 Depends: ${misc:Depends}, ${shlibs:Depends} diff --git a/resources/install/debian/copyright b/resources/install/debian/copyright index 94aa78c7a..0121f2f58 100644 --- a/resources/install/debian/copyright +++ b/resources/install/debian/copyright @@ -48,6 +48,10 @@ Copyright: 2005 Sun Microsystems, Inc. License: LGPL-2.1 +Files: lib/src/irc-api/* +Copyright: UNKNOWN: +License: Apache-2.0 + Files: lib/src/OrangeExtensions/* Copyright: 2010 Yuvi Masory diff --git a/resources/install/debian/patches/bouncycastle-1.51.patch b/resources/install/debian/patches/bouncycastle-1.51.patch new file mode 100644 index 000000000..455d58d47 --- /dev/null +++ b/resources/install/debian/patches/bouncycastle-1.51.patch @@ -0,0 +1,13 @@ +Description: Removes import that is only available in bouncycastle 1.51. +Index: jitsi/src/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf +=================================================================== +--- jitsi.orig/src/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf ++++ jitsi/src/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf +@@ -56,7 +56,6 @@ Import-Package: apple.awt, + javax.xml.transform.dom, + javax.xml.transform.stream, + org.bouncycastle.asn1, +- org.bouncycastle.asn1.bsi, + org.bouncycastle.asn1.cryptopro, + org.bouncycastle.asn1.eac, + org.bouncycastle.asn1.nist, diff --git a/resources/install/debian/patches/removes-jmork-deps b/resources/install/debian/patches/removes-jmork-deps new file mode 100644 index 000000000..bafd10963 --- /dev/null +++ b/resources/install/debian/patches/removes-jmork-deps @@ -0,0 +1,35 @@ +Description: Removes thunderbird contacts plugin. +Index: jitsi/build.xml +=================================================================== +--- jitsi.orig/build.xml ++++ jitsi/build.xml +@@ -1090,7 +1090,6 @@ + bundle-plugin-loggingutils, + bundle-provdisc,bundle-provdisc-dhcp,bundle-provdisc-mdns, + bundle-provisioning,bundle-addrbook,bundle-plugin-ldap, +- bundle-thunderbird, + bundle-plugin-contactsourceconfig,bundle-plugin-certconfig, + bundle-globalshortcut,bundle-plugin-msofficecomm,bundle-libjitsi, + bundle-customcontactactions, bundle-phonenumbercontactsource, +Index: jitsi/lib/felix.client.run.properties +=================================================================== +--- jitsi.orig/lib/felix.client.run.properties ++++ jitsi/lib/felix.client.run.properties +@@ -157,8 +157,7 @@ felix.auto.start.66= \ + reference:file:sc-bundles/systray-service.jar \ + reference:file:sc-bundles/osdependent.jar \ + reference:file:sc-bundles/ldap.jar \ +- reference:file:sc-bundles/replacement.jar \ +- reference:file:sc-bundles/jmork.jar ++ reference:file:sc-bundles/replacement.jar + + felix.auto.start.67= \ + reference:file:sc-bundles/globalshortcut.jar \ +@@ -201,7 +200,6 @@ felix.auto.start.67= \ + reference:file:sc-bundles/plugin-nimbuzzavatars.jar \ + reference:file:sc-bundles/chatconfig.jar \ + reference:file:sc-bundles/addrbook.jar \ +- reference:file:sc-bundles/thunderbook.jar \ + reference:file:sc-bundles/plugin-msofficecomm.jar \ + reference:file:sc-bundles/plugin-ldap.jar \ + reference:file:sc-bundles/plugin-contactsourceconfig.jar \ diff --git a/resources/install/debian/patches/series b/resources/install/debian/patches/series index 766160f3e..6bdfbf14a 100644 --- a/resources/install/debian/patches/series +++ b/resources/install/debian/patches/series @@ -3,3 +3,5 @@ remove-dns-java-logger.patch removes-gdata-deps encoding.patch jdk8 +bouncycastle-1.51.patch +removes-jmork-deps