Hello community,
here is the log from the commit of package baloo5 for openSUSE:Factory checked in at 2015-03-01 15:03:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/baloo5 (Old)
and /work/SRC/openSUSE:Factory/.baloo5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "baloo5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/baloo5/baloo5.changes 2015-01-29 13:15:04.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.baloo5.new/baloo5.changes 2015-03-01 15:03:15.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Feb 20 02:43:47 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.2.1:
+ * Bugfix release
+ * For more details please see:
+ https://www.kde.org/announcements/plasma-5.2.1.php
+
+-------------------------------------------------------------------
Old:
----
baloo-5.6.0.tar.xz
New:
----
baloo-5.6.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ baloo5.spec ++++++
--- /var/tmp/diff_new_pack.eUjZNX/_old 2015-03-01 15:03:15.000000000 +0100
+++ /var/tmp/diff_new_pack.eUjZNX/_new 2015-03-01 15:03:15.000000000 +0100
@@ -17,7 +17,7 @@
Name: baloo5
-Version: 5.6.0
+Version: 5.6.1
Release: 0
Summary: Framework for searching and managing metadata
License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0
++++++ baloo-5.6.0.tar.xz -> baloo-5.6.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/CMakeLists.txt new/baloo-5.6.1/CMakeLists.txt
--- old/baloo-5.6.0/CMakeLists.txt 2015-01-23 13:24:42.000000000 +0100
+++ new/baloo-5.6.1/CMakeLists.txt 2015-02-21 21:46:21.000000000 +0100
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.12)
project(Baloo)
-set(PROJECT_VERSION "5.6.0")
+set(PROJECT_VERSION "5.6.1")
# ECM setup
find_package(ECM 1.2.0 REQUIRED NO_MODULE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/po/fi/balooctl.po new/baloo-5.6.1/po/fi/balooctl.po
--- old/baloo-5.6.0/po/fi/balooctl.po 2015-01-23 13:15:00.000000000 +0100
+++ new/baloo-5.6.1/po/fi/balooctl.po 2015-02-21 21:43:52.000000000 +0100
@@ -1,6 +1,6 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Lasse Liehu , 2014.
+# Lasse Liehu , 2014, 2015.
#
msgid ""
msgstr ""
@@ -9,7 +9,7 @@
"POT-Creation-Date: 2014-07-21 08:11+0000\n"
"PO-Revision-Date: 2014-07-26 16:13+0300\n"
"Last-Translator: Lasse Liehu \n"
-"Language-Team: Finnish \n"
+"Language-Team: Finnish \n"
"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/po/it/balooctl.po new/baloo-5.6.1/po/it/balooctl.po
--- old/baloo-5.6.0/po/it/balooctl.po 2015-01-23 13:17:51.000000000 +0100
+++ new/baloo-5.6.1/po/it/balooctl.po 2015-02-21 21:44:24.000000000 +0100
@@ -1,6 +1,6 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Luigi Toscano , 2014.
+# Luigi Toscano , 2014, 2015.
#
msgid ""
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/po/lt/kio_baloosearch.po new/baloo-5.6.1/po/lt/kio_baloosearch.po
--- old/baloo-5.6.0/po/lt/kio_baloosearch.po 2015-01-23 13:18:53.000000000 +0100
+++ new/baloo-5.6.1/po/lt/kio_baloosearch.po 2015-02-21 21:44:35.000000000 +0100
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the l package.
#
# Automatically generated, 2014.
-# Liudas Ališauskas , 2014.
+# Liudas Ališauskas , 2014, 2015.
msgid ""
msgstr ""
"Project-Id-Version: l 10n\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2015-01-13 12:15+0000\n"
-"PO-Revision-Date: 2014-11-02 18:46+0200\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2015-01-25 12:13+0200\n"
+"Last-Translator: Liudas Ališauskas \n"
"Language-Team: Lithuanian \n"
"Language: lt\n"
"MIME-Version: 1.0\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/po/sr/balooctl.po new/baloo-5.6.1/po/sr/balooctl.po
--- old/baloo-5.6.0/po/sr/balooctl.po 2015-01-23 13:21:40.000000000 +0100
+++ new/baloo-5.6.1/po/sr/balooctl.po 2015-02-21 21:45:29.000000000 +0100
@@ -1,5 +1,5 @@
# Translation of balooctl.po into Serbian.
-# Chusslove Illich , 2014.
+# Chusslove Illich , 2014, 2015.
msgid ""
msgstr ""
"Project-Id-Version: balooctl\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/po/sr@ijekavian/balooctl.po new/baloo-5.6.1/po/sr@ijekavian/balooctl.po
--- old/baloo-5.6.0/po/sr@ijekavian/balooctl.po 2015-01-23 13:22:09.000000000 +0100
+++ new/baloo-5.6.1/po/sr@ijekavian/balooctl.po 2015-02-21 21:45:35.000000000 +0100
@@ -1,5 +1,5 @@
# Translation of balooctl.po into Serbian.
-# Chusslove Illich , 2014.
+# Chusslove Illich , 2014, 2015.
msgid ""
msgstr ""
"Project-Id-Version: balooctl\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/po/sr@ijekavianlatin/balooctl.po new/baloo-5.6.1/po/sr@ijekavianlatin/balooctl.po
--- old/baloo-5.6.0/po/sr@ijekavianlatin/balooctl.po 2015-01-23 13:22:13.000000000 +0100
+++ new/baloo-5.6.1/po/sr@ijekavianlatin/balooctl.po 2015-02-21 21:45:58.000000000 +0100
@@ -1,5 +1,5 @@
# Translation of balooctl.po into Serbian.
-# Chusslove Illich , 2014.
+# Chusslove Illich , 2014, 2015.
msgid ""
msgstr ""
"Project-Id-Version: balooctl\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/po/sr@latin/balooctl.po new/baloo-5.6.1/po/sr@latin/balooctl.po
--- old/baloo-5.6.0/po/sr@latin/balooctl.po 2015-01-23 13:22:17.000000000 +0100
+++ new/baloo-5.6.1/po/sr@latin/balooctl.po 2015-02-21 21:45:58.000000000 +0100
@@ -1,5 +1,5 @@
# Translation of balooctl.po into Serbian.
-# Chusslove Illich , 2014.
+# Chusslove Illich , 2014, 2015.
msgid ""
msgstr ""
"Project-Id-Version: balooctl\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/src/file/kinotify.cpp new/baloo-5.6.1/src/file/kinotify.cpp
--- old/baloo-5.6.0/src/file/kinotify.cpp 2015-01-23 13:10:08.000000000 +0100
+++ new/baloo-5.6.1/src/file/kinotify.cpp 2015-02-21 21:41:49.000000000 +0100
@@ -54,7 +54,7 @@
QByteArray concatPath(const QByteArray& p1, const QByteArray& p2)
{
QByteArray p(p1);
- if (p.isEmpty() || p[p.length() - 1] != '/')
+ if (p.isEmpty() || (!p2.isEmpty() && p[p.length() - 1] != '/'))
p.append('/');
p.append(p2);
return p;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/src/file/pendingfile.cpp new/baloo-5.6.1/src/file/pendingfile.cpp
--- old/baloo-5.6.0/src/file/pendingfile.cpp 2015-01-23 13:10:08.000000000 +0100
+++ new/baloo-5.6.1/src/file/pendingfile.cpp 2015-02-21 21:41:49.000000000 +0100
@@ -41,6 +41,9 @@
void PendingFile::setPath(const QString& path)
{
m_path = path;
+ if (m_path.endsWith('/')) {
+ m_path = m_path.mid(0, m_path.length() - 1);
+ }
}
bool PendingFile::shouldIndexContents() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/src/kioslaves/kded/baloosearchfolderupdater.desktop new/baloo-5.6.1/src/kioslaves/kded/baloosearchfolderupdater.desktop
--- old/baloo-5.6.0/src/kioslaves/kded/baloosearchfolderupdater.desktop 2015-01-23 13:10:08.000000000 +0100
+++ new/baloo-5.6.1/src/kioslaves/kded/baloosearchfolderupdater.desktop 2015-02-21 21:41:49.000000000 +0100
@@ -11,6 +11,7 @@
Name=Search Folder Updater
Name[ca]=Actualitzador de les carpetes de cerca
Name[cs]=Nástroj pro aktualizaci složek pro vyhledávání
+Name[da]=Opdatering af søgemappe
Name[de]=Suchordner-Aktualisierung
Name[el]=Εργαλείο ενημέρωσης φακέλου αναζήτησης
Name[en_GB]=Search Folder Updater
@@ -35,6 +36,7 @@
Comment=Allows automatic updates of Search Folders
Comment[ca]=Permet l'actualització automàtica de les carpetes de cerca
Comment[cs]=Umožňuje automatickou aktualizaci prohledávaných složek
+Comment[da]=Tillad automatisk opdatering af søgemapper
Comment[de]=Ermöglicht die automatische Aktualisierung von Suchordnern
Comment[el]=Επιτρέπει την αυτόματη ενημέρωση των φακέλων αναζήτησης
Comment[en_GB]=Allows automatic updates of Search Folders
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/src/lib/filemapping.cpp new/baloo-5.6.1/src/lib/filemapping.cpp
--- old/baloo-5.6.0/src/lib/filemapping.cpp 2015-01-23 13:10:08.000000000 +0100
+++ new/baloo-5.6.1/src/lib/filemapping.cpp 2015-02-21 21:41:49.000000000 +0100
@@ -62,6 +62,9 @@
void FileMapping::setUrl(const QString& url)
{
m_url = url;
+ if (m_url.endsWith('/')) {
+ m_url = m_url.mid(0, m_url.length() - 1);
+ }
}
bool FileMapping::fetched()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/src/xapian/xapiandatabase.cpp new/baloo-5.6.1/src/xapian/xapiandatabase.cpp
--- old/baloo-5.6.0/src/xapian/xapiandatabase.cpp 2015-01-23 13:10:08.000000000 +0100
+++ new/baloo-5.6.1/src/xapian/xapiandatabase.cpp 2015-02-21 21:41:49.000000000 +0100
@@ -123,20 +123,20 @@
Xapian::WritableDatabase wdb = createWritableDb();
- qDebug() << "Adding:" << m_docsToAdd.size() << "docs";
- Q_FOREACH (const DocIdPair& doc, m_docsToAdd) {
+ qDebug() << "Removing:" << m_docsToRemove.size() << "docs";
+ Q_FOREACH (Xapian::docid id, m_docsToRemove) {
try {
- wdb.replace_document(doc.first, doc.second);
+ wdb.delete_document(id);
}
catch (const Xapian::Error& err) {
qDebug() << "ERROR" << err.get_description().c_str();
}
}
- qDebug() << "Removing:" << m_docsToRemove.size() << "docs";
- Q_FOREACH (Xapian::docid id, m_docsToRemove) {
+ qDebug() << "Adding:" << m_docsToAdd.size() << "docs";
+ Q_FOREACH (const DocIdPair& doc, m_docsToAdd) {
try {
- wdb.delete_document(id);
+ wdb.replace_document(doc.first, doc.second);
}
catch (const Xapian::Error& err) {
qDebug() << "ERROR" << err.get_description().c_str();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.6.0/src/xapian/xapiandocument.cpp new/baloo-5.6.1/src/xapian/xapiandocument.cpp
--- old/baloo-5.6.0/src/xapian/xapiandocument.cpp 2015-01-23 13:10:08.000000000 +0100
+++ new/baloo-5.6.1/src/xapian/xapiandocument.cpp 2015-02-21 21:41:49.000000000 +0100
@@ -136,6 +136,9 @@
catch (const Xapian::Error& err) {
qDebug() << err.get_description().c_str();
}
+ catch (...) {
+ // bug 343602
+ }
return QByteArray();
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org