From 2349d241e06e9032c60a1551a03dac029f7730be Mon Sep 17 00:00:00 2001
From: Pablo Hoffman <pablo@pablohoffman.com>
Date: Sat, 24 Jul 2010 17:02:08 -0300
Subject: [PATCH] removed custom Makefile and version based on mercurial
 revision

---
 Makefile | 45 ---------------------------------------------
 setup.py |  9 +--------
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 Makefile

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 78fb5bfec..000000000
--- a/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-VERSION ?= $(shell python -c "import scrapy; print '.'.join(map(str, scrapy.version_info[:2]))")
-DEBREV ?= 1
-HGREV ?= $(shell hg log -l1 --template '{rev}')
-FULL_VERSION ?= $(VERSION)~r$(HGREV)
-BUILDBASE ?= $(shell pwd)/build/deb
-BUILDDIR ?= $(BUILDBASE)/scrapy_$(FULL_VERSION).orig
-BUILDTAR ?= $(BUILDBASE)/scrapy_$(FULL_VERSION).orig.tar.gz
-
-help:
-	@echo 'Available targets:'
-	@echo '  deb-binary   - build debian binary package'
-	@echo '  deb-source   - build debian source package'
-	@echo '  deb-all      - build source and binary debian packages'
-	@echo '  tarball      - build source tarball'
-	@echo '  sign         - sign release'
-
-deb-binary: deb-prepare
-	cd $(BUILDDIR); debuild -i -us -uc -b
-
-deb-source: deb-prepare
-	cd $(BUILDDIR); debuild -i -us -uc -S
-
-deb-all: deb-prepare
-	cd $(BUILDDIR); debuild -i -us -uc
-
-deb-prepare:
-	@if [ -d $(BUILDBASE) ]; then \
-		rm -rf $(BUILDBASE); \
-	fi;
-	mkdir -p $(BUILDBASE)
-	hg archive -t tgz -X .hgtags $(BUILDTAR)
-	tar zxf $(BUILDTAR) -C $(BUILDBASE)
-	rm -f $(BUILDDIR)/Makefile # to avoid confusing dh_auto_build
-	cp -r debian $(BUILDDIR)
-	cd $(BUILDDIR); debchange -m -D unstable --force-distribution -v $(FULL_VERSION)-$(DEBREV) "Automatic build"
-
-tarball:
-	hg purge --all
-	python setup.py sdist
-
-sign:
-	md5sum dist/Scrapy-* > dist/MD5SUMS
-	sha1sum dist/Scrapy-* > dist/SHA1SUMS
-	gpg -ba dist/MD5SUMS
-	gpg -ba dist/SHA1SUMS
diff --git a/setup.py b/setup.py
index 9e95e5666..fba882ad4 100644
--- a/setup.py
+++ b/setup.py
@@ -75,14 +75,7 @@ if len(sys.argv) > 1 and sys.argv[1] == 'bdist_wininst':
         file_info[0] = '\\PURELIB\\%s' % file_info[0]
 
 # Dynamically calculate the version based on scrapy.__version__
-version = __import__('scrapy').__version__
-if 'dev' in version:
-    try:
-        from subprocess import Popen, PIPE
-        hgrev = Popen(['hg', 'tip', '--template={rev}'], stdout=PIPE).communicate()[0]
-        version = version.replace('-dev', '-r%s' % hgrev)
-    except:
-        pass
+version = ".".join(map(str, __import__('scrapy').version_info[:2]))
 
 setup_args = {
     'name': 'Scrapy',