Merge pull request #90 from jhermann/dpkg-0.10.0

dpkg 0.10.0

MANIFEST.in

@@ -1,3 +1,7 @@
-include *.py README README.rst LICENSE CHANGES
-exclude *.pyc *.swp
-recursive-include debian changelog compat control copyright rules nodeenv.links
+include README LICENSE CHANGES AUTHORS
+include *.py *.rst setup.cfg Makefile
+
+graft debian
+prune debian/nodeenv
+prune debian/sdist
+recursive-exclude debian *.log *.substvars files

README.rst

@@ -24,6 +24,11 @@ or with `pip`_::
 
     $ sudo pip install nodeenv
 
+or on Debian using `dpkg`_::
+
+    $ dpkg-buildpackage -uc -us -b
+    $ sudo dpkg -i $(ls -1rt ../nodeenv_*.deb | tail -n1)
+
 
 Local installation
 ^^^^^^^^^^^^^^^^^^

debian/changelog

@@ -1,11 +1,24 @@
+nodeenv (0.10.0) unstable; urgency=low
+
+  * Issue 85: Added support for config file
+  * Issue 84: Added `nodejs` symlink creation
+
+  [Eugene Kalinin]
+  * Issue 87: Using of virtualenv detected via python not envvar
+  * Issue 88: Fixed `freeze` for zsh
+
+ -- Juergen Hermann <[email protected]>  Sat, 12 Jul 2014 00:00:57 +0200
+
 nodeenv (0.9.5+git-1479d8f) unstable; urgency=low
 
   * Issue 77: Debian packaging using dh-virtualenv
+  * Issue 76: Try to find "nodejs" as well, when using system-wide node
+  * Issue 76: Added "assert" for checking if system-wide node is actually found
+
+  [Eugene Kalinin]
   * Issue 74: Fixed a few spelling typos in README
   * Issue 74: Fixed example of using "--update" option in README
   * Issue 75: Improved args passing within shim script
-  * Issue 76: Try to find "nodejs" as well, when using system-wide node
-  * Issue 76: Added "assert" for checking if system-wide node is actually found
   * Issue 71: Added "-l" option to "freeze" command
 
  -- Juergen Hermann <[email protected]>  Wed, 18 Jun 2014 12:32:45 +0200

debian/control

@@ -2,7 +2,7 @@ Source: nodeenv
 Section: contrib/python
 Priority: extra
 Maintainer: Eugene Kalinin <[email protected]>
-Build-Depends: debhelper (>= 9), python, dh-virtualenv, unzip
+Build-Depends: debhelper (>= 9), python, dh-virtualenv, tar
 Standards-Version: 3.9.5
 Homepage: https://github.com/ekalinin/nodeenv
 

debian/rules

@@ -11,15 +11,18 @@
 # sourcedir ".", because that includes the debian build stage,
 # and a recursive explosion ensues when symlinks are followed.
 
+DH_VENV_ARGS=--with python-virtualenv --setuptools --python /usr/bin/python #-v
+
 clean:
 	test ! -d dist || rm -rf dist
 	test ! -d debian/sdist || rm -rf debian/sdist
-	dh $@ --with python-virtualenv
+	dh $@ $(DH_VENV_ARGS)
 
-build:
-	python setup.py sdist --formats zip
-	unzip -d debian/sdist dist/*.zip
-	dh $@ --with python-virtualenv --sourcedir debian/sdist/*
+build-arch:
+	/usr/bin/python setup.py sdist --formats tar
+	mkdir -p debian/sdist
+	tar -x -C debian/sdist --strip-components=1 --exclude '*.egg-info' -f dist/*.tar
+	dh $@ $(DH_VENV_ARGS) --sourcedir debian/sdist
 
 %:
-	dh $@ --with python-virtualenv --sourcedir debian/sdist/*
+	dh $@ $(DH_VENV_ARGS) --sourcedir debian/sdist