diff -Nru python-elasticsearch-1.0-1.2.0-chaos1/debian/changelog python-elasticsearch-1.0-1.2.0-chaos2/debian/changelog --- python-elasticsearch-1.0-1.2.0-chaos1/debian/changelog 2014-11-03 11:19:25.000000000 +0000 +++ python-elasticsearch-1.0-1.2.0-chaos2/debian/changelog 2015-01-22 15:50:36.000000000 +0000 @@ -1,4 +1,13 @@ -python-elasticsearch-1.0 (1.2.0-chaos1-trusty1) trusty; urgency=low +python-elasticsearch-1.0 (1.2.0-chaos2-trusty1) trusty; urgency=low + + * Non-maintainer upload. + * Uses upstream release 1.2.0 as base + + * Fix dependency on urllib3 to use Ubuntu 14.04 version + + -- Nick Douma Thu, 22 Jan 2015 17:00:00 +0100 + +python-elasticsearch-1.0 (1.2.0-chaos1) trusty; urgency=low * Non-maintainer upload. * Uses upstream release 1.2.0 as base diff -Nru python-elasticsearch-1.0-1.2.0-chaos1/debian/Makefile python-elasticsearch-1.0-1.2.0-chaos2/debian/Makefile --- python-elasticsearch-1.0-1.2.0-chaos1/debian/Makefile 2014-11-03 10:53:29.000000000 +0000 +++ python-elasticsearch-1.0-1.2.0-chaos2/debian/Makefile 2015-01-22 15:37:52.000000000 +0000 @@ -2,9 +2,10 @@ DIST=trusty SRC=../elasticsearch-py VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2-) +TARBALL=python-elasticsearch-1.0_$(VERSION).orig.tar.gz clean: - rm -R elasticsearch-py + rm -fr elasticsearch-py package: dpkg-buildpackage -A -us -uc @@ -24,3 +25,6 @@ make_source_tarball: (cd $(SRC) && git checkout $(shell echo -n "$(VERSION)" | cut -d"-" -f1 )) && \ tar zcvf ../python-elasticsearch-1.0_$(VERSION).orig.tar.gz $(SRC) --exclude="test_elasticsearch" --exclude=".git*" + +unzip_source: clean + tar xvf "../$(TARBALL)" diff -Nru python-elasticsearch-1.0-1.2.0-chaos1/debian/patches/fix-requests-requirement python-elasticsearch-1.0-1.2.0-chaos2/debian/patches/fix-requests-requirement --- python-elasticsearch-1.0-1.2.0-chaos1/debian/patches/fix-requests-requirement 1970-01-01 00:00:00.000000000 +0000 +++ python-elasticsearch-1.0-1.2.0-chaos2/debian/patches/fix-requests-requirement 2015-01-22 15:46:26.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -13,7 +13,7 @@ + f.close() + + install_requires = [ +- 'urllib3>=1.8, <2.0', ++ 'urllib3>=1.7, <2.0', + ] + tests_require = [ + 'requests>=1.0.0, <3.0.0', diff -Nru python-elasticsearch-1.0-1.2.0-chaos1/debian/patches/series python-elasticsearch-1.0-1.2.0-chaos2/debian/patches/series --- python-elasticsearch-1.0-1.2.0-chaos1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ python-elasticsearch-1.0-1.2.0-chaos2/debian/patches/series 2015-01-22 15:38:18.000000000 +0000 @@ -0,0 +1 @@ +fix-requests-requirement