Skip to content

Commit 47b1b74

Browse files
committed
Generated version as pep440 and dpkg compatible
1 parent ec56ed5 commit 47b1b74

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Makefile.buildbot

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ test:
88
-s3cmd sync -P htmlcov/ s3://static.scrapy.org/coverage-scrapy-$(BRANCH)/
99

1010
build:
11-
test $(BRANCH) != master || git describe --tags | sed -r 's/([0-9]+.[0-9]*.[0-9]*)(rc|dev)(.*)/\1~\2\3/' >scrapy/VERSION
12-
debchange -m -D unstable --force-distribution -v `python setup.py --version`+`date +%s` "Automatic build"
11+
git describe --tags --match '[0-9]*' |sed 's/-/.post/;s/-g/+g/' >scrapy/VERSION
12+
debchange -m -D unstable --force-distribution -v \
13+
$$(python setup.py --version |sed -r 's/([0-9]+.[0-9]+.[0-9]+)(a|b|rc|dev)([0-9]*)/\1~\2\3/')-$$(date +%s) \
14+
"Automatic build"
1315
debuild -us -uc -b
1416

1517
clean:

debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Architecture: all
1111
Depends: ${python:Depends}, python-lxml, python-twisted, python-openssl,
1212
python-w3lib (>= 1.8.0), python-queuelib, python-cssselect (>= 0.9), python-six (>=1.5.2)
1313
Recommends: python-setuptools
14-
Conflicts: python-scrapy, scrapy, scrapy-0.11
15-
Provides: python-scrapy, scrapy
14+
Conflicts: python-scrapy, scrapy-0.25
15+
Provides: python-scrapy, scrapy-0.25
1616
Description: Python web crawling and web scraping framework
1717
Scrapy is a fast high-level web crawling and web scraping framework,
1818
used to crawl websites and extract structured data from their pages.

0 commit comments

Comments
 (0)