# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1353492219 -3600
# Node ID 148bf61583f4972302696e07e44d4517b7b9f241
# Parent  b082cbe8bd790d33eab375b1d84b05c52554ce00# Parent  bd0f49f2ec83443cb76f77025ef5d110750f6c5a
merge

diff -r bd0f49f2ec83 -r 148bf61583f4 .hgtags
--- a/.hgtags	Thu Nov 15 15:46:54 2012 +0100
+++ b/.hgtags	Wed Nov 21 11:03:39 2012 +0100
@@ -13,3 +13,5 @@
 b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2
 5559e5a4b656978c592d364f242edc62369d7e84 1.0.2
 c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0
+c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0
+22cacfce2a65ab965c6179ae862b148f4abc7d8a 1.1.0
diff -r bd0f49f2ec83 -r 148bf61583f4 debian/changelog
--- a/debian/changelog	Thu Nov 15 15:46:54 2012 +0100
+++ b/debian/changelog	Wed Nov 21 11:03:39 2012 +0100
@@ -1,3 +1,9 @@
+mercurial-evolve (1.1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Tue, 20 Nov 2012 16:28:12 +0100
+
 mercurial-evolve (1.0.2-1) UNRELEASED; urgency=low
 
   * New upstream Release
diff -r bd0f49f2ec83 -r 148bf61583f4 debian/control
--- a/debian/control	Thu Nov 15 15:46:54 2012 +0100
+++ b/debian/control	Wed Nov 21 11:03:39 2012 +0100
@@ -7,8 +7,8 @@
  Pierre-Yves David <pierre-yves.david@logilab.fr>,
 Standards-Version: 3.9.3
 Build-Depends:
- mercurial (>= 2.3~, <<2.4),
- mercurial-common (>= 2.3~, <<2.4),
+ mercurial (>= 2.3~),
+ mercurial (<<2.4),
  python,
  debhelper (>= 8),
  python-sphinx (>= 1.0.8),
@@ -22,7 +22,8 @@
 Depends:
  ${python:Depends},
  ${misc:Depends},
- mercurial (>= 2.3~, <<2.4),
+ mercurial (>= 2.3~),
+ mercurial (<<2.4),
 Description: evolve extension for Mercurial
  This package provides the experimental "evolve" extension for the Mercurial
  DVCS.
diff -r bd0f49f2ec83 -r 148bf61583f4 setup.py
--- a/setup.py	Thu Nov 15 15:46:54 2012 +0100
+++ b/setup.py	Wed Nov 21 11:03:39 2012 +0100
@@ -5,7 +5,7 @@
 
 setup(
     name='hg-evolve',
-    version='1.0.2',
+    version='1.1.0',
     author='Pierre-Yves David',
     maintainer='Pierre-Yves David',
     maintainer_email='pierre-yves.david@logilab.fr',