changes 6.12.0

diff --git a/VERSION.cmake b/VERSION.cmake
index 94ddab8..04bf8a1 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -60,9 +60,9 @@
 #
 SET(LIBZYPP_MAJOR "6")
 SET(LIBZYPP_COMPATMINOR "11")
-SET(LIBZYPP_MINOR "11")
-SET(LIBZYPP_PATCH "4")
+SET(LIBZYPP_MINOR "12")
+SET(LIBZYPP_PATCH "0")
 #
-# LAST RELEASED: 6.11.4 (11)
+# LAST RELEASED: 6.12.0 (11)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index d963c0a..f2bd12f 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Fri Jul 31 17:55:33 CEST 2009 - ma@suse.de
+
+- Remove confusing newlines in vendor change info (bnc #503859)
+- Removing a package lock was not counted as state change (bnc #501850)
+- Take solver_allowVendorChange option into account when computing the
+  Selectables default candidate.
+- version 6.12.0 (11)
+
+-------------------------------------------------------------------
 Wed Jul 29 13:36:19 CEST 2009 - ma@suse.de
 
 - Avoid deadlock after fork and failed exec. (bnc 493152)