diff --git a/ChangeLog b/ChangeLog
index 2e60c6578324d2c8b561f73f5784cf156fc50b91_Q2hhbmdlTG9n..e0f450b12992dd54156e90bb825e0dce5023f488_Q2hhbmdlTG9n 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
ChangeLog for RQL
=================
+--
+* suport != operator for non equality
+
2011-01-12 -- 0.28.0
* enhance rewrite_shared_optional so one can specify where the new identity
relation should be added (used by cw multi-sources planner)
diff --git a/debian.lenny/control b/debian.lenny/control
index 2e60c6578324d2c8b561f73f5784cf156fc50b91_ZGViaWFuLmxlbm55L2NvbnRyb2w=..e0f450b12992dd54156e90bb825e0dce5023f488_ZGViaWFuLmxlbm55L2NvbnRyb2w= 100644
--- a/debian.lenny/control
+++ b/debian.lenny/control
@@ -2,7 +2,6 @@
Section: python
Priority: optional
Maintainer: Logilab Packaging Team <contact@logilab.fr>
-Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr>, Ludovic Aubry <ludovic.aubry@logilab.fr>, Nicolas Chauvat <nicolas.chauvat@logilab.fr>
-Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>=2.4), python-all (>=2.4), libgecode12-dev, python-sphinx, g++
-Build-Depends-Indep: python-support
+Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr>, Nicolas Chauvat <nicolas.chauvat@logilab.fr>
+Build-Depends: debhelper (>= 5.0.37.1), python-support, python-all-dev (>=2.4), python-all (>=2.4), libgecode12-dev, python-sphinx, g++ (>= 4)
XS-Python-Version: >= 2.4
@@ -8,8 +7,8 @@
XS-Python-Version: >= 2.4
-Standards-Version: 3.8.0
+Standards-Version: 3.9.1
Homepage: http://www.logilab.org/project/rql
Package: python-rql
Architecture: any
XB-Python-Version: ${python:Versions}
Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python-logilab-common (>= 0.35.3-1), yapps2-runtime, python-logilab-database
@@ -10,10 +9,10 @@
Homepage: http://www.logilab.org/project/rql
Package: python-rql
Architecture: any
XB-Python-Version: ${python:Versions}
Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python-logilab-common (>= 0.35.3-1), yapps2-runtime, python-logilab-database
-Conflicts: cubicweb-common (< 3.8.0)
+Conflicts: cubicweb-common (<= 3.8.3)
Provides: ${python:Provides}
Description: relationship query language (RQL) utilities
A library providing the base utilities to handle RQL queries,
diff --git a/debian/changelog b/debian/changelog
index 2e60c6578324d2c8b561f73f5784cf156fc50b91_ZGViaWFuL2NoYW5nZWxvZw==..e0f450b12992dd54156e90bb825e0dce5023f488_ZGViaWFuL2NoYW5nZWxvZw== 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rql (0.28.0-2) UNRELEASED; urgency=low
+
+ * debian/control:
+ - remove Ludovic Aubry from Uploaders
+ * lintian fixes
+
+ --
+
rql (0.28.0-1) unstable; urgency=low
* new upstream release
diff --git a/debian/control b/debian/control
index 2e60c6578324d2c8b561f73f5784cf156fc50b91_ZGViaWFuL2NvbnRyb2w=..e0f450b12992dd54156e90bb825e0dce5023f488_ZGViaWFuL2NvbnRyb2w= 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,13 @@
Section: python
Priority: optional
Maintainer: Logilab Packaging Team <contact@logilab.fr>
-Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr>, Ludovic Aubry <ludovic.aubry@logilab.fr>, Nicolas Chauvat <nicolas.chauvat@logilab.fr>
-Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>=2.4), python-all (>=2.4), libgecode-dev, python-sphinx, g++
-Build-Depends-Indep: python-support
-XS-Python-Version: >= 2.4
-Standards-Version: 3.8.0
+Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr>, Nicolas Chauvat <nicolas.chauvat@logilab.fr>
+Build-Depends: debhelper (>= 5.0.37.1), python-support, python-all-dev (>=2.5), python-all (>=2.5), libgecode-dev, python-sphinx, g++ (>= 4)
+XS-Python-Version: >= 2.5
+Standards-Version: 3.9.1
Homepage: http://www.logilab.org/project/rql
Package: python-rql
Architecture: any
XB-Python-Version: ${python:Versions}
Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python-logilab-common (>= 0.35.3-1), yapps2-runtime, python-logilab-database
@@ -10,10 +9,10 @@
Homepage: http://www.logilab.org/project/rql
Package: python-rql
Architecture: any
XB-Python-Version: ${python:Versions}
Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python-logilab-common (>= 0.35.3-1), yapps2-runtime, python-logilab-database
-Conflicts: cubicweb-common (< 3.8.4)
+Conflicts: cubicweb-common (<= 3.8.3)
Provides: ${python:Provides}
Description: relationship query language (RQL) utilities
A library providing the base utilities to handle RQL queries,
diff --git a/debian/rules b/debian/rules
index 2e60c6578324d2c8b561f73f5784cf156fc50b91_ZGViaWFuL3J1bGVz..e0f450b12992dd54156e90bb825e0dce5023f488_ZGViaWFuL3J1bGVz 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,5 +55,6 @@
dh_installdocs -a README TODO changelog.gz
dh_installman -a
dh_link -a
- dh_compress -a -X.py -X.ini -X.xml -Xtest
+ # .js, .txt and .json are coming from sphinx build
+ dh_compress -a -X.py -X.ini -X.xml -Xtest/ -X.js -X.txt -X.json
dh_fixperms -a
@@ -59,4 +60,5 @@
dh_fixperms -a
+ dh_strip
dh_shlibdeps -a
dh_installdeb -a
dh_gencontrol -a
diff --git a/nodes.py b/nodes.py
index 2e60c6578324d2c8b561f73f5784cf156fc50b91_bm9kZXMucHk=..e0f450b12992dd54156e90bb825e0dce5023f488_bm9kZXMucHk= 100644
--- a/nodes.py
+++ b/nodes.py
@@ -484,7 +484,7 @@
self.optional= value
-OPERATORS = frozenset(('=', '<', '<=', '>=', '>', 'ILIKE', 'LIKE'))
+OPERATORS = frozenset(('=', '!=', '<', '<=', '>=', '>', 'ILIKE', 'LIKE'))
class Comparison(HSMixin, Node):
"""handle comparisons:
diff --git a/parser.g b/parser.g
index 2e60c6578324d2c8b561f73f5784cf156fc50b91_cGFyc2VyLmc=..e0f450b12992dd54156e90bb825e0dce5023f488_cGFyc2VyLmc= 100644
--- a/parser.g
+++ b/parser.g
@@ -88,7 +88,7 @@
token FALSE: r'(?i)FALSE'
token NULL: r'(?i)NULL'
token EXISTS: r'(?i)EXISTS'
- token CMP_OP: r'(?i)<=|<|>=|>|~=|=|LIKE|ILIKE'
+ token CMP_OP: r'(?i)<=|<|>=|>|!=|=|~=|LIKE|ILIKE'
token ADD_OP: r'\+|-'
token MUL_OP: r'\*|/'
token FUNCTION: r'[A-Za-z_]+\s*(?=\()'
diff --git a/parser.py b/parser.py
index 2e60c6578324d2c8b561f73f5784cf156fc50b91_cGFyc2VyLnB5..e0f450b12992dd54156e90bb825e0dce5023f488_cGFyc2VyLnB5 100644
--- a/parser.py
+++ b/parser.py
@@ -109,7 +109,7 @@
('FALSE', re.compile('(?i)FALSE')),
('NULL', re.compile('(?i)NULL')),
('EXISTS', re.compile('(?i)EXISTS')),
- ('CMP_OP', re.compile('(?i)<=|<|>=|>|~=|=|LIKE|ILIKE')),
+ ('CMP_OP', re.compile('(?i)<=|<|>=|>|!=|=|~=|LIKE|ILIKE')),
('ADD_OP', re.compile('\\+|-')),
('MUL_OP', re.compile('\\*|/')),
('FUNCTION', re.compile('[A-Za-z_]+\\s*(?=\\()')),