# HG changeset patch
# User ludal@logilab.fr
# Date 1235047496 -3600
# Thu Feb 19 13:44:56 2009 +0100
# Node ID 23162ef3b96587c3754e9a8b14eba76df632fb3c
# Parent aed4818f40c4ad51ec97a1c681885daf2f64a743
prepare 0.21.0
diff --git a/__pkginfo__.py b/__pkginfo__.py
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -8,7 +8,7 @@
__docformat__ = "restructuredtext en"
modname = "rql"
-numversion = (0, 20, 2)
+numversion = (0, 21, 0)
version = '.'.join(str(num) for num in numversion)
license = 'LCL'
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-rql (0.20.2-1) DISTRIBUTION; urgency=low
+rql (0.21.0-1) unstable; urgency=low
+
+ * new upstream release
+
+ -- Ludovic Aubry <ludovic.aubry@logilab.fr> Thu, 19 Feb 2009 13:18:48 +0100
+
+rql (0.20.2-1) unstable; urgency=low
* new upstream release
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,16 @@
Section: python
Priority: optional
Maintainer: Logilab Packaging Team <contact@logilab.fr>
-Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr>
-Build-Depends: debhelper (>= 5.0.37.1), python-dev (>=2.4), python (>=2.4), python-central (>= 0.5)
+Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr>, Ludovic Aubry <ludovic.aubry@logilab.fr>
+Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>=2.4), python-all (>=2.4), python-central (>= 0.5), libgecode12-dev, python-sphinx
XS-Python-Version: >= 2.4
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Package: python-rql
-Architecture: all
+Architecture: any
XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, python-egenix-mxdatetime, python-logilab-common (>= 0.35.3-1), python-constraint (>= 0.4.0-1), yapps2-runtime
-Replaces: python2.3-rql, python2.4-rql
-Conflicts: python2.3-rql, python2.4-rql
+Depends: ${python:Depends}, ${misc:depends}, ${shlibs:depends}, python-egenix-mxdatetime, python-logilab-common (>= 0.35.3-1), python-constraint (>= 0.4.0-1), yapps2-runtime
+Provides: ${python:Provides}
Description: relationship query language (RQL) utilities
A library providing the base utilities to handle RQL queries,
such as a parser, a type inferencer.
diff --git a/debian/python-rql.docs b/debian/python-rql.docs
--- a/debian/python-rql.docs
+++ b/debian/python-rql.docs
@@ -1,5 +1,1 @@
-doc/tutoriel_fr.html
-doc/specifications_fr.html
-doc/tutoriel_fr.txt
-doc/specifications_fr.txt
-doc/canonisation.txt
+doc/build/html
diff --git a/debian/python2.3-rql.dirs b/debian/python2.3-rql.dirs
deleted file mode 100644
--- a/debian/python2.3-rql.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/python2.3/site-packages
-usr/lib/python2.3/site-packages/rql
diff --git a/debian/python2.3-rql.docs b/debian/python2.3-rql.docs
deleted file mode 100644
--- a/debian/python2.3-rql.docs
+++ /dev/null
@@ -1,5 +0,0 @@
-doc/tutoriel_fr.html
-doc/specifications_fr.html
-doc/tutoriel_fr.txt
-doc/specifications_fr.txt
-doc/canonisation.txt
diff --git a/debian/python2.3-rql.postinst b/debian/python2.3-rql.postinst
deleted file mode 100644
--- a/debian/python2.3-rql.postinst
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh -e
-#
-
-
-# precompile python files
-VERSION=2.3
-PACKAGEDIR=/usr/lib/python2.3/site-packages/rql
-case "$1" in
- configure|abort-upgrade|abort-remove|abort-deconfigure)
- python$VERSION -O /usr/lib/python$VERSION/compileall.py -q $PACKAGEDIR
- python$VERSION /usr/lib/python$VERSION/compileall.py -q $PACKAGEDIR
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/python2.3-rql.prerm b/debian/python2.3-rql.prerm
deleted file mode 100644
--- a/debian/python2.3-rql.prerm
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh -e
-#
-
-# remove .pyc and .pyo files
-dpkg --listfiles python2.3-rql |
- awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
- xargs rm -f >&2
-
-
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/debian/python2.4-rql.dirs b/debian/python2.4-rql.dirs
deleted file mode 100644
--- a/debian/python2.4-rql.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/python2.4/site-packages
-usr/lib/python2.4/site-packages/rql
diff --git a/debian/python2.4-rql.docs b/debian/python2.4-rql.docs
deleted file mode 100644
--- a/debian/python2.4-rql.docs
+++ /dev/null
@@ -1,5 +0,0 @@
-doc/tutoriel_fr.html
-doc/specifications_fr.html
-doc/tutoriel_fr.txt
-doc/specifications_fr.txt
-doc/canonisation.txt
diff --git a/debian/python2.4-rql.postinst b/debian/python2.4-rql.postinst
deleted file mode 100644
--- a/debian/python2.4-rql.postinst
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh -e
-#
-
-
-# precompile python files
-VERSION=2.4
-PACKAGEDIR=/usr/lib/python2.4/site-packages/rql
-case "$1" in
- configure|abort-upgrade|abort-remove|abort-deconfigure)
- python$VERSION -O /usr/lib/python$VERSION/compileall.py -q $PACKAGEDIR
- python$VERSION /usr/lib/python$VERSION/compileall.py -q $PACKAGEDIR
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/python2.4-rql.prerm b/debian/python2.4-rql.prerm
deleted file mode 100644
--- a/debian/python2.4-rql.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh -e
-#
-
-# remove .pyc and .pyo files
-dpkg --listfiles python2.4-rql |
- awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
- xargs rm -f >&2
-
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,10 @@
build: build-stamp
build-stamp:
dh_testdir
- python setup.py -q build
+ (for PYTHON in `pyversions -r`; do \
+ $${PYTHON} setup.py build ; done )
+ ${MAKE} -C doc html
touch build-stamp
-
clean:
dh_testdir
dh_testroot
@@ -31,34 +32,37 @@
dh_testroot
dh_clean -k
dh_installdirs
- python setup.py -q install --no-compile --prefix=debian/python-rql/usr/ --install-headers=debian/python-rql/usr/include/ --install-scripts=debian/python-rql/usr/bin
+ (for PYTHON in `pyversions -r`; do \
+ $${PYTHON} setup.py install --no-compile --prefix=debian/python-rql/usr/ ; \
+ done)
# remove test directory (installed in in the doc directory)
rm -rf debian/python-rql/usr/lib/python*/site-packages/rql/test
# install tests
(cd test && find . -type f -not \( -name '*.pyc' \) -exec install -D --mode=644 {} ../debian/python-rql/usr/share/doc/python-rql/test/{} \;)
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
+
+# Build architecture-dependent files here.
+binary-arch: build install
dh_testdir
dh_testroot
- dh_install -i
- dh_pycentral -i
- dh_python -i
+ dh_install -a
+ dh_pycentral -a
gzip -9 -c ChangeLog > changelog.gz
- dh_installchangelogs -i
- dh_installexamples -i
- dh_installdocs -i README TODO changelog.gz
- dh_installman -i
- dh_link -i
- dh_compress -i -X.py -X.ini -X.xml -Xtest
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
+ dh_installchangelogs -a
+ dh_installexamples -a
+ dh_installdocs -a README TODO changelog.gz
+ dh_installman -a
+ dh_link -a
+ dh_compress -a -X.py -X.ini -X.xml -Xtest
+ dh_fixperms -a
+ dh_shlibdeps -a
+ dh_installdeb -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
-# Build architecture-dependent files here.
-binary-arch:
binary: binary-indep binary-arch
.PHONY: build clean binary binary-indep binary-arch