# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1371222797 -7200
# Node ID dfa4da8a53a08c02c94c9759bb3b04813b286c4e
# Parent  1f3d4d829e6318782d148ec8ca98b734dfa0b54d# Parent  b4bcabf55e77efde2f4b63a0045c837525253ab4
merge stable back into default

diff -r 1f3d4d829e63 -r dfa4da8a53a0 .hgtags
--- a/.hgtags	Fri Jun 14 14:41:50 2013 +0200
+++ b/.hgtags	Fri Jun 14 17:13:17 2013 +0200
@@ -297,6 +297,9 @@
 041804bc48e91e440a5b573ceb0df5bf22863b80 cubicweb-version-3.16.4
 041804bc48e91e440a5b573ceb0df5bf22863b80 cubicweb-debian-version-3.16.4-1
 041804bc48e91e440a5b573ceb0df5bf22863b80 cubicweb-centos-version-3.16.4-1
+810a05fba1a46ab893b6cadac109097a047f8355 cubicweb-version-3.16.5
+810a05fba1a46ab893b6cadac109097a047f8355 cubicweb-debiann-version-3.16.5-1
+810a05fba1a46ab893b6cadac109097a047f8355 cubicweb-centos-version-3.16.5-1
 f98d1c46ed9fd5db5262cf5be1c8e159c90efc8b cubicweb-version-3.17.1
 f98d1c46ed9fd5db5262cf5be1c8e159c90efc8b cubicweb-version-3.17.1
 73f2ad404716cd211b735e67ee16875f1fff7374 cubicweb-debian-version-3.17.1-1
diff -r 1f3d4d829e63 -r dfa4da8a53a0 __pkginfo__.py
diff -r 1f3d4d829e63 -r dfa4da8a53a0 cubicweb.spec
diff -r 1f3d4d829e63 -r dfa4da8a53a0 cwctl.py
--- a/cwctl.py	Fri Jun 14 14:41:50 2013 +0200
+++ b/cwctl.py	Fri Jun 14 17:13:17 2013 +0200
@@ -439,7 +439,7 @@
             chown(config.appdatahome, config['uid'])
         print '\n-> creation done for %s\n' % repr(config.apphome)[1:-1]
         if not self.config.no_db_create:
-            helper.postcreate(self.config.automatic)
+            helper.postcreate(self.config.automatic, self.config.config_level)
 
     def _handle_win32(self, config, appid):
         if sys.platform != 'win32':
diff -r 1f3d4d829e63 -r dfa4da8a53a0 debian/changelog
--- a/debian/changelog	Fri Jun 14 14:41:50 2013 +0200
+++ b/debian/changelog	Fri Jun 14 17:13:17 2013 +0200
@@ -22,6 +22,12 @@
 
  -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Mon, 29 Apr 2013 11:20:56 +0200
 
+cubicweb (3.16.5-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- David Douard <david.douard@logilab.fr>  Fri, 14 Jun 2013 16:01:47 +0200
+
 cubicweb (3.16.4-1) unstable; urgency=low
 
   * New upstream release
diff -r 1f3d4d829e63 -r dfa4da8a53a0 selectors.py
diff -r 1f3d4d829e63 -r dfa4da8a53a0 server/serverconfig.py
--- a/server/serverconfig.py	Fri Jun 14 14:41:50 2013 +0200
+++ b/server/serverconfig.py	Fri Jun 14 17:13:17 2013 +0200
@@ -239,14 +239,14 @@
           {'type' : 'csv',
            'default' : None,
            'help': ('List of ZMQ addresses to subscribe to (requires pyzmq) '
-                    '(of the form `zmqpickle-tcp://<ipaddr>:<port>`)'),
+                    '(of the form `tcp://<ipaddr>:<port>`)'),
            'group': 'zmq', 'level': 1,
            }),
          ('zmq-address-pub',
           {'type' : 'string',
            'default' : None,
            'help': ('ZMQ address to use for publishing (requires pyzmq) '
-                    '(of the form `zmqpickle-tcp://<ipaddr>:<port>`)'),
+                    '(of the form `tcp://<ipaddr>:<port>`)'),
            'group': 'zmq', 'level': 1,
            }),
         ) + CubicWebConfiguration.options)