summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-01-28 00:17:51 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-01-28 00:17:51 -0200
commitfc9686da979cba548e21e8ba6598c3e79be3833d (patch)
tree617bcd3b452f72f5e671c5608079dfbefcdde0a1
parent442d4ba897a7752ffd5d74378b18655d44cfeb74 (diff)
parentc5c563eec2438ec16a57c95d22800de5a99171ef (diff)
downloadabslibre-fc9686da979cba548e21e8ba6598c3e79be3833d.tar.gz
abslibre-fc9686da979cba548e21e8ba6598c3e79be3833d.tar.bz2
abslibre-fc9686da979cba548e21e8ba6598c3e79be3833d.zip
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre/abslibre
-rw-r--r--nonprism/kdenetwork-kopete/PKGBUILD2
-rw-r--r--nonprism/kdenetwork-kopete/libre-nonprism.patch9
2 files changed, 5 insertions, 6 deletions
diff --git a/nonprism/kdenetwork-kopete/PKGBUILD b/nonprism/kdenetwork-kopete/PKGBUILD
index 9cf874c7e..b89ef6d39 100644
--- a/nonprism/kdenetwork-kopete/PKGBUILD
+++ b/nonprism/kdenetwork-kopete/PKGBUILD
@@ -19,7 +19,7 @@ install=${pkgname}.install
source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"
'libre-nonprism.patch')
sha1sums=('bf5c8b45c6706ed26e5257817e838fd538033aa2'
- '0dea7b8d655878b3f0a9ee0f6d1c99a622dead1e')
+ 'f0d7b727da1b5160f05952eec4df1bfbefab99cf')
prepare() {
cd kopete-${pkgver}
diff --git a/nonprism/kdenetwork-kopete/libre-nonprism.patch b/nonprism/kdenetwork-kopete/libre-nonprism.patch
index 066a95bc4..8af3a77b7 100644
--- a/nonprism/kdenetwork-kopete/libre-nonprism.patch
+++ b/nonprism/kdenetwork-kopete/libre-nonprism.patch
@@ -1,6 +1,6 @@
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
++++ kopete-14.12.1/doc/index.docbook 2015-01-25 16:44:09.213439141 -0200
@@ -24,7 +24,6 @@
<!ENTITY kopete-chatstyle SYSTEM "chatstyle.docbook">
<!ENTITY kopete-pipes SYSTEM "pipes.docbook">
@@ -50,11 +50,10 @@ diff -Nur kopete-14.12.1.orig/doc/index.docbook kopete-14.12.1/doc/index.docbook
</orderedlist>
<para>You can add contacts to an existing Metacontact using its context menu.</para>
-@@ -705,48 +696,17 @@
- <title>&kopete;'s Protocols</title>
+@@ -706,47 +697,17 @@
<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>
@@ -100,7 +99,7 @@ diff -Nur kopete-14.12.1.orig/doc/index.docbook kopete-14.12.1/doc/index.docbook
</sect2>
</sect1>
</chapter>
-@@ -1245,7 +1205,6 @@
+@@ -1245,7 +1206,6 @@
&kopete-chatstyle;
&kopete-pipes;
&kopete-jabber;