# HG changeset patch
# User Julien Cristau <julien.cristau@logilab.fr>
# Date 1427473359 -3600
# Node ID 11c2080722594bdf09ca3b5f002357dc8a1e75a5
# Parent  848b7ca9636ee80e331ade06b854aeffd985a990# Parent  4fc5cd6287abdf94d9b2672926542133435b6345
merge 3.19.11-2 into 3.20

diff -r 848b7ca9636e -r 11c208072259 .hgtags
--- a/.hgtags	Fri Mar 27 16:37:26 2015 +0100
+++ b/.hgtags	Fri Mar 27 17:22:39 2015 +0100
@@ -404,6 +404,7 @@
 1ae64186af9448dffbeebdef910c8c7391c04313 cubicweb-version-3.19.11
 1ae64186af9448dffbeebdef910c8c7391c04313 cubicweb-debian-version-3.19.11-1
 1ae64186af9448dffbeebdef910c8c7391c04313 cubicweb-centos-version-3.19.11-1
+6d265ea7d56fe49e9dff261d3b2caf3c2b6f9409 cubicweb-debian-version-3.19.11-2
 7e6b7739afe6128589ad51b0318decb767cbae36 cubicweb-version-3.20.0
 7e6b7739afe6128589ad51b0318decb767cbae36 cubicweb-debian-version-3.20.0-1
 7e6b7739afe6128589ad51b0318decb767cbae36 cubicweb-centos-version-3.20.0-1
diff -r 848b7ca9636e -r 11c208072259 debian/changelog
--- a/debian/changelog	Fri Mar 27 16:37:26 2015 +0100
+++ b/debian/changelog	Fri Mar 27 17:22:39 2015 +0100
@@ -34,6 +34,12 @@
 
  -- Julien Cristau <julien.cristau@logilab.fr>  Tue, 06 Jan 2015 18:11:03 +0100
 
+cubicweb (3.19.11-2) UNRELEASED; urgency=low
+
+  * Fix cubicweb-dev dependencies.
+
+ -- Julien Cristau <julien.cristau@logilab.fr>  Fri, 27 Mar 2015 16:53:20 +0100
+
 cubicweb (3.19.11-1) unstable; urgency=low
 
   * new upstream release
diff -r 848b7ca9636e -r 11c208072259 debian/control
--- a/debian/control	Fri Mar 27 16:37:26 2015 +0100
+++ b/debian/control	Fri Mar 27 17:22:39 2015 +0100
@@ -204,7 +204,7 @@
  ${python:Depends},
  cubicweb-server (= ${source:Version}),
  cubicweb-web (= ${source:Version}),
- cubicweb-etwist (= ${source:Version}),
+ cubicweb-twisted (= ${source:Version}),
  python-pysqlite2
 Suggests:
  w3c-dtd-xhtml,
diff -r 848b7ca9636e -r 11c208072259 debian/watch
--- a/debian/watch	Fri Mar 27 16:37:26 2015 +0100
+++ b/debian/watch	Fri Mar 27 17:22:39 2015 +0100
@@ -1,2 +1,3 @@
 version=3
-http://download.logilab.org/pub/cubicweb cubicweb-(.*)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/cubicweb/cubicweb-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))