Imported Upstream version 15.7.0

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

diff --git a/VERSION.cmake b/VERSION.cmake
index 322599a..a68c729 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -60,9 +60,9 @@
 #
 SET(LIBZYPP_MAJOR "15")
 SET(LIBZYPP_COMPATMINOR "5")
-SET(LIBZYPP_MINOR "6")
+SET(LIBZYPP_MINOR "7")
 SET(LIBZYPP_PATCH "0")
 #
-# LAST RELEASED: 15.6.0 (5)
+# LAST RELEASED: 15.7.0 (5)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 12839da..98bd908 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Jul  1 14:00:42 CEST 2015 - ma@suse.de
+
+- add asString for Patch::Category
+- version 15.7.0 (5)
+
+-------------------------------------------------------------------
 Mon Jun 29 17:43:00 CEST 2015 - ma@suse.de
 
 - Fix lost pathname when importing repo keys (bnc#936373)

diff --git a/zypp/Patch.cc b/zypp/Patch.cc
index 1ee504f..be97834 100644 (file)
--- a/zypp/Patch.cc
+++ b/zypp/Patch.cc
@@ -114,6 +114,21 @@ namespace zypp
     return CAT_OTHER;
   }
 
+  std::string asString( const Patch::Category & obj )
+  {
+    switch ( obj )
+    {
+      case Patch::CAT_OTHER:           return std::string( "other" );          break;
+      case Patch::CAT_YAST:            return std::string( "yast" );           break;
+      case Patch::CAT_SECURITY:                return std::string( "security" );       break;
+      case Patch::CAT_RECOMMENDED:     return std::string( "recommended" );    break;
+      case Patch::CAT_OPTIONAL:                return std::string( "optional" );       break;
+      case Patch::CAT_DOCUMENT:                return std::string( "document" );       break;
+    }
+    // make gcc happy:
+    return std::string( "other" );
+  }
+
   ///////////////////////////////////////////////////////////////////
 
   std::string Patch::severity() const

diff --git a/zypp/Patch.h b/zypp/Patch.h
index 74e1bc0..cda6f1c 100644 (file)
--- a/zypp/Patch.h
+++ b/zypp/Patch.h
@@ -236,6 +236,9 @@ namespace zypp
   ZYPP_DECLARE_OPERATORS_FOR_FLAGS(Patch::InteractiveFlags);
   ZYPP_DECLARE_OPERATORS_FOR_FLAGS(Patch::SeverityFlags);
 
+  /** \relates Patch::Category string representation.*/
+  std::string asString( const Patch::Category & obj );
+
   /** \relates Patch::SeverityFlag string representation.*/
   std::string asString( const Patch::SeverityFlag & obj );