Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

8 files changed, 15 insertions, 165 deletions

diff --git a/resources/install/debian/README.embedded-libraries b/resources/install/debian/README.embedded-libraries
index d4457de..6ecff8a 100644
--- a/resources/install/debian/README.embedded-libraries
+++ b/resources/install/debian/README.embedded-libraries
@@ -7,21 +7,11 @@ Note 2: We have indicated when Jitsi community members are also somehow affiliat
 Java DHCP API.
 Reason: No Debian package.
 
-- jfontchooser http://sourceforge.net/projects/jfontchooser/
-This projects tries to provide an easy JFontChooser in the form of the JColorChooser.
-Reason: No Debian package.
-
 - jnsapi http://code.google.com/p/jinglenodes/
 Jingle Nodes is an XMPP Extension that enable users to share and discover
 P2P Media Relays that can be used to enable Voice and Video Chat via Jingle.
 Reason: No Debian package.
 
-- jymsg http://jymsg9.sourceforge.net/
-This API provides a way for Java applications to connect and
-use the Yahoo Instant Messenger protocol.
-Damian Minkov from Jitsi team is contributor and has commit right in the project.
-Reason: No Debian package.
-
 - OrangeExtensions http://ymasory.github.com/OrangeExtensions/
 A pluggable jar containing stubs for the Apple Java Extensions.
 Reason: No Debian package.
diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl
index fdf1456..cb9b08d 100644
--- a/resources/install/debian/control-src.tmpl
+++ b/resources/install/debian/control-src.tmpl
@@ -6,7 +6,7 @@ Uploaders: Emil Ivov <emcho@jitsi.org>, Damian Minkov <damencho@jitsi.org>
 Homepage: _APP_WEB_
 Build-Depends: debhelper (>= 9), javahelper,
                dpkg-dev (>= 1.16.1),
-               default-jdk,
+               default-jdk | java7-sdk,
                ant,
                ant-optional,
                ant-contrib-cpptasks,
@@ -42,14 +42,11 @@ Build-Depends: debhelper (>= 9), javahelper,
                libxtst-dev,
                libxv-dev,
                libdbus-1-dev,
-               libunbound-dev,
                libxss-dev,
                libgtk2.0-dev,
                libglib2.0-dev,
                libguava-java,
                libhsqldb-java,
-               glassfish-activation,
-               glassfish-mail,
                libjcalendar-java,
                libphonenumber6-java,
                libslf4j-java
@@ -62,7 +59,8 @@ Depends: ${misc:Depends},
          _PACKAGE_NAME_-common (= ${source:Version}),
          libjitsi (= ${libjitsi:version}),
          libjitsi-jni (= ${libjitsi:version}),
-         default-jre,
+         default-jre | java7-runtime,
+         libappindicator1,
          libunixsocket-java,
          libhttpcore-java,
          liblog4j1.2-java,
@@ -93,7 +91,7 @@ Description: VoIP and Instant Messaging client
  _APP_NAME_ is an application that allows you to do audio/video
  conversations over the Internet through the SIP and XMPP/Jabber protocol,
  as well as chat with your friends using some of the most popular instant
- messaging protocols such as SIP/SIMPLE, XMPP/Jabber, AIM/ICQ, Yahoo and others.
+ messaging protocols such as SIP/SIMPLE, XMPP/Jabber, AIM/ICQ and others.
 
 Package: _PACKAGE_NAME_-jni
 Replaces: libjitsi-jni (<< 415)
@@ -111,7 +109,7 @@ Package: _PACKAGE_NAME_-common
 Section: libs
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends},
-         libdnsjava-java (>= 2.1.7~),
+         libdnsjava-java (>= 2.1.7),
          libxpp3-java,
          libjzlib-java,
          libbcpkix-java
