Merge branch 'fig' into debian

Conflicts:
	debian/changelog
	debian/patches/series

4 files changed, 28 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 69678972..660c5188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ docker-compose (1.1.0-1) UNRELEASED; urgency=medium
 
  -- Felipe Sateler <fsateler@debian.org>  Thu, 19 Mar 2015 23:30:06 -0300
 
+fig (1.0.0-2) unstable; urgency=medium
+
+  * Relax dependency on docker-py
+
+ -- Felipe Sateler <fsateler@debian.org>  Fri, 15 May 2015 11:16:42 -0300
+
 fig (1.0.0-1) unstable; urgency=low
 
   * Initial packaging. Closes: #7674440
diff --git a/debian/gbp.conf b/debian/gbp.conf
index fc298b30..e26ca720 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,5 @@
 [DEFAULT]
 pristine-tar = True
-
-[buildpackage]
 debian-branch = debian
 
 [pq]
diff --git a/debian/patches/Relax-dependency-on-docker-py.patch b/debian/patches/Relax-dependency-on-docker-py.patch
new file mode 100644
index 00000000..1a0a7a6c
--- /dev/null
+++ b/debian/patches/Relax-dependency-on-docker-py.patch
@@ -0,0 +1,21 @@
+From: Felipe Sateler <fsateler@debian.org>
+Date: Fri, 15 May 2015 11:12:53 -0300
+Subject: Relax dependency on docker-py
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index f836a24..e893864 100644
+--- a/setup.py
++++ b/setup.py
+@@ -30,7 +30,7 @@ install_requires = [
+     'requests >= 2.2.1, < 3',
+     'texttable >= 0.8.1, < 0.9',
+     'websocket-client >= 0.11.0, < 1',
+-    'docker-py >= 0.5, < 0.6',
++    'docker-py >= 0.5',
+     'six >= 1.3.0, < 2',
+ ]
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d2a27cc6..25811118 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Drop-pyinstaller-requirement.patch
+Relax-dependency-on-docker-py.patch