From ce76d532db31fb6f30cbe299b1607c059c277f73 Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Tue, 7 Jun 2016 22:11:56 +0200 Subject: [PATCH] Revert "Remove unix socket, it isn't used anywhere" This reverts commit 5d6893eb92e2b1a210e5acb851d9a6fb5f3b82fb. --- .classpath | 1 + build.xml | 1 + lib/installer-exclude/unix-0.5.jar | Bin 0 -> 8323 bytes m2/jitsi-sysactivity/pom.xml | 16 ++++++++++++++++ nbproject/project.xml | 2 +- resources/install/build.xml | 3 +++ resources/install/debian/control-src.tmpl | 1 + 7 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 lib/installer-exclude/unix-0.5.jar diff --git a/.classpath b/.classpath index 5131aceea..9d0d798f7 100755 --- a/.classpath +++ b/.classpath @@ -64,6 +64,7 @@ + diff --git a/build.xml b/build.xml index 691c6832a..289f21ce7 100644 --- a/build.xml +++ b/build.xml @@ -2616,6 +2616,7 @@ org.bouncycastle.util"/> + diff --git a/lib/installer-exclude/unix-0.5.jar b/lib/installer-exclude/unix-0.5.jar new file mode 100644 index 0000000000000000000000000000000000000000..d9810d98b823702280f67791fc77b54f860abf54 GIT binary patch literal 8323 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 2.7 + + org.abstractj.libmatthew + hexdump + 0.2.1 + + + org.abstractj.libmatthew + unix + 0.5.1 + + + org.abstractj.libmatthew + libunix + 0.5.1 + so + ${project.groupId} diff --git a/nbproject/project.xml b/nbproject/project.xml index 633b4f163..ba9c55e47 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -116,7 +116,7 @@ src - lib/felix.jar:lib/bundle/commons-logging.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/dhcp4java-1.00.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/forms-1.2.1.jar:lib/installer-exclude/gdata-client-1.0.jar:lib/installer-exclude/gdata-client-meta-1.0.jar:lib/installer-exclude/gdata-contacts-3.0.jar:lib/installer-exclude/gdata-contacts-meta-3.0.jar:lib/installer-exclude/gdata-core-1.0.jar:lib/installer-exclude/google-collect-1.0-rc1.jar:lib/installer-exclude/hexdump-0.2.jar:lib/installer-exclude/httpclient-osgi-4.2.3.jar:lib/installer-exclude/httpcore-osgi-4.2.3.jar:lib/installer-exclude/ice4j.jar:lib/installer-exclude/irc-api-1.0.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jmdns.jar:lib/installer-exclude/jmyspell-core.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/jnsapi.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/json-simple-1.1.1.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/lcrypto-jdk16-143.jar:lib/installer-exclude/libdbus-java-2.7.jar:lib/installer-exclude/libjitsi.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/mac_widgets-0.9.5.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/otr4j.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar:lib/installer-exclude/sdes4j.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/installer-exclude/jna-platform.jar:lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar:lib/installer-exclude/ymsg_network_v0_67.jar:lib/installer-exclude/zrtp4j-light.jar:lib/installer-exclude/jcalendar-1.4.jar:lib/installer-exclude/bcpkix-jdk15on-151.jar:lib/installer-exclude/bcprov-jdk15on-151.jar:lib/installer-exclude/guava-15.0.jar:lib/installer-exclude/libphonenumber-5.9.jar:lib/installer-exclude/commons-lang3-3.1.jar:lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar:lib/os-specific/mac/growl4j.jar:lib/os-specific/mac/OrangeExtensions.jar:lib/os-specific/mac/installer-exclude/dock.jar + lib/felix.jar:lib/bundle/commons-logging.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/dhcp4java-1.00.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/forms-1.2.1.jar:lib/installer-exclude/gdata-client-1.0.jar:lib/installer-exclude/gdata-client-meta-1.0.jar:lib/installer-exclude/gdata-contacts-3.0.jar:lib/installer-exclude/gdata-contacts-meta-3.0.jar:lib/installer-exclude/gdata-core-1.0.jar:lib/installer-exclude/google-collect-1.0-rc1.jar:lib/installer-exclude/hexdump-0.2.jar:lib/installer-exclude/httpclient-osgi-4.2.3.jar:lib/installer-exclude/httpcore-osgi-4.2.3.jar:lib/installer-exclude/ice4j.jar:lib/installer-exclude/irc-api-1.0.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jmdns.jar:lib/installer-exclude/jmyspell-core.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/jnsapi.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/json-simple-1.1.1.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/lcrypto-jdk16-143.jar:lib/installer-exclude/libdbus-java-2.7.jar:lib/installer-exclude/libjitsi.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/mac_widgets-0.9.5.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/otr4j.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar:lib/installer-exclude/sdes4j.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/installer-exclude/jna-platform.jar:lib/installer-exclude/unix-0.5.jar:lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar:lib/installer-exclude/ymsg_network_v0_67.jar:lib/installer-exclude/zrtp4j-light.jar:lib/installer-exclude/jcalendar-1.4.jar:lib/installer-exclude/bcpkix-jdk15on-151.jar:lib/installer-exclude/bcprov-jdk15on-151.jar:lib/installer-exclude/guava-15.0.jar:lib/installer-exclude/libphonenumber-5.9.jar:lib/installer-exclude/commons-lang3-3.1.jar:lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar:lib/os-specific/mac/growl4j.jar:lib/os-specific/mac/OrangeExtensions.jar:lib/os-specific/mac/installer-exclude/dock.jar classes 1.5 diff --git a/resources/install/build.xml b/resources/install/build.xml index 956a762b4..9de80cf51 100644 --- a/resources/install/build.xml +++ b/resources/install/build.xml @@ -3311,6 +3311,9 @@ +