From e291d0c2b32925856df7fc98727e8da66af75b37 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sun, 25 Jan 2015 14:27:04 -0200
Subject: kdenetwork-kopete: update libre-nonprism.patch in nonprism version

---
 nonprism/kdenetwork-kopete/libre-nonprism.patch | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'nonprism/kdenetwork-kopete/libre-nonprism.patch')

diff --git a/nonprism/kdenetwork-kopete/libre-nonprism.patch b/nonprism/kdenetwork-kopete/libre-nonprism.patch
index 6d73766cc..066a95bc4 100644
--- a/nonprism/kdenetwork-kopete/libre-nonprism.patch
+++ b/nonprism/kdenetwork-kopete/libre-nonprism.patch
@@ -1,20 +1,19 @@
-diff --git a/doc/index.docbook b/doc/index.docbook
-index b55fd88..416de49 100644
---- a/doc/index.docbook
-+++ b/doc/index.docbook
+diff -Nur kopete-14.12.1.orig/doc/index.docbook kopete-14.12.1/doc/index.docbook
+--- kopete-14.12.1.orig/doc/index.docbook	2014-11-19 21:39:14.000000000 -0200
++++ kopete-14.12.1/doc/index.docbook	2015-01-25 14:23:31.408409645 -0200
 @@ -24,7 +24,6 @@
    <!ENTITY kopete-chatstyle SYSTEM "chatstyle.docbook">
    <!ENTITY kopete-pipes SYSTEM "pipes.docbook">
    <!ENTITY kopete-jabber SYSTEM "jabber.docbook">
 -  <!ENTITY kopete-icq SYSTEM "icq.docbook">
+   <!ENTITY kopete-emoticonspec SYSTEM "emoticonspec.docbook">
  ]>
  <!--
- Intro (1st draft, Will)
-@@ -116,15 +115,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+@@ -117,15 +116,7 @@
  <keyword>Messaging</keyword>
  <keyword>Jabber</keyword>
  <keyword>IRC</keyword>
--<keyword>MSN</keyword>
+-<keyword>WLM</keyword>
 -<keyword>ICQ</keyword>
 -<keyword>AIM</keyword>
 -<keyword>Yahoo</keyword>
@@ -26,11 +25,11 @@ index b55fd88..416de49 100644
  </keywordset>
  
  </bookinfo>
-@@ -178,13 +169,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+@@ -179,13 +170,13 @@
  <para>To use &kopete; you need to set up one or more accounts for the instant messaging services you wish to use.</para>
  <para>You've probably already chosen a messaging service, either because you already use &im;, or you need to use the same service as your friends.  If you don't fit into either of these categories, please consider using a messaging service based on open standards, because these are designed for use by Free Software.  Other messaging services are prone to changing the underlying technology without making the details freely available, making them harder for Free Software developers to support.</para>
  <para>The messaging services that &kopete; supports that are based on open standards are Jabber and IRC.</para>
--<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Gadu-Gadu, Jabber, and <trademark>MSN</trademark> from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
+-<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Gadu-Gadu, Jabber, and <trademark>WLM</trademark> from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
 +<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Jabber from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
  <sect1 id="creating-accounts">
  <title>Creating Accounts</title>
@@ -42,7 +41,7 @@ index b55fd88..416de49 100644
  <variablelist>
  <varlistentry><term>Remember password</term><listitem><para>When this is checked, &kopete; will store the password for you, so you don't have to enter it every time you connect to the &im; service.  If you are security-conscious or want to limit access to the &im; account you can leave this unchecked.</para></listitem></varlistentry>
  <varlistentry><term>Connect at startup</term><listitem><para>When this is checked, &kopete; will try to connect to the &im; service as when it starts.  If you use a <acronym>LAN</acronym>, <acronym>DSL</acronym> or other <quote>always-on</quote> connection, this is appropriate; dial-up modem users should turn this off and connect manually when you have dialed up.</para></listitem></varlistentry>
-@@ -260,7 +251,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+@@ -261,7 +252,7 @@
  <listitem><para>Select Display Name and Group.  Here you can enter a Display Name (the name used for this person inside &kopete;), and choose the <link linkend="organise-contacts-grouping">groups</link> they are a member of.</para></listitem>
  <listitem><para>Select &im; Accounts.  Here you can choose which accounts you want to use to chat to the new contact.  If you only have one &im; account, you won't see this screen.</para></listitem>
  <listitem><para>Account-specific Add Contact Pages.  For each account, you'll get one page where you can enter the <acronym>UIN</acronym>, buddy name or Email address, depending on the &im; system in use.</para></listitem>
@@ -51,10 +50,11 @@ index b55fd88..416de49 100644
  </orderedlist>
  
  <para>You can add contacts to an existing Metacontact using its context menu.</para>
-@@ -705,47 +696,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+@@ -705,48 +696,17 @@
+ 	<title>&kopete;'s Protocols</title>
  	<para>&kopete; calls different &im; systems 'Protocols'.  When you add an account, it is specific to a single protocol.  Although &kopete; tries to make instant messaging appear the same, no matter what protocol you use, there are some differences in the level of support for advanced features such as file transfer and multimedia.</para>
  	<sect1 id="protocols-list">
- 		<title>Protocols</title>
+-		<title>Protocols</title>
 -		<sect2 id="protocols-aim">
 -			<title>AIM</title>
 -			<para>AIM supports chatrooms.  Use the <guilabel>Join Chat...</guilabel> command on the AIM account menu to join a chatroom. Contact pictures and custom emoticons are also supported.</para>
@@ -64,8 +64,8 @@ index b55fd88..416de49 100644
 -			<para>ICQ has an Invisibility feature which allows you to hide from selected contacts.  You may also search the ICQ user folder when adding a contact.  A wide range of contact details can be set using the <guilabel>Properties</guilabel> option.</para>
 -		</sect2>
 -		<sect2 id="protocols-msn">
--			<title>MSN</title> 
--			<para>File transfer and multi user chats work.  To transfer a file,  drag the file from &konqueror; or the desktop into the chat window.  To invite someone else into a chat, drag them from the Contact List into the chat window.  The <menuchoice><guimenu>File</guimenu></menuchoice> menu also contains these commands.  In addition, MSN supports custom emoticons.</para>
+-			<title>WLM</title> 
+-			<para>File transfer and multi user chats work.  To transfer a file,  drag the file from &dolphin; or the desktop into the chat window.  To invite someone else into a chat, drag them from the Contact List into the chat window.  The <menuchoice><guimenu>File</guimenu></menuchoice> menu also contains these commands.  In addition, WLM supports custom emoticons.</para>
 -			<para>To use file transfer, make sure port 6891 is forwarded to your computer.</para>
 -		</sect2>
 -		<sect2 id="protocols-yahoo">
@@ -100,11 +100,11 @@ index b55fd88..416de49 100644
  		</sect2>
  	</sect1>
  </chapter>
-@@ -1180,7 +1141,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free
+@@ -1245,7 +1205,6 @@
  &kopete-chatstyle;
  &kopete-pipes;
  &kopete-jabber;
 -&kopete-icq;
+ &kopete-emoticonspec;
  
  &documentation.index;
- </book>
-- 
cgit v1.2.3-54-g00ecf