Merge lp:~rockstar/lazr-js/launchpad-friendly into lp:lazr-js

[Paul Hummer]

This branch makes some changes that make building everything a little more launchpad friendly. Basically, when we make an sdist out of lazr-js, we need to have distribute_setup.py available because launchpad doesn't use distribute.

I also cleaned up some unused imports in setup.py and bumped the version 1.5DEV so that we have some space between 1.0 and the old and busted 0.9.2 that we apparently were calling trunk.

[lp:~rockstar/lazr-js/launchpad-friendly]

192. By Paul Hummer on 2010-08-23

Use the released distribute

[Sidnei da Silva (sidnei)]

Looks good, +1.

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2009-10-21 21:43:07 +0000
+++ MANIFEST.in	2010-08-23 20:22:44 +0000
@@ -3,3 +3,4 @@
 recursive-include src-py *
 recursive-include src-js *
 include ez_setup.py
+include distribute_setup.py

=== modified file 'Makefile'
--- Makefile	2010-04-26 17:13:13 +0000
+++ Makefile	2010-08-23 20:22:44 +0000
@@ -46,6 +46,7 @@
 
 	$(SHHH) $(PYTHON) -S bootstrap.py \
 		--distribute \
+		--version=1.5.0 \
 		--setup-source=distribute_setup.py \
 		--download-base=download-cache/dist --eggs=eggs
 

=== modified file 'setup.py'
--- setup.py	2010-03-16 00:48:52 +0000
+++ setup.py	2010-08-23 20:22:44 +0000
@@ -3,10 +3,9 @@
 import distribute_setup
 distribute_setup.use_setuptools()
 
-import sys
-from setuptools import setup, find_packages
+from setuptools import setup
 
-__version__ = '0.9.2DEV'
+__version__ = '1.5DEV'
 
 
 setup(