Remove Yahoo protocol

Closes #76, #293

5 files changed, 7 insertions, 13 deletions

diff --git a/resources/install/debian/README.embedded-libraries b/resources/install/debian/README.embedded-libraries
index 036029f..6ecff8a 100644
--- a/resources/install/debian/README.embedded-libraries
+++ b/resources/install/debian/README.embedded-libraries
@@ -12,12 +12,6 @@ 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 cc5f976..1bfcee4 100644
--- a/resources/install/debian/control-src.tmpl
+++ b/resources/install/debian/control-src.tmpl
@@ -92,7 +92,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)
diff --git a/resources/install/debian/control.tmpl b/resources/install/debian/control.tmpl
index 135ad37..e722ff7 100644
--- a/resources/install/debian/control.tmpl
+++ b/resources/install/debian/control.tmpl
@@ -65,4 +65,4 @@ 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/rpm/SPECS/jitsi.spec b/resources/install/rpm/SPECS/jitsi.spec
index 0d60ff7..c427c4d 100644
--- a/resources/install/rpm/SPECS/jitsi.spec
+++ b/resources/install/rpm/SPECS/jitsi.spec
@@ -5,9 +5,9 @@ Summary:  Jitsi - Open Source Video Calls and Chat
 Packager: Damian Minkov <damencho@jitsi.org>
 
 Group:     Applications/Internet
-License:   GNU Lesser General Public License
+License:   Apache License 2.0
 URL:       https://www.jitsi.org
-Source0:   http://download.jitsi.org/jitsi/nightly/src/%{name}-src-%{version}-%{release}.zip
+Source0:   https://download.jitsi.org/jitsi/nightly/src/%{name}-src-%{version}-%{release}.zip
 BuildRoot: %{_topdir}/buildroot
 
 AutoReqProv:   no
@@ -21,8 +21,8 @@ Requires: java >= 0:1.6
 
 %description
 Jitsi (formerly SIP Communicator) is an audio/video and chat communicator
-that supports protocols such as SIP, XMPP/Jabber, AIM/ICQ, IRC,
-Yahoo! and many other useful features.
+that supports protocols such as SIP, XMPP/Jabber, AIM/ICQ, IRC
+and many other useful features.
 
 %define debug_package %{nil}