- make it compile

- bumb version, add changes

diff --git a/VERSION.cmake b/VERSION.cmake
index 5d630f3771a942a2732b8b99e92ced7be1d4b163..f7a58ef3862a6959539f8c278575045348953874 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -46,6 +46,6 @@
 
 SET(LIBSATSOLVER_MAJOR "0")
 SET(LIBSATSOLVER_MINOR "10")
-SET(LIBSATSOLVER_PATCH "5")
+SET(LIBSATSOLVER_PATCH "6")
 
 # last released 0.10.4

diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index 6747bded1dbda06c33e42d84cf11095a13966bb3..0f38023d2434b4fc9e0bdf14114d8d55dd5f983a 100644 (file)
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Sep  2 12:17:03 CEST 2008 - mls@suse.de
+
+- make solver includes use "" instead of <>, fixes bnc#415920
+- implement otherproviders()
+- make patches do nevr matching
+- make patch conflicts work with multiversion
+- new job commands, now combinded from job type and select type
+- support for distupgrade mode
+- make SOLVER_ERASE_SOLVABLE work
+- also check obsoletes when disabling update rules
+- 0.10.6
+
 -------------------------------------------------------------------
 Fri Aug 22 18:04:12 CEST 2008 - dmacvicar@suse.de
 

diff --git a/src/solver.c b/src/solver.c
index 5e4079f1c8ec0ea9e78a7b5b646a4bf947018ebe..9970faf3d09856ece653f13f62f2d1835be23aa7 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -1064,6 +1064,7 @@ makemultiversionconflict(Solver *solv, Id n, Id con)
   queue_push(&q, -n);
   FOR_PROVIDES(p, pp, sn->name)
     {
+      s = pool->solvables + p;
       if (s->name != sn->name || s->arch != sn->arch)
        continue;
       if (!MAPTST(&solv->noobsoletes, p))