Hello community,
here is the log from the commit of package libkomparediff2 for openSUSE:Factory
checked in at 2020-06-14 18:23:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkomparediff2 (Old)
and /work/SRC/openSUSE:Factory/.libkomparediff2.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkomparediff2"
Sun Jun 14 18:23:15 2020 rev:82 rq:813755 version:20.04.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libkomparediff2/libkomparediff2.changes
2020-05-20 18:43:11.604976503 +0200
+++
/work/SRC/openSUSE:Factory/.libkomparediff2.new.3606/libkomparediff2.changes
2020-06-14 18:23:22.112236470 +0200
@@ -1,0 +2,10 @@
+Tue Jun 9 12:16:16 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 20.04.2
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2020-06-apps-update
+- Changes since 20.04.1:
+ * Fix broken error emission if blendOriginalIntoModelList went wrong
+
+-------------------------------------------------------------------
Old:
----
libkomparediff2-20.04.1.tar.xz
libkomparediff2-20.04.1.tar.xz.sig
New:
----
libkomparediff2-20.04.2.tar.xz
libkomparediff2-20.04.2.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libkomparediff2.spec ++++++
--- /var/tmp/diff_new_pack.d4W9YT/_old 2020-06-14 18:23:23.828242006 +0200
+++ /var/tmp/diff_new_pack.d4W9YT/_new 2020-06-14 18:23:23.832242019 +0200
@@ -22,7 +22,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: libkomparediff2
-Version: 20.04.1
+Version: 20.04.2
Release: 0
Summary: A library to compare files and strings
License: (GPL-2.0-or-later AND LGPL-2.0-or-later) AND BSD-2-Clause
++++++ libkomparediff2-20.04.1.tar.xz -> libkomparediff2-20.04.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-20.04.1/komparemodellist.cpp
new/libkomparediff2-20.04.2/komparemodellist.cpp
--- old/libkomparediff2-20.04.1/komparemodellist.cpp 2020-05-06
22:10:31.000000000 +0200
+++ new/libkomparediff2-20.04.2/komparemodellist.cpp 2020-06-07
04:45:24.000000000 +0200
@@ -269,7 +269,7 @@
if (!blendOriginalIntoModelList(m_info->localSource))
{
qCDebug(LIBKOMPAREDIFF2) << "Oops cant blend original file into
modellist : " << m_info->localSource;
- emit(i18n("<qt>There were problems applying the diff <b>%1</b> to the
file <b>%2</b>.</qt>", m_info->destination.url(), m_info->source.url()));
+ emit error(i18n("<qt>There were problems applying the diff <b>%1</b>
to the file <b>%2</b>.</qt>", m_info->destination.url(), m_info->source.url()));
return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-20.04.1/po/cs/libkomparediff2.po
new/libkomparediff2-20.04.2/po/cs/libkomparediff2.po
--- old/libkomparediff2-20.04.1/po/cs/libkomparediff2.po 2020-05-12
03:21:28.000000000 +0200
+++ new/libkomparediff2-20.04.2/po/cs/libkomparediff2.po 2020-06-09
02:40:31.000000000 +0200
@@ -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.
-# Vit Pelcak <[email protected]>, 2013.
+# Vit Pelcak <[email protected]>, 2013, 2020.
#
msgid ""
msgstr ""
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 20.04.0\n"
#: komparemodellist.cpp:68
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-20.04.1/po/fr/libkomparediff2.po
new/libkomparediff2-20.04.2/po/fr/libkomparediff2.po
--- old/libkomparediff2-20.04.1/po/fr/libkomparediff2.po 2020-05-12
03:21:28.000000000 +0200
+++ new/libkomparediff2-20.04.2/po/fr/libkomparediff2.po 2020-06-09
02:40:31.000000000 +0200
@@ -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.
-# xavier <[email protected]>, 2013.
+# xavier <[email protected]>, 2013, 2020.
#
msgid ""
msgstr ""
@@ -9,13 +9,13 @@
"POT-Creation-Date: 2020-05-07 09:21+0200\n"
"PO-Revision-Date: 2013-08-13 10:30+0200\n"
"Last-Translator: xavier <[email protected]>\n"
-"Language-Team: French <[email protected]>\n"
+"Language-Team: French <[email protected]>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 20.04.0\n"
"X-Environment: kde\n"
"X-Accelerator-Marker: &\n"
"X-Text-Markup: kde4\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-20.04.1/po/zh_TW/libkomparediff2.po
new/libkomparediff2-20.04.2/po/zh_TW/libkomparediff2.po
--- old/libkomparediff2-20.04.1/po/zh_TW/libkomparediff2.po 2020-05-12
03:21:29.000000000 +0200
+++ new/libkomparediff2-20.04.2/po/zh_TW/libkomparediff2.po 2020-06-09
02:40:31.000000000 +0200
@@ -4,20 +4,21 @@
# Franklin Weng <franklin at goodhorse dot idv dot tw>, 2007.
# Frank Weng (a.k.a. Franklin) <[email protected]>, 2009.
# Franklin Weng <[email protected]>, 2011, 2012, 2013.
+# Yi-Jyun Pan <[email protected]>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-05-07 09:21+0200\n"
-"PO-Revision-Date: 2013-02-23 13:04+0800\n"
-"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
-"Language-Team: Chinese Traditional <[email protected]>\n"
+"PO-Revision-Date: 2020-05-15 00:15+0800\n"
+"Last-Translator: Yi-Jyun Pan <[email protected]>\n"
+"Language-Team: Chinese <[email protected]>\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"dot tw>\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 20.04.0\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: komparemodellist.cpp:68
