Hello community,
here is the log from the commit of package psi for openSUSE:Factory checked in at 2013-01-01 12:01:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/psi (Old)
and /work/SRC/openSUSE:Factory/.psi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psi", Maintainer is "orphaned@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/psi/psi.changes 2012-03-29 14:04:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.psi.new/psi.changes 2013-01-01 12:01:45.000000000 +0100
@@ -1,0 +2,26 @@
+Thu Dec 13 23:35:00 UTC 2012 - fisiu@opensuse.org
+
+- Update localization files.
+
+- Build against libotr2-devel for openSUSE >= 12.3
+
+-------------------------------------------------------------------
+Wed Oct 10 06:20:51 UTC 2012 - highwaystar.ru@gmail.com
+
+- updated to 0.15
+ * Merge many changes from Psi+.
+ * New message history browser.
+ * New, fast contact list window.
+ * TURN proxying for voice calls.
+ * Store data in more standardized locations based on the platform.
+ * No longer dependent on the Qt3Support library.
+ * Domains ending in .local now always work, whether via DNS server or mdns.
+ * Windows 64-bit and Mac 64-bit now supported. Mac PPC deprecated.
+ * Legacy SSL port probe feature removed.
+ * Various small features and bugfixes.
+
+- all remaining patches rebased to 0.15
+- psi-gcc47.patch, psi-0.14-mpris.patch, psi-0.14-whiteboarding.patch
+ removed, now upstream
+
+-------------------------------------------------------------------
Old:
----
psi-0.14-desktop_file.patch
psi-0.14-enable_otr.patch
psi-0.14-mpris.patch
psi-0.14-signing-presence-optional.patch
psi-0.14-sxe-debug.patch
psi-0.14-whiteboarding.patch
psi-0.14.tar.bz2
psi-gcc47.patch
New:
----
psi-0.15-desktop_file.patch
psi-0.15-enable_otr.patch
psi-0.15-signing-presence-optional.patch
psi-0.15-sxe-debug.patch
psi-0.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ psi.spec ++++++
--- /var/tmp/diff_new_pack.E3NjFN/_old 2013-01-01 12:01:48.000000000 +0100
+++ /var/tmp/diff_new_pack.E3NjFN/_new 2013-01-01 12:01:48.000000000 +0100
@@ -20,7 +20,7 @@
Name: psi
Url: http://psi-im.org/
-Version: 0.14
+Version: 0.15
Release: 0
Summary: Jabber client using Qt
License: GPL-2.0+
@@ -53,19 +53,20 @@
Source51: http://psi-im.org/download/lang/psi_ur_PK.qm
Source52: http://psi-im.org/download/lang/qt_ur_PK.qm
Source53: http://psi-im.org/download/lang/psi_zh_TW.qm
-Patch0: %{name}-0.14-enable_otr.patch
-Patch1: %{name}-0.14-whiteboarding.patch
-Patch2: %{name}-0.14-mpris.patch
-Patch3: %{name}-0.14-sxe-debug.patch
-Patch4: %{name}-0.14-desktop_file.patch
-Patch5: %{name}-0.14-signing-presence-optional.patch
-Patch6: psi-gcc47.patch
+Patch0: %{name}-0.15-enable_otr.patch
+Patch3: %{name}-0.15-sxe-debug.patch
+Patch4: %{name}-0.15-desktop_file.patch
+Patch5: %{name}-0.15-signing-presence-optional.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: aspell-devel
BuildRequires: fdupes
+%if %{?suse_version} >= 1230
+BuildRequires: libotr2-devel
+%else
BuildRequires: libotr-devel
+%endif
BuildRequires: libqca2-devel
-BuildRequires: libqt4-devel
+BuildRequires: libqt4-devel >= 4.7.0
BuildRequires: update-desktop-files
Recommends: psimedia >= 1.0.3
@@ -90,17 +91,14 @@
%prep
%setup -q -a 1
%patch0 -p1
-%patch1
-%patch2
%patch3
%patch4
%patch5 -p1
-%patch6 -p1
%build
# do not use %%configure - not real configure script
export QMAKE_CXXFLAGS="%{optflags}"
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-bundled-qca --enable-plugins --debug --no-separate-debug-info
+./configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-whiteboarding --enable-plugins --debug --no-separate-debug-info
make %{?jobs:-j%jobs}
pushd psi-otr-%{otrplugin_version}
mv README README.OTR
++++++ psi-0.14-desktop_file.patch -> psi-0.15-desktop_file.patch ++++++
--- /work/SRC/openSUSE:Factory/psi/psi-0.14-desktop_file.patch 2011-09-23 12:42:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.psi.new/psi-0.15-desktop_file.patch 2013-01-01 12:01:45.000000000 +0100
@@ -1,22 +1,30 @@
-Index: psi.desktop
-===================================================================
---- psi.desktop.orig
-+++ psi.desktop
+diff -ruN ./psi.desktop ../psi-0.15.desktop/psi.desktop
+--- ./psi.desktop 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.desktop/psi.desktop 2012-10-10 15:00:50.476833995 +0900
@@ -3,7 +3,7 @@
Version=1.0
Type=Application
Name=Psi
--GenericName=Jabber Client
-+GenericName=Jabber Client (with OTR support)
- Comment=Communicate over the Jabber network
+-GenericName=XMPP Client
++GenericName=XMPP Client (with OTR support)
+ Comment=Communicate over the XMPP network
Icon=psi
- Exec=psi
-@@ -19,7 +19,7 @@ GenericName[ca]=Client Jabber
- Comment[ca]=Comuniqui's a través de la xarxa Jabber
- GenericName[cs]=Jabber Klient
- Comment[cs]=Komunikujte přes Jabber po síti
--GenericName[de]=Jabber-Programm
-+GenericName[de]=Jabber-Programm (mit OTR Unterstützung)
- Comment[de]=Im Jabber-Netzwerk kommunizieren
+ Exec=psi %U
+@@ -21,7 +21,7 @@
+ GenericName[cs]=XMPP Klient
+ Comment[cs]=Komunikujte přes XMPP po síti
+ GenericName[de]=XMPP-Programm
+-Comment[de]=Im XMPP-Netzwerk kommunizieren
++Comment[de]=Jabber-Programm (mit OTR Unterstützung)
GenericName[eo]=Ĵabbera Klientilo
Comment[eo]=Komunikiĝu per la ĵabbera reto
+ GenericName[es]=Cliente XMPP
+@@ -40,7 +40,7 @@
+ Comment[pl]=Komunikacja poprzez sieć XMPP
+ GenericName[pt_BR]=Cliente XMPP
+ Comment[pt_BR]=Comunique-se através da rede XMPP
+-GenericName[ru]=XMPP-клиент
++GenericName[ru]=XMPP-клиент (с поддержкой OTR)
+ Comment[ru]=Общение в сети XMPP
+ GenericName[sl]=Odjemalec za XMPP
+ Comment[sl]=Takojšnje sporočanje prek omrežij XMPP
++++++ psi-0.14-enable_otr.patch -> psi-0.15-enable_otr.patch ++++++
++++ 802 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/psi/psi-0.14-enable_otr.patch
++++ and /work/SRC/openSUSE:Factory/.psi.new/psi-0.15-enable_otr.patch
++++++ psi-0.14-signing-presence-optional.patch -> psi-0.15-signing-presence-optional.patch ++++++
--- /work/SRC/openSUSE:Factory/psi/psi-0.14-signing-presence-optional.patch 2011-09-23 12:42:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.psi.new/psi-0.15-signing-presence-optional.patch 2013-01-01 12:01:45.000000000 +0100
@@ -1,27 +1,32 @@
-From 91db5b4817e08b2bb0ae0798595b02599e4a995c Mon Sep 17 00:00:00 2001
-From: David Flatz
-Date: Sun, 3 Jan 2010 18:48:19 +0100
-Subject: [PATCH] Make signing presence optional
-
-This adds a option to the account properties to control whether psi signs
-the status or not.
----
- src/accountmodify.ui | 17 +++++++++++++++++
- src/accountmodifydlg.cpp | 2 ++
- src/profiles.h | 1 +
- src/psi_profiles.cpp | 5 +++++
- src/psiaccount.cpp | 2 +-
- 5 files changed, 26 insertions(+), 1 deletions(-)
-
-diff --git a/src/accountmodify.ui b/src/accountmodify.ui
-index dfd455e..698c4d4 100644
---- a/src/accountmodify.ui
-+++ b/src/accountmodify.ui
+diff -ruN ./src/accountmodifydlg.cpp ../psi-0.15.signing/src/accountmodifydlg.cpp
+--- ./src/accountmodifydlg.cpp 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.signing/src/accountmodifydlg.cpp 2012-10-10 15:05:25.092834000 +0900
+@@ -154,7 +154,8 @@
+ if(PGPUtil::instance().pgpAvailable()) {
+ gb_pgp->setEnabled(true);
+ }
+-
++ ck_sign->setChecked(acc.pgp_sign);
++
+ pc = ProxyManager::instance()->createProxyChooser(tab_connection);
+ replaceWidget(lb_proxychooser, pc);
+ pc->setCurrentItem(acc.proxyID);
+@@ -530,6 +531,7 @@
+ acc.stunPass = le_stunPass->text();
+
+ acc.pgpSecretKey = key;
++ acc.pgp_sign = ck_sign->isChecked();
+
+ acc.proxyID = pc->currentItem();
+
+diff -ruN ./src/accountmodify.ui ../psi-0.15.signing/src/accountmodify.ui
+--- ./src/accountmodify.ui 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.signing/src/accountmodify.ui 2012-10-10 15:04:49.216833998 +0900
@@ -331,6 +331,23 @@
</item>
</layout>
</item>
-+ <item>
++ <item>
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>6</number>
@@ -41,43 +46,35 @@
</layout>
</widget>
</item>
-diff --git a/src/accountmodifydlg.cpp b/src/accountmodifydlg.cpp
-index ad5d976..4e83840 100644
---- a/src/accountmodifydlg.cpp
-+++ b/src/accountmodifydlg.cpp
-@@ -150,6 +150,7 @@ void AccountModifyDlg::init()
- if(PGPUtil::instance().pgpAvailable()) {
- gb_pgp->setEnabled(true);
- }
-+ ck_sign->setChecked(acc.pgp_sign);
-
- pc = psi->proxy()->createProxyChooser(tab_connection);
- replaceWidget(lb_proxychooser, pc);
-@@ -525,6 +526,7 @@ void AccountModifyDlg::save()
- acc.stunPort = le_stunPort->text().toInt();
-
- acc.pgpSecretKey = key;
-+ acc.pgp_sign = ck_sign->isChecked();
-
- acc.proxyID = pc->currentItem();
-
-diff --git a/src/profiles.h b/src/profiles.h
-index 7c33181..735c083 100644
---- a/src/profiles.h
-+++ b/src/profiles.h
-@@ -72,6 +72,7 @@ public:
+diff -ruN ./src/profiles.h ../psi-0.15.signing/src/profiles.h
+--- ./src/profiles.h 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.signing/src/profiles.h 2012-10-10 15:05:47.724834004 +0900
+@@ -74,7 +74,8 @@
QMap groupState;
QCA::PGPKey pgpSecretKey;
+-
+ bool pgp_sign;
-
++
VarList keybind;
-diff --git a/src/psi_profiles.cpp b/src/psi_profiles.cpp
-index 5f548dc..aea2b5d 100644
---- a/src/psi_profiles.cpp
-+++ b/src/psi_profiles.cpp
-@@ -136,6 +136,7 @@ void UserAccount::reset()
+ XMPP::Jid dtProxy;
+diff -ruN ./src/psiaccount.cpp ../psi-0.15.signing/src/psiaccount.cpp
+--- ./src/psiaccount.cpp 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.signing/src/psiaccount.cpp 2012-10-10 15:07:21.988834001 +0900
+@@ -2829,7 +2829,7 @@
+ //printf("setting status to [%s]\n", s.status().latin1());
+
+ // using pgp?
+- if(!d->cur_pgpSecretKey.isNull()) {
++ if(!d->cur_pgpSecretKey.isNull() && d->acc.pgp_sign) {
+ d->loginStatus = s;
+
+ // sign presence
+diff -ruN ./src/psi_profiles.cpp ../psi-0.15.signing/src/psi_profiles.cpp
+--- ./src/psi_profiles.cpp 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.signing/src/psi_profiles.cpp 2012-10-10 15:06:59.156834001 +0900
+@@ -141,6 +141,7 @@
opt_reconn = false;
opt_connectAfterSleep = false;
opt_ignoreSSLWarnings = false;
@@ -85,44 +82,28 @@
proxy_index = 0;
proxy_type = PROXY_NONE;
-@@ -228,6 +229,7 @@ void UserAccount::fromOptions(OptionsTree *o, QString base)
+@@ -238,6 +239,7 @@
if (!e.isNull())
pgpSecretKey = e.pgpSecretKey();
}
+ pgp_sign = o->getOption(base + ".pgp-sign").toBool();
-
+ #endif
+
tmp = o->getOption(base + ".allow-plain").toString();
- if (tmp == "never") {
-@@ -346,6 +348,8 @@ void UserAccount::toOptions(OptionsTree *o, QString base)
+@@ -365,6 +367,8 @@
} else {
o->setOption(base + ".pgp-secret-key-id", "");
}
+ o->setOption(base + ".pgp-sign", pgp_sign);
-+
++
switch (allow_plain) {
case XMPP::ClientStream::NoAllowPlain:
o->setOption(base + ".allow-plain", "never");
-@@ -514,6 +518,7 @@ void UserAccount::fromXml(const QDomElement &a)
+@@ -538,6 +542,7 @@
if (!e.isNull())
pgpSecretKey = e.pgpSecretKey();
}
+ readBoolEntry(a, "pgpSign", &pgp_sign);
+ #endif
QDomElement r = findSubTag(a, "roster", &found);
- if(found) {
-diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp
-index fdca674..6d724ff 100644
---- a/src/psiaccount.cpp
-+++ b/src/psiaccount.cpp
-@@ -2375,7 +2375,7 @@ void PsiAccount::setStatusDirect(const Status &_s, bool withPriority)
- //printf("setting status to [%s]\n", s.status().latin1());
-
- // using pgp?
-- if(!d->cur_pgpSecretKey.isNull()) {
-+ if(!d->cur_pgpSecretKey.isNull() && d->acc.pgp_sign) {
- d->loginStatus = s;
-
- // sign presence
---
-1.6.6
-
++++++ psi-0.14-sxe-debug.patch -> psi-0.15-sxe-debug.patch ++++++
--- /work/SRC/openSUSE:Factory/psi/psi-0.14-sxe-debug.patch 2011-09-23 12:42:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.psi.new/psi-0.15-sxe-debug.patch 2013-01-01 12:01:45.000000000 +0100
@@ -1,7 +1,17 @@
-Index: src/sxe/sxemanager.cpp
-===================================================================
---- src/sxe/sxemanager.cpp.orig
-+++ src/sxe/sxemanager.cpp
+diff -ruN ./src/sxe/sxeedit.cpp ../psi-0.15.sxe/src/sxe/sxeedit.cpp
+--- ./src/sxe/sxeedit.cpp 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.sxe/src/sxe/sxeedit.cpp 2012-10-10 15:17:02.936153955 +0900
+@@ -18,6 +18,7 @@
+ *
+ */
+
++#include <QtDebug>
+ #include "sxeedit.h"
+ #include "sxerecordedit.h"
+
+diff -ruN ./src/sxe/sxemanager.cpp ../psi-0.15.sxe/src/sxe/sxemanager.cpp
+--- ./src/sxe/sxemanager.cpp 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.sxe/src/sxe/sxemanager.cpp 2012-10-10 15:16:16.552153999 +0900
@@ -23,6 +23,8 @@
#include "psioptions.h"
#include "common.h"
@@ -11,34 +21,9 @@
#include <QUrl>
#define ONETOONEPREFIXSELF "0"
-Index: src/sxe/sxesession.cpp
-===================================================================
---- src/sxe/sxesession.cpp.orig
-+++ src/sxe/sxesession.cpp
-@@ -20,6 +20,7 @@
-
- #include "sxesession.h"
-
-+#include <QtDebug>
- #include "QTimer"
- #include "QUuid"
-
-Index: src/sxe/sxeedit.cpp
-===================================================================
---- src/sxe/sxeedit.cpp.orig
-+++ src/sxe/sxeedit.cpp
-@@ -18,6 +18,7 @@
- *
- */
-
-+#include <QtDebug>
- #include "sxeedit.h"
- #include "sxerecordedit.h"
-
-Index: src/sxe/sxenewedit.cpp
-===================================================================
---- src/sxe/sxenewedit.cpp.orig
-+++ src/sxe/sxenewedit.cpp
+diff -ruN ./src/sxe/sxenewedit.cpp ../psi-0.15.sxe/src/sxe/sxenewedit.cpp
+--- ./src/sxe/sxenewedit.cpp 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.sxe/src/sxe/sxenewedit.cpp 2012-10-10 15:17:18.032154003 +0900
@@ -18,6 +18,7 @@
*
*/
@@ -47,10 +32,9 @@
#include "sxenewedit.h"
#include "sxesession.h"
-Index: src/sxe/sxerecord.cpp
-===================================================================
---- src/sxe/sxerecord.cpp.orig
-+++ src/sxe/sxerecord.cpp
+diff -ruN ./src/sxe/sxerecord.cpp ../psi-0.15.sxe/src/sxe/sxerecord.cpp
+--- ./src/sxe/sxerecord.cpp 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.sxe/src/sxe/sxerecord.cpp 2012-10-10 15:17:36.796154001 +0900
@@ -18,6 +18,7 @@
*
*/
@@ -59,10 +43,9 @@
#include "sxerecord.h"
-Index: src/sxe/sxerecordedit.cpp
-===================================================================
---- src/sxe/sxerecordedit.cpp.orig
-+++ src/sxe/sxerecordedit.cpp
+diff -ruN ./src/sxe/sxerecordedit.cpp ../psi-0.15.sxe/src/sxe/sxerecordedit.cpp
+--- ./src/sxe/sxerecordedit.cpp 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.sxe/src/sxe/sxerecordedit.cpp 2012-10-10 15:17:54.816154004 +0900
@@ -18,6 +18,7 @@
*
*/
@@ -71,10 +54,9 @@
#include "sxerecordedit.h"
#include "sxesession.h"
-Index: src/sxe/sxeremoveedit.cpp
-===================================================================
---- src/sxe/sxeremoveedit.cpp.orig
-+++ src/sxe/sxeremoveedit.cpp
+diff -ruN ./src/sxe/sxeremoveedit.cpp ../psi-0.15.sxe/src/sxe/sxeremoveedit.cpp
+--- ./src/sxe/sxeremoveedit.cpp 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.sxe/src/sxe/sxeremoveedit.cpp 2012-10-10 15:18:08.324154003 +0900
@@ -18,6 +18,7 @@
*
*/
@@ -83,3 +65,14 @@
#include "sxeremoveedit.h"
#include "sxesession.h"
+diff -ruN ./src/sxe/sxesession.cpp ../psi-0.15.sxe/src/sxe/sxesession.cpp
+--- ./src/sxe/sxesession.cpp 2012-10-04 09:53:03.000000000 +0900
++++ ../psi-0.15.sxe/src/sxe/sxesession.cpp 2012-10-10 15:16:31.216154001 +0900
+@@ -21,6 +21,7 @@
+ #include "sxesession.h"
+ #include "sxemanager.h"
+
++#include <QtDebug>
+ #include "QTimer"
+ #include "QUuid"
+
++++++ psi-0.14.tar.bz2 -> psi-0.15.tar.bz2 ++++++
++++ 155905 lines of diff (skipped)
++++++ psi_be.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_cs.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_de.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_es.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_fr.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_it.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_ja.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_mk.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_pl.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_pt_BR.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_ru.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_sl.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_sv.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_ur_PK.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
++++++ psi_zh_TW.qm ++++++
Files /var/tmp/diff_new_pack.E3NjFN/_old and /var/tmp/diff_new_pack.E3NjFN/_new differ
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org