diff --git a/resources/install/build.xml b/resources/install/build.xml
index eaa060dd0..ba566c822 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -2296,8 +2296,11 @@
token="/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar"
value="$LIBPATH/felix.jar"/>
+ token="-common"
+ value="/sc-bundles"/>
+
@@ -3237,13 +3240,13 @@
-
-
+
+
+ destfile="${debian.bundles.common.dest}/util.jar/util.jar">
@@ -3251,7 +3254,7 @@
+ destfile="${debian.bundles.common.dest}/util.jar/launchutils.jar">
@@ -3264,16 +3267,17 @@
+ todir="${debian.bundles.common.dest}/util.jar/META-INF"/>
+
Bundle-ClassPath: .,util.jar,dnsjava.jar
@@ -3282,6 +3286,11 @@
felix.auto.start.14= reference:file:/usr/share/java/dnsjava.jar
+
+ reference:file:/usr/share/jitsi-common/util.jar
+
+
@@ -3416,16 +3425,16 @@
-
+
-
-
+
+
@@ -3433,19 +3442,25 @@
+ todir="${debian.bundles.common.dest}/smacklib.jar/META-INF"/>
+
Bundle-ClassPath: .,smacklib.jar,xpp3.jar,jzlib.jar
+
+ reference:file:/usr/share/jitsi-common/smacklib.jar
+
+
@@ -3503,7 +3518,7 @@
eol="crlf"
fixlastline="true">Bundle-ClassPath: .,bcprov.jar
-
+
@@ -3579,35 +3594,40 @@
-
-
-
-
+
+
+
+
+ destfile="${debian.bundles.common.dest}/libjitsi.jar/libjitsi-impl.jar">
+ todir="${debian.bundles.common.dest}/libjitsi.jar/META-INF"/>
+
Bundle-ClassPath: .,libjitsi-impl.jar,fmj.jar,libjitsi.jar,bcpkix.jar
+
+ reference:file:/usr/share/jitsi-common/libjitsi.jar
+
-
-
-
+
+
+
+ destfile="${debian.bundles.common.dest}/netaddr.jar/netaddr.jar">
+ todir="${debian.bundles.common.dest}/netaddr.jar/META-INF"/>
+
Bundle-ClassPath: .,netaddr.jar,ice4j.jar,weupnp.jar
+
+ reference:file:/usr/share/jitsi-common/netaddr.jar
+
+
+
+
+
+ reference:file:/usr/share/jitsi-common/protocol-jabber.jar
+
+
+
+
+ reference:file:/usr/share/jitsi-common/protocol-media.jar
+
+
+
+
+ reference:file:/usr/share/jitsi-common/protocol.jar
+
+
+
+ reference:file:/usr/share/jitsi-common/configuration.jar
+
+
+
+
+ reference:file:/usr/share/jitsi-common/dns.jar
+
+
+
+
+ reference:file:/usr/share/jitsi-common/dnsservice.jar
+
+
+
+
+ reference:file:/usr/share/jitsi-common/fileaccess.jar
+
+
+
+
+ reference:file:/usr/share/jitsi-common/packetlogging.jar
+
+
+
+
+ reference:file:/usr/share/jitsi-common/resourcemanager.jar
+
+
+
+
+ reference:file:/usr/share/jitsi-common/ui-service.jar
+
+
diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl
index febd842f9..04c40febf 100644
--- a/resources/install/debian/control-src.tmpl
+++ b/resources/install/debian/control-src.tmpl
@@ -72,6 +72,7 @@ Package: _PACKAGE_NAME_
Architecture: all
Depends: ${misc:Depends},
_PACKAGE_NAME_-jni (>= ${source:Version}),
+ _PACKAGE_NAME_-common (>= ${source:Version}),
libjitsi (>= 415-0),
libjitsi-jni (>= 415-0),
default-jre | java6-runtime,
@@ -79,7 +80,6 @@ Depends: ${misc:Depends},
libhttpcore-java,
liblog4j1.2-java,
libjmdns-java,
- libdnsjava-java,
libmac-widgets-java,
libfelix-main-java,
libfelix-framework-java,
@@ -90,10 +90,7 @@ Depends: ${misc:Depends},
libcommons-lang3-java,
liblaf-widget-java,
libdbus-java,
- libxpp3-java,
- libjzlib-java,
libbcprov-java,
- libbcpkix-java,
libweupnp-java,
libjna-java,
libjgoodies-forms-java,
@@ -119,3 +116,15 @@ Description: _APP_NAME_ JNI library
Native binaries used to render the video and detect network configuration
changes. Binaries for audio codecs like opus and g722. Global shortcuts,
notifications and hid devices control.
+
+Package: _PACKAGE_NAME_-common
+Section: libs
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ libdnsjava-java,
+ libxpp3-java,
+ libjzlib-java,
+ libbcpkix-java
+Description: _APP_NAME_ JNI library
+ These are the common files for _APP_NAME_ the Java VoIP
+ and Instant Messaging client.
diff --git a/resources/install/debian/jitsi.sh.tmpl b/resources/install/debian/jitsi.sh.tmpl
index 877b32b6d..de159db8d 100644
--- a/resources/install/debian/jitsi.sh.tmpl
+++ b/resources/install/debian/jitsi.sh.tmpl
@@ -28,8 +28,9 @@ fi
javabin=`which java`
SCDIR=/usr/share/_PACKAGE_NAME_
+JITSI_COMMON_DIR=/usr/share/_PACKAGE_NAME_-common
LIBPATH=$SCDIR/lib
-CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar/launchutils.jar:$LIBPATH
+CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$SCDIR/sc-bundles/sc-launcher.jar:$JITSI_COMMON_DIR/util.jar/launchutils.jar:$LIBPATH
FELIX_CONFIG=$LIBPATH/felix.client.run.properties
LOG_CONFIG=$LIBPATH/logging.properties
COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=/usr/lib/jni -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG $SPLASH_ARG net.java.sip.communicator.launcher.SIPCommunicator"
diff --git a/resources/install/debian/package.install.tmpl b/resources/install/debian/package.install.tmpl
index 954b303b5..d1b9787f2 100644
--- a/resources/install/debian/package.install.tmpl
+++ b/resources/install/debian/package.install.tmpl
@@ -1,9 +1,9 @@
-debian/_PACKAGE_NAME_-32.xpm usr/share/pixmaps/
-debian/_PACKAGE_NAME_-16.xpm usr/share/pixmaps/
-debian/_PACKAGE_NAME_.svg usr/share/pixmaps/
-debian/_PACKAGE_NAME_.desktop usr/share/applications/
-resources/install/logging.properties usr/share/_PACKAGE_NAME_/lib/
-lib/felix.client.run.properties usr/share/_PACKAGE_NAME_/lib/
-lib/jitsi-defaults.properties usr/share/_PACKAGE_NAME_/lib/
+debian/_PACKAGE_NAME_-32.xpm usr/share/pixmaps
+debian/_PACKAGE_NAME_-16.xpm usr/share/pixmaps
+debian/_PACKAGE_NAME_.svg usr/share/pixmaps
+debian/_PACKAGE_NAME_.desktop usr/share/applications
+resources/install/logging.properties usr/share/_PACKAGE_NAME_/lib
+lib/felix.client.run.properties usr/share/_PACKAGE_NAME_/lib
+lib/jitsi-defaults.properties usr/share/_PACKAGE_NAME_/lib
sc-bundles/*.jar usr/share/_PACKAGE_NAME_/sc-bundles
debian/sh/_PACKAGE_NAME_ usr/bin
diff --git a/resources/install/debian/rules.tmpl b/resources/install/debian/rules.tmpl
index 5f393c36e..a960b7d37 100755
--- a/resources/install/debian/rules.tmpl
+++ b/resources/install/debian/rules.tmpl
@@ -21,7 +21,7 @@ override_dh_install-indep:
# make and install the debian specific bundles
# use the prebuild and installed bundles to extract/modify and use the
# exising debian java packages
- $(ANT) -file build.xml -Ddebian.bundles.dest=debian/$(PACKAGE_NAME)/usr/share/$(PACKAGE_NAME)/sc-bundles deb-bundle-jna deb-bundle-util deb-bundle-sysactivitynotifications deb-bundle-swing-ui deb-bundle-json deb-bundle-smacklib deb-bundle-jmdnslib deb-bundle-desktoputil deb-bundle-bouncycastle deb-bundle-plugin-accountinfo deb-bundle-commons-lang deb-bundle-hsqldb deb-libjitsi-deps deb-bundle-httpmime
+ $(ANT) -file build.xml -Ddebian.bundles.dest=debian/$(PACKAGE_NAME)/usr/share/$(PACKAGE_NAME)/sc-bundles -Ddebian.bundles.common.dest=debian/$(PACKAGE_NAME)-common/usr/share/$(PACKAGE_NAME)-common deb-bundle-jna deb-bundle-util deb-bundle-sysactivitynotifications deb-bundle-swing-ui deb-bundle-json deb-bundle-smacklib deb-bundle-jmdnslib deb-bundle-desktoputil deb-bundle-bouncycastle deb-bundle-plugin-accountinfo deb-bundle-commons-lang deb-bundle-hsqldb deb-libjitsi-deps deb-bundle-httpmime deb-bundle-common
override_dh_install-arch:
ifeq ($(DEB_HOST_ARCH),amd64)