Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable
authorNicolas Chauvat <nicolas.chauvat@logilab.fr>
Mon, 25 May 2009 16:03:32 +0200
branchstable
changeset 1921 fdb50aa7e5b3
parent 1920 31843b49188d (current diff)
parent 1919 983dfd00df21 (diff)
child 1922 1a0ddb675951
child 1924 dc903af1a34e
merge
--- 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 *
 
--- 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
 
--- 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 <nicolas.chauvat@logilab.fr>  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 <sylvain.thenault@logilab.fr>  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 <aurelien.campeas@logilab.fr>  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 <sylvain.thenault@logilab.fr>  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 <sylvain.thenault@logilab.fr>  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 <Adrien.DiMascio@logilab.fr>  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 <sylvain.thenault@logilab.fr>  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 <sylvain.thenault@logilab.fr>  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 <sylvain.thenault@logilab.fr>  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 <sylvain.thenault@logilab.fr>  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 <Adrien.DiMascio@logilab.fr>  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 <Adrien.DiMascio@logilab.fr>  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 <adrien.dimascio@logilab.fr>  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 <nicolas.chauvat@logilab.fr>  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
 
--- 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. <contact@logilab.fr>
-Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr>,
+Uploaders: Sylvain Thénault <sylvain.thenault@logilab.fr>,
            Julien Jehannet <julien.jehannet@logilab.fr>,
-           Aurélien Campéas <aurelien.campeas@logilab.fr>
-Build-Depends: debhelper (>= 7), python-dev (>=2.4), python-central (>= 0.5)
+           Aurélien Campéas <aurelien.campeas@logilab.fr>,
+           Nicolas Chauvat <nicolas.chauvat@logilab.fr>
+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
--- 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
cubicweb