diff --git a/resources/install/debian/control.tmpl b/resources/install/debian/control.tmpl
index f717416..b780bb4 100644
--- a/resources/install/debian/control.tmpl
+++ b/resources/install/debian/control.tmpl
@@ -6,7 +6,7 @@ Uploaders: Emil Ivov <emcho@jitsi.org>
 Homepage: _APP_WEB_
 Build-Depends: debhelper (>= 9), javahelper,
                dpkg-dev (>= 1.16.1),
-               default-jdk,
+               default-jdk | java7-sdk,
                ant,
                ant-optional,
                ant-contrib-cpptasks,
@@ -48,22 +48,24 @@ Build-Depends: debhelper (>= 9), javahelper,
                libasound2-dev,
                libspeexdsp-dev,
                libspeex-dev,
-               libunbound-dev,
                libxss-dev,
                libgtk2.0-dev,
                libglib2.0-dev,
                libpulse-dev,
                libgoogle-collections-java,
-               glassfish-activation,
-               glassfish-mail,
                libbcpkix-java
 Standards-Version: 3.9.5
 
 Package: _PACKAGE_NAME_
 Architecture: i386 amd64
-Depends: default-jre, libxss1
+Depends: default-jre | java7-runtime,
+ libappindicator1,
+ libxss1,
+ libspeex1,
+ libspeexdsp1,
+ jitsi-archive-keyring
 Description: VoIP and Instant Messaging client
  _APP_NAME_ is an application that allows you to do audio/video
  conversations over the Internet through the SIP and XMPP/Jabber protocol,
  as well as chat with your friends using some of the most popular instant
- messaging protocols such as SIP/SIMPLE, XMPP/Jabber, AIM/ICQ, Yahoo and others.
+ messaging protocols such as SIP/SIMPLE, XMPP/Jabber, AIM/ICQ and others.
diff --git a/resources/install/debian/jitsi.1.tmpl b/resources/install/debian/jitsi.1.tmpl
index 5608d63..d09beb5 100644
--- a/resources/install/debian/jitsi.1.tmpl
+++ b/resources/install/debian/jitsi.1.tmpl
@@ -26,7 +26,7 @@ _PACKAGE_NAME_ \- the Java VoIP and Instant Messaging client
 .\" respectively.
 \fB_APP_NAME_\fP is an audio/video Internet phone and instant messenger
 that supports some of the most popular instant messaging and telephony
-protocols such as SIP, Jabber, AIM/ICQ, Yahoo! Messenger, Bonjour, IRC
+protocols such as SIP, Jabber/XMPP, AIM/ICQ, IRC
 and soon others like IAX.
 .PP
 .RI "An optional " uri-to-call " expression can be specified to start a call from the command-line. If _APP_NAME_ is already running then the call is handled by the running application, except when it is explicitly told to allow multiple instance launch."
