# HG changeset patch # User Nicolas Chauvat # Date 1243260212 -7200 # Node ID fdb50aa7e5b354eb2a071cb013e4b6cec74f66fe # Parent 31843b49188d049d785496f4df4b4046afdd5b8d# Parent 983dfd00df2164fafcbe156cdd03192b2d1500e9 merge diff -r 31843b49188d -r fdb50aa7e5b3 MANIFEST.in --- a/MANIFEST.in Mon May 25 16:03:09 2009 +0200 +++ b/MANIFEST.in Mon May 25 16:03:32 2009 +0200 @@ -3,7 +3,7 @@ include bin/cubicweb-* include man/cubicweb-ctl.1 -recursive-include doc *.txt *.zargo *.png *.html makefile +recursive-include doc *.txt *.rst *.zargo *.png *.html makefile recursive-include misc * diff -r 31843b49188d -r fdb50aa7e5b3 cwvreg.py --- a/cwvreg.py Mon May 25 16:03:09 2009 +0200 +++ b/cwvreg.py Mon May 25 16:03:32 2009 +0200 @@ -372,6 +372,8 @@ default to a dump of the class registered for 'Any' """ usercls = super(MulCnxCubicWebRegistry, self).etype_class(etype) + if etype == 'Any': + return usercls usercls.e_schema = self.schema.eschema(etype) return usercls diff -r 31843b49188d -r fdb50aa7e5b3 debian/changelog --- a/debian/changelog Mon May 25 16:03:09 2009 +0200 +++ b/debian/changelog Mon May 25 16:03:32 2009 +0200 @@ -1,3 +1,9 @@ +cubicweb (3.2.1-1) unstable; urgency=low + + * new upstream release + + -- Nicolas Chauvat Sun, 24 May 2009 02:08:06 +0200 + cubicweb (3.2.0-1) unstable; urgency=low * new upstream release @@ -53,37 +59,37 @@ -- Sylvain Thénault Tue, 27 Jan 2009 16:05:12 +0100 -cubicweb (3.0.3-1) DISTRIBUTION; urgency=low +cubicweb (3.0.3-1) unstable; urgency=low * new upstream release -- Aurélien Campéas Wed, 14 Jan 2009 18:25:21 +0100 -cubicweb (3.0.2-1) DISTRIBUTION; urgency=low +cubicweb (3.0.2-1) unstable; urgency=low * new upstream release -- Sylvain Thénault Wed, 14 Jan 2009 13:25:21 +0100 -cubicweb (3.0.1-1) DISTRIBUTION; urgency=low +cubicweb (3.0.1-1) unstable; urgency=low * new upstream release -- Sylvain Thénault Thu, 08 Jan 2009 18:27:37 +0100 -cubicweb (3.0.0-1) DISTRIBUTION; urgency=low +cubicweb (3.0.0-1) unstable; urgency=low * new upstream release -- Adrien Di Mascio Tue, 23 Dec 2008 18:42:43 +0100 -cubicweb (2.99.99-1) DISTRIBUTION; urgency=low +cubicweb (2.99.99-1) unstable; urgency=low * new upstream release -- Sylvain Thénault Mon, 22 Dec 2008 17:34:45 +0100 -cubicweb (2.99.7-1) DISTRIBUTION; urgency=low +cubicweb (2.99.7-1) unstable; urgency=low * remove buggy cubicweb-common.postinst * replace erudi|ginco by cubicweb where necessary in existing instance @@ -91,43 +97,43 @@ -- Sylvain Thénault Fri, 19 Dec 2008 17:11:00 +0100 -cubicweb (2.99.6-1) DISTRIBUTION; urgency=low +cubicweb (2.99.6-1) unstable; urgency=low * new upstream release -- Sylvain Thénault Fri, 19 Dec 2008 15:16:37 +0100 -cubicweb (2.99.5-1) DISTRIBUTION; urgency=low +cubicweb (2.99.5-1) unstable; urgency=low * new upstream release -- Sylvain Thénault Wed, 17 Dec 2008 14:14:26 +0100 -cubicweb (2.99.4-1) DISTRIBUTION; urgency=low +cubicweb (2.99.4-1) unstable; urgency=low * new upstream release -- Adrien Di Mascio Fri, 12 Dec 2008 10:00:31 +0100 -cubicweb (2.99.3-1) DISTRIBUTION; urgency=low +cubicweb (2.99.3-1) unstable; urgency=low * new upstream release -- Adrien Di Mascio Tue, 09 Dec 2008 07:42:16 +0100 -cubicweb (2.99.2-1) DISTRIBUTION; urgency=low +cubicweb (2.99.2-1) unstable; urgency=low * new upstream release -- Adrien Di Mascio Mon, 17 Nov 2008 15:02:16 +0100 -cubicweb (2.99.1-1) DISTRIBUTION; urgency=low +cubicweb (2.99.1-1) unstable; urgency=low * new upstream release -- Nicolas Chauvat Thu, 13 Nov 2008 11:02:16 +0100 -cubicweb (2.99.0-1) DISTRIBUTION; urgency=low +cubicweb (2.99.0-1) unstable; urgency=low * initial public release diff -r 31843b49188d -r fdb50aa7e5b3 debian/control --- a/debian/control Mon May 25 16:03:09 2009 +0200 +++ b/debian/control Mon May 25 16:03:32 2009 +0200 @@ -2,10 +2,12 @@ Section: web Priority: optional Maintainer: Logilab S.A. -Uploaders: Sylvain Thenault , +Uploaders: Sylvain Thénault , Julien Jehannet , - Aurélien Campéas -Build-Depends: debhelper (>= 7), python-dev (>=2.4), python-central (>= 0.5) + Aurélien Campéas , + Nicolas Chauvat +Build-Depends: debhelper (>= 7), python-dev (>=2.4) +Build-Depends-Indep: python-support Standards-Version: 3.8.0 Homepage: http://www.cubicweb.org XS-Python-Version: >= 2.4, << 2.6 diff -r 31843b49188d -r fdb50aa7e5b3 debian/rules --- a/debian/rules Mon May 25 16:03:09 2009 +0200 +++ b/debian/rules Mon May 25 16:03:32 2009 +0200 @@ -64,7 +64,7 @@ binary-indep: build install dh_testdir dh_testroot -i - dh_pycentral -i + dh_pysupport -i dh_installinit -i -n --name cubicweb -u"defaults 99" dh_installlogrotate -i dh_installdocs -i -A README