backport stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Wed, 09 Feb 2011 19:02:40 +0100
changeset 616 e0f450b12992
parent 612 2e60c6578324 (current diff)
parent 615 7d368dd97930 (diff)
child 617 64531b651183
backport stable
--- a/ChangeLog	Tue Jan 25 10:08:59 2011 +0100
+++ b/ChangeLog	Wed Feb 09 19:02:40 2011 +0100
@@ -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)
--- a/debian.lenny/control	Tue Jan 25 10:08:59 2011 +0100
+++ b/debian.lenny/control	Wed Feb 09 19:02:40 2011 +0100
@@ -2,18 +2,17 @@
 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
-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
-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,
--- a/debian/changelog	Tue Jan 25 10:08:59 2011 +0100
+++ b/debian/changelog	Wed Feb 09 19:02:40 2011 +0100
@@ -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
--- a/debian/control	Tue Jan 25 10:08:59 2011 +0100
+++ b/debian/control	Wed Feb 09 19:02:40 2011 +0100
@@ -2,18 +2,17 @@
 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
-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,
--- a/debian/rules	Tue Jan 25 10:08:59 2011 +0100
+++ b/debian/rules	Wed Feb 09 19:02:40 2011 +0100
@@ -55,8 +55,10 @@
 	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
+	dh_strip
 	dh_shlibdeps -a
 	dh_installdeb -a
 	dh_gencontrol -a
--- a/nodes.py	Tue Jan 25 10:08:59 2011 +0100
+++ b/nodes.py	Wed Feb 09 19:02:40 2011 +0100
@@ -484,7 +484,7 @@
         self.optional= value
 
 
-OPERATORS = frozenset(('=', '<', '<=', '>=', '>', 'ILIKE', 'LIKE'))
+OPERATORS = frozenset(('=', '!=', '<', '<=', '>=', '>', 'ILIKE', 'LIKE'))
 
 class Comparison(HSMixin, Node):
     """handle comparisons:
--- a/parser.g	Tue Jan 25 10:08:59 2011 +0100
+++ b/parser.g	Wed Feb 09 19:02:40 2011 +0100
@@ -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*(?=\()'
--- a/parser.py	Tue Jan 25 10:08:59 2011 +0100
+++ b/parser.py	Wed Feb 09 19:02:40 2011 +0100
@@ -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*(?=\\()')),