Imported Upstream version 17.1.1

diff --git a/VERSION.cmake b/VERSION.cmake
index 118ceb1..e8ae0f5 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "17")
 SET(LIBZYPP_COMPATMINOR "0")
 SET(LIBZYPP_MINOR "1")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")
 #
-# LAST RELEASED: 17.1.0 (0)
+# LAST RELEASED: 17.1.1 (0)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index abf28cb..7ca118f 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Jan 15 17:01:33 CET 2018 - ma@suse.de
+
+- Adapt rpm package verification to changes in rpm-4.14 (bsc#1076018)
+- version 17.1.1 (0)
+
+-------------------------------------------------------------------
 Thu Jan  4 17:49:06 CET 2018 - ma@suse.de
 
 - plugin: don't reject header values containing a ':' (bsc#1074687)

diff --git a/po/nl.po b/po/nl.po
index 5f67145..9d3b8f9 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -16,16 +16,16 @@ msgstr ""
 "Project-Id-Version: zypp.nl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-01 07:26+0100\n"
-"PO-Revision-Date: 2017-10-09 10:19+0000\n"
+"PO-Revision-Date: 2018-01-06 11:27+0000\n"
 "Last-Translator: Nathan Follens <nthn@unseen.is>\n"
-"Language-Team: Dutch <https://l10n.opensuse.org/projects/libzypp/master/nl/"
-">\n"
+"Language-Team: Dutch <https://l10n.opensuse.org/projects/libzypp/master/nl/>"
+"\n"
 "Language: nl\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: Weblate 2.13.1\n"
+"X-Generator: Weblate 2.17.1\n"
 
 #: zypp/target/hal/HalException.h:46 zypp/target/hal/HalException.h:55
 #: zypp/target/hal/HalException.h:64
@@ -1368,9 +1368,8 @@ msgstr ""
 "sleutelring %s"
 
 #: zypp/KeyRing.cc:583
-#, fuzzy
 msgid "Failed to import key."
-msgstr "Importeren van publieke sleutel %1% is mislukt"
+msgstr "Importeren van sleutel is mislukt."
 
 #: zypp/KeyRing.cc:606
 msgid "Failed to delete key."

diff --git a/po/ru.po b/po/ru.po
index dc0de7d..119f163 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: zypp.ru\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-01 07:26+0100\n"
-"PO-Revision-Date: 2017-12-20 18:05+0000\n"
+"PO-Revision-Date: 2018-01-10 18:05+0000\n"
 "Last-Translator: Nikita Maynagashev <maynagashev@palex.ru>\n"
 "Language-Team: Russian "
 "<https://l10n.opensuse.org/projects/libzypp/master/ru/>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.17.1\n"
+"X-Generator: Weblate 2.18\n"
 
 #: zypp/target/hal/HalException.h:46 zypp/target/hal/HalException.h:55
 #: zypp/target/hal/HalException.h:64
@@ -3821,7 +3821,7 @@ msgid "Valid metadata not found at specified URL"
 msgid_plural "Valid metadata not found at specified URLs"
 msgstr[0] "По указанному URL-адресу не найдено допустимых метаданных"
 msgstr[1] "По указанным URL-адресам не найдено допустимых метаданных"
-msgstr[2] "По указанным URL-адресам не найдено допустимых метаданных"
+msgstr[2] "По указанным URL адресам не найдено допустимых метаданных"
 
 #: zypp/RepoManager.cc:1146 zypp/RepoManager.cc:1258 zypp/RepoManager.cc:1314
 #, c-format, boost-format

diff --git a/zypp/target/rpm/RpmDb.cc b/zypp/target/rpm/RpmDb.cc
index 3fd4632..1d07a0c 100644 (file)
--- a/zypp/target/rpm/RpmDb.cc
+++ b/zypp/target/rpm/RpmDb.cc
@@ -1495,7 +1495,7 @@ namespace
 
       int rpmLog( rpmlogRec rec_r )
       {
-       if ( _cap ) (*_cap) = rpmlogRecMessage( rec_r );
+       if ( _cap ) (*_cap) += rpmlogRecMessage( rec_r );
        return RPMLOG_DEFAULT;
       }