# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1284108602 -7200
#      Fri Sep 10 10:50:02 2010 +0200
# Branch stable
# Node ID f48d2c3fdcdb1a33a4478b26a69877dc2ecaf7f9
# Parent  79a869714ae70096ce7d0ae8d39ad294f891f0f8
0.26.6

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,23 @@
 ChangeLog for RQL
 =================
 
---
+2010-09-10  --  0.26.6
     * enhance bad rql query detection with ordered distinct (can't use distinct
       if an attribute is selected and we sort on another attribute)
 
-    * add constraint package to dependencies  so we've fallback opportunity if
-      gecode is not installed
-
     * fix subquery_selection_index responsability mess-up: it wasn't doing what
       it should have done (see cw.rset related_entity implementation)
 
     * consider subquery aliases in Select.clean_solutions
 
+    * add constraint package to setuptools dependencies so we've fallback
+      opportunity if gecode is not installed
+
+    * fix setuptools dependency on yapps by forcing install of our custom
+      package, so it don't try to install pypi's one which doesn't work well
+      with both pip and easy_install
+
+
 
 2010-08-02  --  0.26.5
     * fix solutions computation crash with some query using sub-queries (closes #37423)
diff --git a/__pkginfo__.py b/__pkginfo__.py
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -20,7 +20,7 @@
 __docformat__ = "restructuredtext en"
 
 modname = "rql"
-numversion = (0, 26, 5)
+numversion = (0, 26, 6)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LGPL'
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rql (0.26.6-1) unstable; urgency=low
+
+  * new upstream release
+
+ --
+
 rql (0.26.5-1) unstable; urgency=low
 
   * new upstream release