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.

11 years ago · 15fbe1a1e0
parent 67911f6421
commit 15fbe1a1e0
7 changed files with 78 additions and 14 deletions
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@ -2374,6 +2374,7 @@
                <include name="**/*"/>
                <exclude name="**/growlnotification/**"/>
                <exclude name="${extra.exclude}"/>
+                <exclude name="${extra.exclude2}"/>
                <exclude name="**/dict/**"/>
                <exclude name="**/dictaccregwizz/**"/>
                <exclude name="**/ssh/**"/>
@ -2434,6 +2435,7 @@
        <antcall target="deb-copy-jitsi">
            <param name="target.dir" value="${debian.src.dir}"/>
            <param name="extra.exclude" value="**/impl/googlecontacts/**"/>
+            <param name="extra.exclude2" value="**/plugin/thunderbird/**"/>
        </antcall>

        <property name="debianize.dir" value="${debian.src.dir}/debian" />
@ -2548,9 +2550,9 @@
                </patternset>
        </unzip>-->

-        <!-- jmork -->
+        <!-- jmork
        <unzip src="${sc.basedir}/../libsrc/jmork-1.0.5-SNAPSHOT-sources.jar"
-               dest="${debian.src.dir}/lib/src/jmork"/>
+               dest="${debian.src.dir}/lib/src/jmork"/>-->

        <!-- native -->
        <mkdir dir="${debian.src.dir}/lib/native/linux"/>
@ -2613,9 +2615,9 @@
        <delete dir="${debian.src.dir}/lib/src/gdata-java-client/java/classes"
                failonerror="false"/>
        <delete dir="${debian.src.dir}/lib/src/gdata-java-client/java/genfiles"
-                failonerror="false"/-->
-        <delete dir="${debian.src.dir}/lib/src/jmork/classes"
                failonerror="false"/>
+        <delete dir="${debian.src.dir}/lib/src/jmork/classes"
+                failonerror="false"/-->

        <!-- delete all jars -->
        <delete failonerror="false">
@ -2915,6 +2917,7 @@
                           value="A Java implementation of the irc api"/>
                <attribute name="Bundle-SymbolicName"
                           value="com.ircclouds.irc.api"/>
+                <attribute name="Bundle-ManifestVersion" value="2"/>
                <attribute name="Bundle-Version" value="1.0.0.0015-SNAPSHOT"/>

                <attribute name="Import-Package"
@ -3077,7 +3080,7 @@ com.ircclouds.irc.api.domain.messages.interfaces&quot;;version=&quot;1.0.0&quot;
             overwrite="true"
             link="${debian.src.dir}/lib/installer-exclude/hsqldb.jar"/>

-        <!-- compile and pack jmork -->
+        <!-- compile and pack jmork
        <property name="jmork.src.folder" value="${debian.src.dir}/lib/src/jmork"/>
        <mkdir dir="${jmork.src.folder}/classes" />
        <javac debug="false" optimize="true"
@ -3105,7 +3108,7 @@ com.ircclouds.irc.api.domain.messages.interfaces&quot;;version=&quot;1.0.0&quot;
        </jar>
        <symlink resource="../src/jmork/jmork-1.0.5-SNAPSHOT.jar"
                 overwrite="true"
-                 link="${debian.src.dir}/lib/installer-exclude"/>
+                 link="${debian.src.dir}/lib/installer-exclude"/>-->

        <symlink resource="/usr/share/java/junit.jar"
             overwrite="true"
@ -3909,12 +3912,12 @@ com.ircclouds.irc.api.domain.messages.interfaces&quot;;version=&quot;1.0.0&quot;
        </replace>
    </target>
    <target name="deb-bundle-slf4j">
-        <delete file="${debian.bundles.dest}/slf4j-api-1.7.5.jar" failonerror="false"/>
-        <mkdir dir="${debian.bundles.dest}/slf4j-api-1.7.5.jar/META-INF"/>
+        <delete file="${debian.bundles.dest}/slf4j-api.jar" failonerror="false"/>
+        <mkdir dir="${debian.bundles.dest}/slf4j-api.jar/META-INF"/>
        <symlink resource="/usr/share/java/slf4j-api.jar"
-                 link="${debian.bundles.dest}/slf4j-api-1.7.5.jar/slf4j-api.jar"/>
+                 link="${debian.bundles.dest}/slf4j-api.jar/slf4j-api.jar"/>
        <manifest
-            file="${debian.bundles.dest}/slf4j-api-1.7.5.jar/META-INF/MANIFEST.MF">
+            file="${debian.bundles.dest}/slf4j-api.jar/META-INF/MANIFEST.MF">
            <attribute name="Bundle-Name"
                       value="slf4j-api"/>
            <attribute name="Bundle-Description"
@ -3933,12 +3936,12 @@ com.ircclouds.irc.api.domain.messages.interfaces&quot;;version=&quot;1.0.0&quot;
                       value=".,slf4j-api.jar"/>
        </manifest>

-        <delete file="${debian.bundles.dest}/slf4j-jdk14-1.7.5.jar" failonerror="false"/>
-        <mkdir dir="${debian.bundles.dest}/slf4j-jdk14-1.7.5.jar/META-INF"/>
+        <delete file="${debian.bundles.dest}/slf4j-jdk14.jar" failonerror="false"/>
+        <mkdir dir="${debian.bundles.dest}/slf4j-jdk14.jar/META-INF"/>
        <symlink resource="/usr/share/java/slf4j-jdk14.jar"
-                 link="${debian.bundles.dest}/slf4j-jdk14-1.7.5.jar/slf4j-jdk14.jar"/>
+                 link="${debian.bundles.dest}/slf4j-jdk14.jar/slf4j-jdk14.jar"/>
        <manifest
-            file="${debian.bundles.dest}/slf4j-jdk14-1.7.5.jar/META-INF/MANIFEST.MF">
+            file="${debian.bundles.dest}/slf4j-jdk14.jar/META-INF/MANIFEST.MF">
            <attribute name="Bundle-Name"
                       value="slf4j-jdk14"/>
            <attribute name="Bundle-Description"
--- a/resources/install/debian/README.embedded-libraries
+++ b/resources/install/debian/README.embedded-libraries
@ -64,3 +64,7 @@ Reason: No Debian package.
 - swingworker
 Part of jdesktop.org JDNC project.
 Reason: No Debian package.
+
+- irc-api https://code.google.com/p/irc-api/
+IRC-API is a state(ful)/(less), (a)synchronous IRC API written in Java.
+Reason: No Debian package.
--- a/resources/install/debian/control-src.tmpl
+++ b/resources/install/debian/control-src.tmpl
@ -37,7 +37,9 @@ Build-Depends: debhelper (>= 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}
--- 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
--- a/resources/install/debian/patches/bouncycastle-1.51.patch
+++ 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,
--- a/resources/install/debian/patches/removes-jmork-deps
+++ 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 \
--- 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