From 2ff9888e2da48b34eded2482f8523c07288f6d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Mon, 15 Jun 2015 20:51:37 -0300
Subject: [PATCH] Generated version as pep440 and dpkg compatible

---
 Makefile.buildbot | 6 ++++--
 debian/control    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile.buildbot b/Makefile.buildbot
index a6c4bbbc3..775538259 100644
--- a/Makefile.buildbot
+++ b/Makefile.buildbot
@@ -8,8 +8,10 @@ test:
 	-s3cmd sync -P htmlcov/ s3://static.scrapy.org/coverage-scrapy-$(BRANCH)/
 
 build:
-	test $(BRANCH) != master || git describe --tags | sed -r 's/([0-9]+.[0-9]*.[0-9]*)(rc|dev)(.*)/\1~\2\3/' >scrapy/VERSION
-	debchange -m -D unstable --force-distribution -v `python setup.py --version`+`date +%s` "Automatic build"
+	git describe --tags --match '[0-9]*' |sed 's/-/.post/;s/-g/+g/' >scrapy/VERSION
+	debchange -m -D unstable --force-distribution -v \
+	  $$(python setup.py --version |sed -r 's/([0-9]+.[0-9]+.[0-9]+)(a|b|rc|dev)([0-9]*)/\1~\2\3/')-$$(date +%s) \
+	  "Automatic build"
 	debuild -us -uc -b
 
 clean:
diff --git a/debian/control b/debian/control
index 75225f30d..f3a31753b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Architecture: all
 Depends: ${python:Depends}, python-lxml, python-twisted, python-openssl,
  python-w3lib (>= 1.8.0), python-queuelib, python-cssselect (>= 0.9), python-six (>=1.5.2)
 Recommends: python-setuptools
-Conflicts: python-scrapy, scrapy, scrapy-0.11
-Provides: python-scrapy, scrapy
+Conflicts: python-scrapy, scrapy-0.25
+Provides: python-scrapy, scrapy-0.25
 Description: Python web crawling and web scraping framework
  Scrapy is a fast high-level web crawling and web scraping framework,
  used to crawl websites and extract structured data from their pages.