diff --git a/resources/install/debian/jitsi.sh.tmpl b/resources/install/debian/jitsi.sh.tmpl
index de159db..5e8677d 100644
--- a/resources/install/debian/jitsi.sh.tmpl
+++ b/resources/install/debian/jitsi.sh.tmpl
@@ -30,7 +30,7 @@ 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:$JITSI_COMMON_DIR/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/dnsjava.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/patches/encoding.patch b/resources/install/debian/patches/encoding.patch
deleted file mode 100644
index 09176fd..0000000
--- a/resources/install/debian/patches/encoding.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Set encoding for javadoc to fix errors with Java 7
-Author: Colin Watson <cjwatson@ubuntu.com>
-Bug-Debian: https://bugs.debian.org/759835
-Forwarded: no
-Last-Update: 2014-09-05
-
---- jitsi.orig/lib/src/swingworker/build.xml
-+++ jitsi/lib/src/swingworker/build.xml
-@@ -63,7 +63,7 @@ reserved. Use is subject to license term
-         <javadoc access="protected" link="" 
-             packagenames="org.jdesktop.swingworker" author="true" destdir="${javadoc.dir}" 
-             nodeprecated="false" nodeprecatedlist="false" noindex="false" 
--            nonavbar="false" notree="false" use="true" version="true">
-+            nonavbar="false" notree="false" use="true" version="true" encoding="iso-8859-1">
-             <link href="${external.doc}" />
-             <sourcepath>
-                 <pathelement path="${src.dir}" />
diff --git a/resources/install/debian/postinst b/resources/install/debian/postinst
deleted file mode 100644
index 997155a..0000000
--- a/resources/install/debian/postinst
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-# Jitsi, the OpenSource Java VoIP and Instant Messaging client.
-#
-# Copyright @ 2015 Atlassian Pty Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# sources.list setting for Jitsi updates.
-REPOCONFIG="deb http://download.jitsi.org/deb unstable/"
-
-APT_CONFIG="`which apt-config 2> /dev/null`"
-
-
-# Parse apt configuration and return requested variable value.
-apt_config_val() {
-  APTVAR="$1"
-  if [ -x "$APT_CONFIG" ]; then
-    "$APT_CONFIG" dump | sed -e "/^$APTVAR /"'!d' -e "s/^$APTVAR \"\(.*\)\".*/\1/"
-  fi
-}
-
-# Set variables for the locations of the apt sources lists.
-find_apt_sources() {
-  APTDIR=$(apt_config_val Dir)
-  APTETC=$(apt_config_val 'Dir::Etc')
-  APT_SOURCES="$APTDIR$APTETC$(apt_config_val 'Dir::Etc::sourcelist')"
-  APT_SOURCESDIR="$APTDIR$APTETC$(apt_config_val 'Dir::Etc::sourceparts')"
-}
-
-# Remove our custom sources list file.
-# Returns:
-# 0 - successfully removed, or not configured
-# !0 - failed to remove
-clean_sources_lists() {
-  if [ ! "$REPOCONFIG" ]; then
-    return 0
-  fi
-
-  find_apt_sources
-
-  rm -f "$APT_SOURCESDIR/jitsi.list"
-}
-
-remove_key() {
-   APT_KEY="`which apt-key 2> /dev/null`"
-   if [ -x "$APT_KEY" ]; then
-     "$APT_KEY" del EB0AB654
-   fi
-}
-
-## MAIN ##
-# Remove any Jitsi repository added by the package previously.
-clean_sources_lists
-# Remove jitsi repository key
-remove_key
diff --git a/resources/install/debian/postrm b/resources/install/debian/postrm
deleted file mode 100644
index 66317be..0000000
--- a/resources/install/debian/postrm
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# Jitsi, the OpenSource Java VoIP and Instant Messaging client.
-#
-# Copyright @ 2015 Atlassian Pty Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# sources.list setting for Jitsi updates.
-REPOCONFIG="deb http://download.jitsi.org/deb unstable/"
-
-APT_CONFIG="`which apt-config 2> /dev/null`"
-
-# Parse apt configuration and return requested variable value.
-apt_config_val() {
-  APTVAR="$1"
-  if [ -x "$APT_CONFIG" ]; then
-    "$APT_CONFIG" dump | sed -e "/^$APTVAR /"'!d' -e "s/^$APTVAR \"\(.*\)\".*/\1/"
-  fi
-}
-
-# Set variables for the locations of the apt sources lists.
-find_apt_sources() {
-  APTDIR=$(apt_config_val Dir)
-  APTETC=$(apt_config_val 'Dir::Etc')
-  APT_SOURCES="$APTDIR$APTETC$(apt_config_val 'Dir::Etc::sourcelist')"
-  APT_SOURCESDIR="$APTDIR$APTETC$(apt_config_val 'Dir::Etc::sourceparts')"
-}
-
-# Remove our custom sources list file.
-# Returns:
-# 0 - successfully removed, or not configured
-# !0 - failed to remove
-clean_sources_lists() {
-  if [ ! "$REPOCONFIG" ]; then
-    return 0
-  fi
-
-  find_apt_sources
-
-  rm -f "$APT_SOURCESDIR/jitsi.list"
-}
-
-# Remove any Jitsi repository added by the package.
-clean_sources_lists