# HG changeset patch
# User Denis Laxalde <denis.laxalde@logilab.fr>
# Date 1559912182 -7200
# Node ID 06faf72cf308fb7858a83d25b08d2aa7d64506f3
# Parent  6b314fc558ed33e09ff453053c6d0097e6232f95# Parent  dfab9ef29538becce623631339b8a48a98c7d844
Merge with 3.26

diff -r 6b314fc558ed -r 06faf72cf308 .hgtags
--- a/.hgtags	Tue May 28 12:35:34 2019 +0200
+++ b/.hgtags	Fri Jun 07 14:56:22 2019 +0200
@@ -634,3 +634,7 @@
 91f75319a726b523a09103540d3bc6872aaf2ae4 3.26.8
 4d6909de765ac036ddef00b5853213fcae56d525 3.26.9
 74cc5de1ee6c578db401c89716fdc43b27624a04 3.26.10
+a3e702fcf6eff459d72a1aa165ff87ea3951bb6b debian/3.26.10-1
+0ce26fb5ab48e1a7a3e9d0b6f05fae24f18442b5 debian/3.26.10-1
+633ca84bea584c89c0d4f1cd4961b3f5f45c8e31 3.26.11
+633ca84bea584c89c0d4f1cd4961b3f5f45c8e31 debian/3.26.11-1
diff -r 6b314fc558ed -r 06faf72cf308 cubicweb/__pkginfo__.py
diff -r 6b314fc558ed -r 06faf72cf308 debian/changelog
--- a/debian/changelog	Tue May 28 12:35:34 2019 +0200
+++ b/debian/changelog	Fri Jun 07 14:56:22 2019 +0200
@@ -1,3 +1,15 @@
+cubicweb (3.26.11-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Denis Laxalde <denis.laxalde@logilab.fr>  Fri, 07 Jun 2019 14:52:32 +0200
+
+cubicweb (3.26.10-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Denis Laxalde <denis.laxalde@logilab.fr>  Thu, 23 May 2019 16:59:45 +0200
+
 cubicweb (3.26.6-1) unstable; urgency=medium
 
   * New upstream release
diff -r 6b314fc558ed -r 06faf72cf308 debian/control
diff -r 6b314fc558ed -r 06faf72cf308 debian/rules
--- a/debian/rules	Tue May 28 12:35:34 2019 +0200
+++ b/debian/rules	Fri Jun 07 14:56:22 2019 +0200
@@ -7,6 +7,7 @@
 
 export PYBUILD_NAME=cubicweb
 export PYBUILD_DISABLE_python2=test
+export PYBUILD_DISABLE_python3=test
 
 %:
 	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
@@ -19,11 +20,6 @@
 	PYTHONPATH=. sphinx-build -N -bhtml doc/ debian/cubicweb-doc/html
 endif
 
-override_dh_auto_install:
-	dh_auto_install
-	mv debian/python-${PYBUILD_NAME}/usr/bin/cubicweb-ctl \
-		debian/cubicweb-ctl/usr/bin/cubicweb-ctl
-
 override_dh_installchangelogs:
 	dh_installchangelogs -Xdoc/changes