# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1351267218 -7200
# Node ID e7b533be69f2da8c3b74dd4a72d3b519e721a42c
# Parent  d14f9c4ceaa79798be559f6d5e922b3cc51c1397# Parent  cd29c8c8b0a108a8e0b2386583253f2a27750d7e
merge with 1.1.0

diff -r d14f9c4ceaa7 -r e7b533be69f2 .hgtags
--- a/.hgtags	Fri Oct 26 17:38:51 2012 +0200
+++ b/.hgtags	Fri Oct 26 18:00:18 2012 +0200
@@ -12,3 +12,4 @@
 ca5bb72d14aeb6e6053e3a53c064a2b7dc8010e5 1.0.1
 b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2
 5559e5a4b656978c592d364f242edc62369d7e84 1.0.2
+c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0
diff -r d14f9c4ceaa7 -r e7b533be69f2 debian/control
--- a/debian/control	Fri Oct 26 17:38:51 2012 +0200
+++ b/debian/control	Fri Oct 26 18:00:18 2012 +0200
@@ -7,8 +7,8 @@
  Pierre-Yves David <pierre-yves.david@logilab.fr>,
 Standards-Version: 3.9.3
 Build-Depends:
- mercurial (>= 2.3~),
- mercurial-common (>= 2.3~),
+ mercurial (>= 2.3~, <<2.4),
+ mercurial-common (>= 2.3~, <<2.4),
  python,
  debhelper (>= 8),
  python-sphinx (>= 1.0.8),
@@ -22,7 +22,7 @@
 Depends:
  ${python:Depends},
  ${misc:Depends},
- mercurial (>= 2.3~),
+ mercurial (>= 2.3~, <<2.4),
 Description: evolve extension for Mercurial
  This package provides the experimental "evolve" extension for the Mercurial
  DVCS.