diff options
14 files changed, 50 insertions, 41 deletions
diff --git a/resources/install/build.xml b/resources/install/build.xml index 67e1211..8dc8c30 100644 --- a/resources/install/build.xml +++ b/resources/install/build.xml @@ -2016,7 +2016,7 @@ value=""/> <replace file="${debianize.dir}/rules" token=" usr/lib/jni/" - value=" usr/lib/$(PACKAGE_NAME)/lib/native -Xslickless.jar -Xslick-runner.jar -X-slick.jar -X.svn"/> + value=" usr/share/$(PACKAGE_NAME)/lib/native -Xslickless.jar -Xslick-runner.jar -X-slick.jar -X.svn"/> <!-- some libs are not found when adding libmozembed-linux-gtk1.2.so and libjdic.so to deb and i386 package fail to build --> @@ -2040,11 +2040,11 @@ <concat destfile="${debianize.dir}/${package.name}.install" append="true" eol="lf" - fixlastline="true">lib/*.jar usr/lib/${package.name}/lib/
lib/os-specific/linux/*.jar usr/lib/${package.name}/lib/
</concat> + fixlastline="true">lib/*.jar usr/share/${package.name}/lib/
lib/os-specific/linux/*.jar usr/share/${package.name}/lib/
</concat> <concat destfile="${debianize.dir}/${package.name}.install" append="true" eol="lf" - fixlastline="true">lib/bundle/commons-logging.jar usr/lib/${package.name}/lib/bundle/
lib/bundle/log4j.jar usr/lib/${package.name}/lib/bundle/
</concat> + fixlastline="true">lib/bundle/commons-logging.jar usr/share/${package.name}/lib/bundle/
lib/bundle/log4j.jar usr/share/${package.name}/lib/bundle/
</concat> </target> <!-- updates the startup scritp only if called from deb target --> <target name="-deb-sh-file-update" @@ -2671,7 +2671,7 @@ overwrite="true" link="${debian.src.dir}/lib/installer-exclude"/> - <symlink resource="/usr/share/java/dnsjava.jar " + <symlink resource="/usr/share/java/dnsjava.jar" overwrite="true" link="${debian.src.dir}/lib/installer-exclude/dnsjava.jar"/> @@ -2973,6 +2973,11 @@ </antcall> <!-- portaudio --> + <exec dir="${debian.src.dir}/lib/src/portaudio" + executable="make" + failonerror="false"> + <arg value="distclean" /> + </exec> <chmod file="${debian.src.dir}/lib/src/portaudio/configure" perm="+x"/> <exec dir="${debian.src.dir}/lib/src/portaudio" executable="configure" @@ -2987,7 +2992,6 @@ executable="make" failonerror="true"> <arg value="lib/libportaudio.la" /> - <arg value="all-recursive" /> </exec> <ant dir="${debian.src.dir}/lib/src/libjitsi" inheritAll="false" target="portaudio"> @@ -3165,6 +3169,11 @@ append="true" eol="crlf" fixlastline="true">Bundle-ClassPath: .,util.jar,dnsjava.jar

</concat> + + <!-- Use the system installed dnsjava --> + <echo file="${debian.bundles.dest}/../lib/felix.client.run.properties" + append="true">felix.auto.start.14= reference:file:/usr/share/java/dnsjava.jar + </echo> </target> <!-- target to rebuild the util bundle reusing debian package --> @@ -3178,7 +3187,7 @@ <delete file="${debian.bundles.dest}/desktoputil.jar"/> <mkdir dir="${debian.bundles.dest}/desktoputil.jar/META-INF"/> <symlink resource="../../../../share/java/laf-widget.jar" - link="${debian.bundles.dest}/util.jar/laf-widget.jar"/> + link="${debian.bundles.dest}/desktoputil.jar/laf-widget.jar"/> <!-- Create the desktoputil.jar--> <jar compress="false" diff --git a/resources/install/debian/dirs.tmpl b/resources/install/debian/dirs.tmpl index eb26d1c..7ea8a14 100644 --- a/resources/install/debian/dirs.tmpl +++ b/resources/install/debian/dirs.tmpl @@ -4,8 +4,8 @@ usr/share/doc/_PACKAGE_NAME_ usr/share/man/man1 usr/share/menu usr/share/pixmaps -usr/lib/_PACKAGE_NAME_ -usr/lib/_PACKAGE_NAME_/lib -usr/lib/_PACKAGE_NAME_/lib/native -usr/lib/_PACKAGE_NAME_/lib/bundle -usr/lib/_PACKAGE_NAME_/sc-bundles +usr/share/_PACKAGE_NAME_ +usr/share/_PACKAGE_NAME_/lib +usr/share/_PACKAGE_NAME_/lib/native +usr/share/_PACKAGE_NAME_/lib/bundle +usr/share/_PACKAGE_NAME_/sc-bundles diff --git a/resources/install/debian/jitsi.sh.tmpl b/resources/install/debian/jitsi.sh.tmpl index ff6a092..c453ca3 100644 --- a/resources/install/debian/jitsi.sh.tmpl +++ b/resources/install/debian/jitsi.sh.tmpl @@ -13,7 +13,7 @@ fi javabin=`which java` -SCDIR=/usr/lib/_PACKAGE_NAME_ +SCDIR=/usr/share/_PACKAGE_NAME_ LIBPATH=$SCDIR/lib CLASSPATH=/usr/share/java/jdic.jar:/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar/launchutils.jar FELIX_CONFIG=$LIBPATH/felix.client.run.properties diff --git a/resources/install/debian/package.install.tmpl b/resources/install/debian/package.install.tmpl index 46e9cce..bf9bce8 100644 --- a/resources/install/debian/package.install.tmpl +++ b/resources/install/debian/package.install.tmpl @@ -2,8 +2,8 @@ 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/lib/_PACKAGE_NAME_/lib/ -lib/felix.client.run.properties usr/lib/_PACKAGE_NAME_/lib/ -sc-bundles/*.jar usr/lib/_PACKAGE_NAME_/sc-bundles -sc-bundles/os-specific/linux/*.jar usr/lib/_PACKAGE_NAME_/sc-bundles +resources/install/logging.properties usr/share/_PACKAGE_NAME_/lib/ +lib/felix.client.run.properties usr/share/_PACKAGE_NAME_/lib/ +sc-bundles/*.jar usr/share/_PACKAGE_NAME_/sc-bundles +sc-bundles/os-specific/linux/*.jar usr/share/_PACKAGE_NAME_/sc-bundles debian/sh/_PACKAGE_NAME_ usr/bin diff --git a/resources/install/debian/package.links.tmpl b/resources/install/debian/package.links.tmpl index ba7eab2..cf11dab 100755 --- a/resources/install/debian/package.links.tmpl +++ b/resources/install/debian/package.links.tmpl @@ -1,3 +1,3 @@ -usr/share/java/commons-codec.jar usr/lib/_PACKAGE_NAME_/sc-bundles/commons-codec.jar -usr/share/java/log4j-1.2.jar usr/lib/_PACKAGE_NAME_/lib/bundle/log4j.jar -usr/share/java/commons-logging.jar usr/lib/_PACKAGE_NAME_/lib/bundle/commons-logging.jar +usr/share/java/commons-codec.jar usr/share/_PACKAGE_NAME_/sc-bundles/commons-codec.jar +usr/share/java/log4j-1.2.jar usr/share/_PACKAGE_NAME_/lib/bundle/log4j.jar +usr/share/java/commons-logging.jar usr/share/_PACKAGE_NAME_/lib/bundle/commons-logging.jar diff --git a/resources/install/debian/rules.tmpl b/resources/install/debian/rules.tmpl index 590b521..a2dd223 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/lib/$(PACKAGE_NAME)/sc-bundles deb-bundle-jna deb-bundle-util deb-bundle-sysactivitynotifications deb-bundle-swing-ui deb-bundle-httputil deb-bundle-json deb-bundle-smacklib deb-bundle-jmdnslib deb-bundle-desktoputil + $(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-httputil deb-bundle-json deb-bundle-smacklib deb-bundle-jmdnslib deb-bundle-desktoputil override_dh_install-arch: ifeq ($(DEB_HOST_ARCH),amd64) diff --git a/src/net/java/sip/communicator/impl/dns/dns.manifest.mf b/src/net/java/sip/communicator/impl/dns/dns.manifest.mf index 619c311..f4281d1 100644 --- a/src/net/java/sip/communicator/impl/dns/dns.manifest.mf +++ b/src/net/java/sip/communicator/impl/dns/dns.manifest.mf @@ -1,6 +1,6 @@ Bundle-Activator: net.java.sip.communicator.impl.dns.DnsUtilActivator
-Bundle-Name: SIP Communicator DNS Utility Packages
-Bundle-SymbolicName: net.java.sip.communicator.impl.dns +Bundle-Name: Jitsi DNS impl Packages
+Bundle-SymbolicName: net.java.sip.communicator.impl.dns
Bundle-Description: A bundle that export packages with DNS utility classes.
Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
@@ -11,19 +11,19 @@ Import-Package: org.jitsi.util, net.java.sip.communicator.plugin.desktoputil,
org.jitsi.service.resources,
org.jitsi.service.fileaccess,
- net.java.sip.communicator.service.resources, - net.java.sip.communicator.service.notification, - net.java.sip.communicator.service.dns, + net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.notification,
+ net.java.sip.communicator.service.dns,
net.java.sip.communicator.service.gui,
net.java.sip.communicator.service.netaddr,
net.java.sip.communicator.service.netaddr.event,
org.jitsi.service.configuration,
sun.net.dns,
org.xbill.DNS,
- javax.swing, - javax.swing.event, - javax.swing.text, - javax.swing.border, - javax.swing.plaf.basic, - javax.swing.table -Export-Package: net.java.sip.communicator.impl.dns
\ No newline at end of file + javax.swing,
+ javax.swing.event,
+ javax.swing.text,
+ javax.swing.border,
+ javax.swing.plaf.basic,
+ javax.swing.table
+Export-Package: net.java.sip.communicator.impl.dns
diff --git a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf index 433c3c4..79805b1 100644 --- a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf +++ b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf @@ -7,4 +7,3 @@ Import-Package: org.jitsi.service.fileaccess, org.jitsi.service.libjitsi, org.osgi.framework System-Bundle: yes -
\ No newline at end of file diff --git a/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf b/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf index 8aac09b..8b46590 100644 --- a/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf +++ b/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf @@ -63,4 +63,4 @@ Export-Package: net.java.sip.communicator.plugin.desktoputil, net.java.sip.communicator.plugin.desktoputil.plaf, net.java.sip.communicator.plugin.desktoputil.presence, net.java.sip.communicator.plugin.desktoputil.transparent, - net.java.sip.communicator.plugin.desktoputil.wizard
\ No newline at end of file + net.java.sip.communicator.plugin.desktoputil.wizard diff --git a/src/net/java/sip/communicator/plugin/phonenumbercontactsource/phonenumbercontactsource.manifest.mf b/src/net/java/sip/communicator/plugin/phonenumbercontactsource/phonenumbercontactsource.manifest.mf index ba3c1ff..4dce74f 100644 --- a/src/net/java/sip/communicator/plugin/phonenumbercontactsource/phonenumbercontactsource.manifest.mf +++ b/src/net/java/sip/communicator/plugin/phonenumbercontactsource/phonenumbercontactsource.manifest.mf @@ -9,4 +9,4 @@ Import-Package: org.osgi.framework, net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.event, net.java.sip.communicator.util, - org.jitsi.service.resources
\ No newline at end of file + org.jitsi.service.resources diff --git a/src/net/java/sip/communicator/service/customcontactactions/customcontactactions.manifest.mf b/src/net/java/sip/communicator/service/customcontactactions/customcontactactions.manifest.mf index c00ebba..71d0a01 100644 --- a/src/net/java/sip/communicator/service/customcontactactions/customcontactactions.manifest.mf +++ b/src/net/java/sip/communicator/service/customcontactactions/customcontactactions.manifest.mf @@ -4,4 +4,4 @@ Bundle-Vendor: jitsi.org Bundle-Version: 0.0.1 System-Bundle: yes Import-Package: net.java.sip.communicator.service.protocol -Export-Package: net.java.sip.communicator.service.customcontactactions
\ No newline at end of file +Export-Package: net.java.sip.communicator.service.customcontactactions diff --git a/src/net/java/sip/communicator/service/dns/dns.manifest.mf b/src/net/java/sip/communicator/service/dns/dns.manifest.mf index bf0eaf0..fd3a869 100644 --- a/src/net/java/sip/communicator/service/dns/dns.manifest.mf +++ b/src/net/java/sip/communicator/service/dns/dns.manifest.mf @@ -1,5 +1,5 @@ -Bundle-Name: SIP Communicator DNS Utility Packages
-Bundle-SymbolicName: net.java.sip.communicator.service.dns +Bundle-Name: Jitsi DNS Service Packages
+Bundle-SymbolicName: net.java.sip.communicator.service.dns
Bundle-Description: A bundle that export packages with DNS utility classes.
Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
diff --git a/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf b/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf index e3356aa..3aae986 100644 --- a/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf +++ b/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf @@ -1,5 +1,5 @@ Bundle-Activator: net.java.sip.communicator.service.httputil.HttpUtilActivator -Bundle-Name: SIP Communicator Http Utility Packages +Bundle-Name: Jitsi Http Utility Packages Bundle-Description: A bundle that export packages with http utility classes. Bundle-Vendor: jitsi.org Bundle-Version: 0.0.1 diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf index 252db0d..5dc7cd5 100644 --- a/src/net/java/sip/communicator/util/util.manifest.mf +++ b/src/net/java/sip/communicator/util/util.manifest.mf @@ -56,10 +56,11 @@ Import-Package: com.sun.awt, sun.awt.shell, sun.net.dns, sun.net.util -Export-Package: org.xbill.DNS, net.java.sip.communicator.util, +Export-Package: org.xbill.DNS, + net.java.sip.communicator.util, net.java.sip.communicator.util.launchutils, net.java.sip.communicator.util.skin, net.java.sip.communicator.util.xml, net.java.sip.communicator.util.account, net.java.sip.communicator.util.call, - net.java.sip.communicator.util.wizard
\ No newline at end of file + net.java.sip.communicator.util.wizard |