From c3ab0f1b3e6fdfed292a416cf30bd0967081d734 Mon Sep 17 00:00:00 2001 From: jhermann Date: Sat, 12 Jul 2014 04:36:14 +0200 Subject: [PATCH 1/7] updated and fixed manifest --- MANIFEST.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index e3727b6..3f483ca 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ -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 From 67781b43298ff330d983edd73f0317e102cd9dc6 Mon Sep 17 00:00:00 2001 From: jhermann Date: Sat, 12 Jul 2014 04:37:18 +0200 Subject: [PATCH 2/7] added 0.10.0 changes to Debian changelog --- debian/changelog | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8696589..4c4a87a 100644 --- a/debian/changelog +++ b/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 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 Wed, 18 Jun 2014 12:32:45 +0200 From f07b2b07f00fc4fa6c1a637336181f1a35833db2 Mon Sep 17 00:00:00 2001 From: jhermann Date: Sat, 12 Jul 2014 04:40:05 +0200 Subject: [PATCH 3/7] updated rules to work with newest dh-virtualenv on Precise --- debian/rules | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index 468d129..30bf9a2 100755 --- a/debian/rules +++ b/debian/rules @@ -11,15 +11,20 @@ # 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 +build-arch: + /usr/bin/python setup.py sdist --formats zip unzip -d debian/sdist dist/*.zip - dh $@ --with python-virtualenv --sourcedir debian/sdist/* + mv debian/sdist/nodeenv-*/* debian/sdist + rm -rf debian/sdist/*.egg-info + rmdir debian/sdist/nodeenv-* + dh $@ $(DH_VENV_ARGS) --sourcedir debian/sdist %: - dh $@ --with python-virtualenv --sourcedir debian/sdist/* + dh $@ $(DH_VENV_ARGS) --sourcedir debian/sdist From 0461c592cfea7fad179bd6e6cd71526907a511cf Mon Sep 17 00:00:00 2001 From: jhermann Date: Sat, 12 Jul 2014 04:52:45 +0200 Subject: [PATCH 4/7] exclude Debian build artifacts from manifest --- MANIFEST.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 3f483ca..bde96b9 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,7 @@ 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 From 843312e914276a8635124c1d34cf1d2e6d71c96d Mon Sep 17 00:00:00 2001 From: jhermann Date: Sat, 12 Jul 2014 05:05:25 +0200 Subject: [PATCH 5/7] use tar instead of zip --- debian/control | 2 +- debian/rules | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 9b91569..13f41e6 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: nodeenv Section: contrib/python Priority: extra Maintainer: Eugene Kalinin -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 diff --git a/debian/rules b/debian/rules index 30bf9a2..c1e23db 100755 --- a/debian/rules +++ b/debian/rules @@ -19,11 +19,10 @@ clean: dh $@ $(DH_VENV_ARGS) build-arch: - /usr/bin/python setup.py sdist --formats zip - unzip -d debian/sdist dist/*.zip - mv debian/sdist/nodeenv-*/* debian/sdist + /usr/bin/python setup.py sdist --formats tar + mkdir -p debian/sdist + tar -x -C debian/sdist --strip-components=1 -f dist/*.tar rm -rf debian/sdist/*.egg-info - rmdir debian/sdist/nodeenv-* dh $@ $(DH_VENV_ARGS) --sourcedir debian/sdist %: From 66256ada88fe7ea8b518d3637657458b097566cb Mon Sep 17 00:00:00 2001 From: jhermann Date: Sat, 12 Jul 2014 05:08:06 +0200 Subject: [PATCH 6/7] exclude unwanted stuff upfront, instead of deleteing it later --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index c1e23db..9576c09 100755 --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,7 @@ clean: build-arch: /usr/bin/python setup.py sdist --formats tar mkdir -p debian/sdist - tar -x -C debian/sdist --strip-components=1 -f dist/*.tar - rm -rf debian/sdist/*.egg-info + tar -x -C debian/sdist --strip-components=1 --exclude '*.egg-info' -f dist/*.tar dh $@ $(DH_VENV_ARGS) --sourcedir debian/sdist %: From f175e5123305cb7b3cd3c687a6642af9bda4385f Mon Sep 17 00:00:00 2001 From: jhermann Date: Sat, 12 Jul 2014 05:20:18 +0200 Subject: [PATCH 7/7] Added Debian install to 'Global installation' --- README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.rst b/README.rst index 5208488..aea3630 100644 --- a/README.rst +++ b/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 ^^^^^^^^^^^^^^^^^^