Imported Upstream version 14.42.1

Change-Id: I982964c14bb8264362ff202851e80066abc627f5
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 092d1e6..7d4b596 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "39")
 SET(LIBZYPP_MINOR "42")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")
 #
-# LAST RELEASED: 14.42.0 (39)
+# LAST RELEASED: 14.42.1 (39)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 9e10100..cecccd1 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,20 @@
 -------------------------------------------------------------------
+Thu Oct 15 10:44:14 CEST 2015 - ma@suse.de
+
+- make Solvable::asUserString more readable (bnc#949957)
+- version 14.42.1 (39)
+
+-------------------------------------------------------------------
+Thu Oct 15 01:14:55 CEST 2015 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Oct  8 01:17:27 CEST 2015 - ma@suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
 Tue Sep 29 18:40:05 CEST 2015 - ma@suse.de
 
 - ZYppCommitResult: add attemptToModify to indicate an attempt to

diff --git a/po/sle-zypp-po.tar.bz2 b/po/sle-zypp-po.tar.bz2
index 648fd03..f9490da 100644 (file)
Binary files a/po/sle-zypp-po.tar.bz2 and b/po/sle-zypp-po.tar.bz2 differ

diff --git a/po/zypp-po.tar.bz2 b/po/zypp-po.tar.bz2
index 97b57bf..692cffb 100644 (file)
Binary files a/po/zypp-po.tar.bz2 and b/po/zypp-po.tar.bz2 differ

diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc
index bd700ae..45d2772 100644 (file)
--- a/zypp/sat/Solvable.cc
+++ b/zypp/sat/Solvable.cc
@@ -479,7 +479,7 @@ namespace zypp
     std::string Solvable::asUserString() const\
     {
       NO_SOLVABLE_RETURN( (_id == detail::systemSolvableId ? "systemSolvable" : "noSolvable") );
-      return str::form( "%s-%s.%s(%s)",
+      return str::form( "%s-%s.%s (%s)",
                         IdString( _solvable->name ).c_str(),
                         IdString( _solvable->evr ).c_str(),
                         IdString( _solvable->arch ).c_str(),