--- nodejs-0.1.27+dfsg.orig/debian/TODO +++ nodejs-0.1.27+dfsg/debian/TODO @@ -0,0 +1,3 @@ +- provide a nodejs-dbg package ? +- make sure the source package can run the tests (make test) ? + --- nodejs-0.1.27+dfsg.orig/debian/control +++ nodejs-0.1.27+dfsg/debian/control @@ -0,0 +1,57 @@ +Source: nodejs +Section: web +Priority: extra +Maintainer: Jérémy Lal +Uploaders: Dave Beckett +Build-Depends: quilt (>= 0.46), debhelper (>= 7), waf (>= 1.5.10), libev-dev (>= 3.9), libv8-dev (>= 2.0), scons (>= 1.2.0), libudns-dev (>= 0.0.9), binutils, libgpg-error-dev, libgnutls-dev (>= 2.5.0), pkg-config +Standards-Version: 3.8.4 +Homepage: http://nodejs.org/ +Vcs-Browser: http://git.debian.org/?p=collab-maint/nodejs.git +Vcs-Git: git://git.debian.org/git/collab-maint/nodejs.git + +Package: nodejs-dev +Section: devel +Architecture: i386 amd64 armel +Depends: nodejs (= ${binary:Version}), ${misc:Depends}, waf (>= 1.5.10), libev-dev (>= 3.9), libv8-dev (>= 2.0), libudns-dev (>= 0.0.9) +Description: Development files for Node.js + Node.js provides an event-based server-side javascript engine. + . + It is similar in design to and influenced by systems like + Ruby's Event Machine or Python's Twisted. + . + Node.js takes the event model a bit further - it presents the event + loop as a language construct instead of as a library. + . + This package is needed to build plugins. + +Package: nodejs +Architecture: i386 amd64 armel +Depends: ${shlibs:Depends}, ${misc:Depends}, rlwrap +Description: Node.js event-based server-side javascript engine + Node.js is similar in design to and influenced by systems like + Ruby's Event Machine or Python's Twisted. + . + It takes the event model a bit further - it presents the event + loop as a language construct instead of as a library. + . + Node.js is bundled with several useful libraries to handle server tasks : + System, Events, Standard I/O, Modules, Timers, Child Processes, POSIX, + HTTP, Multipart Parsing, TCP, DNS, Assert, Path, URL, Query Strings. + +Package: nodejs-dbg +Section: debug +Architecture: i386 amd64 armel +Depends: ${misc:Depends}, nodejs (= ${binary:Version}) +Suggests: libv8-dbg (>= 2.0) +Description: Node.js event-based server-side javascript engine (debug) + Node.js is similar in design to and influenced by systems like + Ruby's Event Machine or Python's Twisted. + . + It takes the event model a bit further - it presents the event + loop as a language construct instead of as a library. + . + Node.js is bundled with several useful libraries to handle server tasks : + System, Events, Standard I/O, Modules, Timers, Child Processes, POSIX, + HTTP, Multipart Parsing, TCP, DNS, Assert, Path, URL, Query Strings. + . + This package contains the debugging symbols. --- nodejs-0.1.27+dfsg.orig/debian/repack.sh +++ nodejs-0.1.27+dfsg/debian/repack.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# Repackage upstream source to exclude non-distributable files +# should be called as "repack.sh --upstream-source +# (for example, via uscan) + +set -e +set -u + +VER="$2+dfsg" +FILE="$3" +PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'` + +REPACK_DIR="$PKG-$VER.orig" # DevRef § 6.7.8.2 + +echo -e "\nRepackaging $FILE\n" + +DIR=`mktemp -d ./tmpRepackXXXXXX` +trap "rm -rf \"$DIR\"" QUIT INT EXIT + +# Create an extra directory to cope with rootless tarballs +UP_BASE="$DIR/unpack" +mkdir "$UP_BASE" +tar xzf "$FILE" -C "$UP_BASE" + +if [ `ls -1 "$UP_BASE" | wc -l` -eq 1 ]; then + # Tarball does contain a root directory + UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`" +fi + +## Remove undistributable files from source. +# overwrite non-free jsmin by the free one +cp -vf $UP_BASE/deps/v8/tools/jsmin.py $UP_BASE/tools/ +# and keep the node_addon which is upstream's work +mv -vf $UP_BASE/tools/wafadmin/Tools/node_addon.py $UP_BASE/tools/ +# but remove wafadmin, or it raises too many licensing issues +rm -vrf $UP_BASE/tools/wafadmin/ +rm -vf $UP_BASE/tools/waf-light +## End + +mv "$UP_BASE" "$DIR/$REPACK_DIR" + +# Using a pipe hides tar errors! +tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR" +gzip -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.gz" +FILE="../${PKG}_${VER}.orig.tar.gz" +mv "$DIR/repacked.tar.gz" "$FILE" + +echo "*** $FILE repackaged" --- nodejs-0.1.27+dfsg.orig/debian/rules +++ nodejs-0.1.27+dfsg/debian/rules @@ -0,0 +1,73 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +include /usr/share/quilt/quilt.make + +config.status: + dh_testdir + CUR_DIR=$(CURDIR) ./configure --debug + +build: build-stamp + +build-stamp: $(QUILT_STAMPFN) config.status + dh_testdir + # Add here commands to compile the package. + CUR_DIR=$(CURDIR) $(MAKE) + touch $@ + +clean: clean-patched unpatch + rm -f node + rm -f node_g + rm -f doc/nodejs.1 + rm -f .lock-wscript + +clean-patched: $(QUILT_STAMPFN) config.status + dh_testdir + dh_testroot + rm -f build-stamp + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || CUR_DIR=$(CURDIR) $(MAKE) clean && CUR_DIR=$(CURDIR) $(MAKE) distclean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + # Fix node.1 tables with three rows, last one should be expanded + sed -e 's/\\(em/ - /g' -e 's/ltB ltB ltB./ltB ltB ltBx./g' doc/node.1 > doc/nodejs.1 + + # Add here commands to install the package + DESTDIR=$(CURDIR)/debian/nodejs CUR_DIR=$(CURDIR) $(MAKE) install + mv $(CURDIR)/debian/nodejs/usr/bin/node $(CURDIR)/debian/nodejs/usr/bin/nodejs + mv $(CURDIR)/debian/nodejs/usr/bin/node_g $(CURDIR)/debian/nodejs-dbg/usr/lib/debug/usr/bin/nodejs + +binary-indep: install + mv $(CURDIR)/debian/nodejs/usr/include/node/* $(CURDIR)/debian/nodejs-dev/usr/include/nodejs/ + cp tools/node_addon.py $(CURDIR)/debian/nodejs-dev/usr/share/waf/wafadmin/Tools/ + rm -rf $(CURDIR)/debian/nodejs/usr/include + rm -f $(CURDIR)/debian/nodejs/usr/bin/node-waf + mv $(CURDIR)/debian/nodejs/usr/bin/node-repl $(CURDIR)/debian/nodejs/usr/lib/nodejs/ + cp $(CURDIR)/debian/nodejs-repl $(CURDIR)/debian/nodejs/usr/bin/ + chmod 755 $(CURDIR)/debian/nodejs/usr/bin/nodejs-repl + +# Build architecture-dependent files here. +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip --dbg-package=nodejs-dbg + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- nodejs-0.1.27+dfsg.orig/debian/watch +++ nodejs-0.1.27+dfsg/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="dversionmangle=s/\+dfsg//" \ +http://tinyclouds.org/node/ http://s3.amazonaws.com/.*/node-v(.*).tar.gz debian /bin/sh debian/repack.sh --- nodejs-0.1.27+dfsg.orig/debian/README.source +++ nodejs-0.1.27+dfsg/debian/README.source @@ -0,0 +1,19 @@ +nodejs for Debian +--------------- + +Node has been renamed : it is too generic a name. +Node has been repackaged to fit Debian Free Software Guidelines (DFSG): + - tools/wafadmin could not be distributed as is + - tools/jsmin.py has the JSMin License. + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. Please see: + + /usr/share/doc/quilt/README.source + +for more information on how to apply the patches, modify patches, or +remove a patch. + + + --- nodejs-0.1.27+dfsg.orig/debian/changelog +++ nodejs-0.1.27+dfsg/debian/changelog @@ -0,0 +1,5 @@ +nodejs (0.1.27+dfsg-1) unstable; urgency=low + + * Initial release (Closes: #553514) + + -- Jérémy Lal Thu, 04 Feb 2010 21:16:47 +0100 --- nodejs-0.1.27+dfsg.orig/debian/compat +++ nodejs-0.1.27+dfsg/debian/compat @@ -0,0 +1 @@ +7 --- nodejs-0.1.27+dfsg.orig/debian/nodejs-dev.dirs +++ nodejs-0.1.27+dfsg/debian/nodejs-dev.dirs @@ -0,0 +1,2 @@ +usr/include/nodejs +usr/share/waf/wafadmin/Tools --- nodejs-0.1.27+dfsg.orig/debian/README.Debian +++ nodejs-0.1.27+dfsg/debian/README.Debian @@ -0,0 +1,12 @@ +nodejs for Debian +--------------- + +node-repl is using rlwrap, and is located at : +/usr/bin/nodejs-repl + +node-waf is not included : to build a nodejs module, install nodejs-dev package +and simply use : +waf configure +waf build + + -- Jérémy Lal Sat, 12 Sep 2009 14:19:25 +0200 --- nodejs-0.1.27+dfsg.orig/debian/nodejs.dirs +++ nodejs-0.1.27+dfsg/debian/nodejs.dirs @@ -0,0 +1 @@ +usr/lib/nodejs --- nodejs-0.1.27+dfsg.orig/debian/nodejs.docs +++ nodejs-0.1.27+dfsg/debian/nodejs.docs @@ -0,0 +1,2 @@ +README +doc/api.html --- nodejs-0.1.27+dfsg.orig/debian/nodejs-repl +++ nodejs-0.1.27+dfsg/debian/nodejs-repl @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/bin/rlwrap /usr/lib/nodejs/node-repl --- nodejs-0.1.27+dfsg.orig/debian/copyright +++ nodejs-0.1.27+dfsg/debian/copyright @@ -0,0 +1,126 @@ +This work was packaged for Debian by: + + Jérémy Lal on Sat, 12 Sep 2009 14:19:25 +0200 + +It was downloaded from http://tinyclouds.org/node/ + +Upstream Author: + Ryan Dahl + +Copyright: +Copyright 2009, 2010 Ryan Lienhart Dahl. All rights reserved. + +License: MIT + +The Debian packaging is: + Copyright (C) 2009 Jérémy Lal + and is licensed under the GPL version 2 + see `/usr/share/common-licenses/GPL-2'. + +Files: debian/repack.sh +Copyright: (c) 2009 Opscode, Inc. +License: MIT + +Files: deps/libeio +Copyright: 2007,2008 Marc Alexander Lehmann +License: GPL-2+ + +File: lib/assert.js +Copyright: 2009 Thomas Robinson <280north.com> +License: MIT + +Files: deps/v8/* +Copyright: 2006-2009 the V8 Project Authors +License: BSD + +Files: deps/v8/benchmarks/crypto.js +Copyright: 2003-2005 Tom Wu +License: BSD + +Files: deps/v8/benchmark/deltablue.js +Copyright: + 1996 John Maloney and Mario Wolczko + 2008 the V8 project authors +License: GPL-2+ + +Files: deps/v8/src/arm/assembler-arm* +Copyright: + 1994-2006 Sun Microsystems Inc. + 2006-2008 the V8 Project Authors +License: BSD + +Files: deps/v8/src/ia32/assembler-ia32* +Copyright: + 1994-2006 Sun Microsystems Inc. + 2006-2008 the V8 Project Authors +License: BSD + +Files: deps/v8/src/x64/assembler-x64.h + 1994-2006 Sun Microsystems Inc. + 2006-2008 the V8 Project Authors +License: BSD + +Files: deps/v8/src/assembler.* + 1994-2006 Sun Microsystems Inc. + 2006-2008 the V8 Project Authors +License: BSD + +Files: deps/v8/src/third-party/dtoa/* +Copyright: + 1991, 2000, 2001 by Lucent Technologies +License: MIT + +Files: deps/v8/src/third-party/valgrind/valgrind.h +Copyright: 2000-2007 Julian Seward +License: BSD + +Files: deps/v8/test/mjsunit/regexp-pcre.js +Copyright: (c) 1997-2007 University of Cambridge +License: BSD + +Files: deps/libev +Copyright: (C)2007 Marc Alexander Lehmann +License: GPL-2+ + +Files: deps/udns +Copyright: (C) 2005,2006,2007 Michael Tokarev +License: LGPL-2.1 + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. + +Files: tools/scons +Copyright: (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation +License: MIT + + + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + +License: BSD + On Debian GNU/Linux systems, the complete text of the BSD license + can be found in `/usr/share/common-licenses/BSD' + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2' --- nodejs-0.1.27+dfsg.orig/debian/nodejs.manpages +++ nodejs-0.1.27+dfsg/debian/nodejs.manpages @@ -0,0 +1 @@ +debian/nodejs-repl.1 --- nodejs-0.1.27+dfsg.orig/debian/nodejs-repl.1 +++ nodejs-0.1.27+dfsg/debian/nodejs-repl.1 @@ -0,0 +1,16 @@ +.TH nodejs-repl 1 "4 February 2010" +. +.SH NAME +. +nodejs-repl - Nodejs read-eval-print-loop +. +.SH DESCRIPTION +. +\fInodejs-repl\fP provides a read eval print loop for nodejs. +.P +To provide a better interface, \fInodejs-repl\fP uses rlwrap. +. +.SH "SEE ALSO" +. +.BR nodejs(1), +.BR rlwrap(1) --- nodejs-0.1.27+dfsg.orig/debian/nodejs-dbg.dirs +++ nodejs-0.1.27+dfsg/debian/nodejs-dbg.dirs @@ -0,0 +1 @@ +/usr/lib/debug/usr/bin/ --- nodejs-0.1.27+dfsg.orig/debian/patches/0003-fix-libraries-dependencies-and-sub-builds.patch +++ nodejs-0.1.27+dfsg/debian/patches/0003-fix-libraries-dependencies-and-sub-builds.patch @@ -0,0 +1,95 @@ +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Fri, 1 Jan 2010 19:39:06 +0100 +Subject: [PATCH] fix libraries dependencies and sub-builds. + +--- + wscript | 36 ++++++++++++++++++------------------ + 1 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/wscript b/wscript +index 92a6c19..cad1088 100644 +--- a/wscript ++++ b/wscript +@@ -133,7 +133,7 @@ def configure(conf): + #libpath=['/usr/lib', '/usr/local/lib'], + uselib_store='GNUTLS'): + if conf.check(lib='gpg-error', +- libpath=['/usr/lib', '/usr/local/lib'], ++ #libpath=['/usr/lib', '/usr/local/lib'], + uselib_store='GPGERROR'): + conf.env.append_value("CCFLAGS", "-DEVCOM_HAVE_GNUTLS=1") + conf.env.append_value("CXXFLAGS", "-DEVCOM_HAVE_GNUTLS=1") +@@ -145,12 +145,13 @@ def configure(conf): + conf.fatal("Cannot find nsl library") + + conf.sub_config('deps/libeio') +- conf.sub_config('deps/libev') ++ # conf.sub_config('deps/libev') + +- if sys.platform.startswith("sunos"): +- conf_subproject(conf, 'deps/udns', 'LIBS="-lsocket -lnsl" ./configure') +- else: +- conf_subproject(conf, 'deps/udns', './configure') ++ # conf_subproject(conf, 'deps/udns', './configure') ++ ++ conf.check(lib='ev', uselib_store='EV') ++ conf.check(lib='v8', uselib_store='V8') ++ conf.check(lib='udns', uselib_store='UDNS') + + conf.define("HAVE_CONFIG_H", 1) + +@@ -278,15 +279,17 @@ def build_v8(bld): + bld.install_files('${PREFIX}/include/node/', 'deps/v8/include/*.h') + + def build(bld): +- bld.add_subdirs('deps/libeio deps/libev') ++ # bld.add_subdirs('deps/libeio deps/libev') ++ bld.add_subdirs('deps/libeio') + +- build_udns(bld) +- build_v8(bld) ++ # build_udns(bld) ++ # build_v8(bld) + + ### evcom + evcom = bld.new_task_gen("cc") + evcom.source = "deps/evcom/evcom.c" +- evcom.includes = "deps/evcom/ deps/libev/" ++ # evcom.includes = "deps/evcom/ deps/libev/" ++ evcom.includes = "deps/evcom/" + evcom.name = "evcom" + evcom.target = "evcom" + evcom.uselib = "GPGERROR GNUTLS" +@@ -359,17 +362,14 @@ def build(bld): + """ + node.includes = """ + src/ +- deps/v8/include +- deps/libev +- deps/udns + deps/libeio + deps/evcom + deps/http_parser + deps/coupling + """ +- node.add_objects = 'ev eio evcom http_parser coupling' +- node.uselib_local = '' +- node.uselib = 'GNUTLS GPGERROR UDNS V8 EXECINFO DL KVM SOCKET NSL' ++ node.add_objects = 'eio evcom http_parser coupling' ++ node.uselib_local = 'eio' ++ node.uselib = 'EV GNUTLS GPGERROR UDNS V8 EXECINFO DL KVM SOCKET NSL' + + node.install_path = '${PREFIX}/lib' + node.install_path = '${PREFIX}/bin' +@@ -422,8 +422,8 @@ def build(bld): + bld.install_files('${PREFIX}/bin/', 'bin/*', chmod=0755) + + # Why am I using two lines? Because WAF SUCKS. +- bld.install_files('${PREFIX}/lib/node/wafadmin', 'tools/wafadmin/*.py') +- bld.install_files('${PREFIX}/lib/node/wafadmin/Tools', 'tools/wafadmin/Tools/*.py') ++ # bld.install_files('${PREFIX}/lib/node/wafadmin', 'tools/wafadmin/*.py') ++ # bld.install_files('${PREFIX}/lib/node/wafadmin/Tools', 'tools/wafadmin/Tools/*.py') + + bld.install_files('${PREFIX}/lib/node/libraries/', 'lib/*.js') + +-- --- nodejs-0.1.27+dfsg.orig/debian/patches/0007-rename-node.1-to-nodejs.1.patch +++ nodejs-0.1.27+dfsg/debian/patches/0007-rename-node.1-to-nodejs.1.patch @@ -0,0 +1,24 @@ +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Fri, 1 Jan 2010 22:22:12 +0100 +Subject: [PATCH] rename node.1 to nodejs.1 + +--- + wscript | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/wscript b/wscript +index 2b4468f..0dd9aa4 100644 +--- a/wscript ++++ b/wscript +@@ -416,8 +416,8 @@ def build(bld): + + # Only install the man page if it exists. + # Do 'make doc install' to build and install it. +- if os.path.exists('doc/node.1'): +- bld.install_files('${PREFIX}/share/man/man1/', 'doc/node.1') ++ if os.path.exists('doc/nodejs.1'): ++ bld.install_files('${PREFIX}/share/man/man1/', 'doc/nodejs.1') + + bld.install_files('${PREFIX}/bin/', 'bin/*', chmod=0755) + # bld.install_files('${PREFIX}/lib/nodejs/bin/', 'bin/*', chmod=0755) +-- --- nodejs-0.1.27+dfsg.orig/debian/patches/0006-fix-an-incompatibility-with-upstream-libv8.patch +++ nodejs-0.1.27+dfsg/debian/patches/0006-fix-an-incompatibility-with-upstream-libv8.patch @@ -0,0 +1,31 @@ +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Fri, 1 Jan 2010 20:58:20 +0100 +Subject: [PATCH] fix an incompatibility with upstream libv8. + +--- + src/node.cc | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/node.cc b/src/node.cc +index c7dac8e..48c16b6 100644 +--- a/src/node.cc ++++ b/src/node.cc +@@ -878,7 +878,7 @@ static void DebugMessageCallback(EV_P_ ev_async *watcher, int revents) { + ExecuteString(String::New("1+1;"), String::New("debug_poll")); + } + +-static void DebugMessageDispatch(void) { ++static void DebugMessageDispatch(const Debug::Message& message) { + // This function is called from V8's debug thread when a debug TCP client + // has sent a message. + +@@ -1137,7 +1137,7 @@ int main(int argc, char *argv[]) { + ev_async_init(&node::debug_watcher, node::DebugMessageCallback); + // Set the callback DebugMessageDispatch which is called from the debug + // thread. +- Debug::SetDebugMessageDispatchHandler(node::DebugMessageDispatch); ++ Debug::SetMessageHandler2(node::DebugMessageDispatch); + // Start the async watcher. + ev_async_start(EV_DEFAULT_UC_ &node::debug_watcher); + // unref it so that we exit the event loop despite it being active. +-- --- nodejs-0.1.27+dfsg.orig/debian/patches/0008-nodejs-shebang.patch +++ nodejs-0.1.27+dfsg/debian/patches/0008-nodejs-shebang.patch @@ -0,0 +1,19 @@ +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Sat, 23 Jan 2010 17:38:03 +0100 +Subject: [PATCH] nodejs shebang + +--- + bin/node-repl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/bin/node-repl b/bin/node-repl +index 82eb1bc..3e0059c 100755 +--- a/bin/node-repl ++++ b/bin/node-repl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env node ++#!/usr/bin/nodejs + + process.mixin(require('sys')); + puts("Welcome to the Node.js REPL."); +-- --- nodejs-0.1.27+dfsg.orig/debian/patches/0001-simple-configure-for-waf.patch +++ nodejs-0.1.27+dfsg/debian/patches/0001-simple-configure-for-waf.patch @@ -0,0 +1,37 @@ +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Fri, 1 Jan 2010 19:26:35 +0100 +Subject: [PATCH] simple configure for waf. + +--- + configure | 19 ++----------------- + 1 files changed, 2 insertions(+), 17 deletions(-) + +diff --git a/configure b/configure +index 7267f64..79767e6 100755 +--- a/configure ++++ b/configure +@@ -1,21 +1,6 @@ + #! /bin/sh + +-# v8 doesn't like ccache +-if [ ! -z "`echo $CC | grep ccache`" ]; then +- echo "Error: V8 doesn't like cache. Please set your CC env var to 'gcc'" +- echo " (ba)sh: export CC=gcc" +- exit 1 +-fi +- +-CUR_DIR=$PWD +- +-#possible relative path +-WORKINGDIR=`dirname $0` +-cd $WORKINGDIR +-#abs path +-WORKINGDIR=`pwd` +-cd $CUR_DIR +- +-"${WORKINGDIR}/tools/waf-light" --jobs=1 configure $* ++WAF=`which waf` ++PYTHONPATH=$CUR_DIR/tools "${WAF}" --prefix=/usr configure $* + + exit $? +-- --- nodejs-0.1.27+dfsg.orig/debian/patches/0005-node_addon-paths-fix.patch +++ nodejs-0.1.27+dfsg/debian/patches/0005-node_addon-paths-fix.patch @@ -0,0 +1,46 @@ +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Fri, 1 Jan 2010 20:56:30 +0100 +Subject: [PATCH] node_addon paths fix + +--- + tools/node_addon.py | 13 +++++-------- + 1 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/tools/node_addon.py b/tools/node_addon.py +index b308d40..a7e4cd4 100644 +--- a/tools/node_addon.py ++++ b/tools/node_addon.py +@@ -8,7 +8,7 @@ from Configure import conf, conftest + @feature('node_addon') + @before('apply_bundle') + def init_node_addon(self): +- self.default_install_path = '${PREFIX_NODE}/lib/node/libraries' ++ self.default_install_path = '${PREFIX_NODE}/lib/nodejs/libraries' + self.uselib = self.to_list(getattr(self, 'uselib', '')) + if not 'NODE' in self.uselib: self.uselib.append('NODE') + self.env['MACBUNDLE'] = True +@@ -22,19 +22,16 @@ def node_addon_shlib_ext(self): + + def detect(conf): + join = os.path.join +- abspath = os.path.abspath +- wafadmin = abspath(join(os.path.dirname(__file__), '..')) +- libnode = abspath(join(wafadmin, '..')) +- lib = abspath(join(libnode, '..')) +- prefix = abspath(join(lib, '..')) ++ prefix = '/usr' ++ lib = join(prefix, 'lib') + + conf.env['PREFIX_NODE'] = prefix + conf.env['LIBPATH_NODE'] = lib +- conf.env['CPPPATH_NODE'] = join(prefix, 'include/node') ++ conf.env['CPPPATH_NODE'] = join(prefix, 'include/nodejs') + conf.env['CPPFLAGS_NODE'] = '-D_GNU_SOURCE' + conf.env['CPPFLAGS_NODE'] = '-DEV_MULTIPLICITY=0' + +- found = os.path.exists(join(prefix, "bin/node")) ++ found = os.path.exists(join(prefix, "bin/nodejs")) + conf.check_message('node prefix', '', found, prefix) + + ## On Mac OSX we need to use mac bundles +-- --- nodejs-0.1.27+dfsg.orig/debian/patches/0009-Manpage-title-and-description-to-NODEJS.patch +++ nodejs-0.1.27+dfsg/debian/patches/0009-Manpage-title-and-description-to-NODEJS.patch @@ -0,0 +1,34 @@ +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Sat, 6 Feb 2010 02:20:19 +0100 +Subject: [PATCH] Manpage title and description to NODEJS + +--- + doc/node.1 | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/doc/node.1 b/doc/node.1 +index 20db0e4..84c1cd5 100644 +--- a/doc/node.1 ++++ b/doc/node.1 +@@ -1,17 +1,17 @@ +-.\" Title: node ++.\" Title: nodejs + .\" Author: + .\" Generator: DocBook XSL Stylesheets v1.73.2 + .\" Date: 02/03/2010 + .\" Manual: + .\" Source: + .\" +-.TH "NODE" "1" "02/03/2010" "" "" ++.TH "NODEJS" "1" "02/03/2010" "" "" + .\" disable hyphenation + .nh + .\" disable justification (adjust text to left margin only) + .ad l + .SH "NAME" +-node - evented I/O for V8 JavaScript ++nodejs - evented I/O for V8 JavaScript + .SH "SYNOPSIS" + An example of a web server written with Node which responds with "Hello World": + .sp +-- --- nodejs-0.1.27+dfsg.orig/debian/patches/0002-use-system-waf.patch +++ nodejs-0.1.27+dfsg/debian/patches/0002-use-system-waf.patch @@ -0,0 +1,28 @@ +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Fri, 1 Jan 2010 19:28:55 +0100 +Subject: [PATCH] use system waf. + +--- + Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 5d77e20..a0098a1 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,4 @@ +-WAF=python tools/waf-light --jobs=1 ++WAF = PYTHONPATH=$(CUR_DIR)/tools /usr/bin/waf + + all: + @$(WAF) build +@@ -56,7 +56,7 @@ distclean: docclean + @-find tools/ -name "*.pyc" -delete + + check: +- @tools/waf-light check ++ @$(WAF) check + + VERSION=$(shell git-describe) + TARNAME=node-$(VERSION) +-- --- nodejs-0.1.27+dfsg.orig/debian/patches/series +++ nodejs-0.1.27+dfsg/debian/patches/series @@ -0,0 +1,10 @@ +0001-simple-configure-for-waf.patch +0002-use-system-waf.patch +0003-fix-libraries-dependencies-and-sub-builds.patch +0004-paths-for-package-nodejs.patch +0005-node_addon-paths-fix.patch +0006-fix-an-incompatibility-with-upstream-libv8.patch +0007-rename-node.1-to-nodejs.1.patch +0008-nodejs-shebang.patch +0009-Manpage-title-and-description-to-NODEJS.patch +0010-clean-should-not-clean-doc.patch --- nodejs-0.1.27+dfsg.orig/debian/patches/0004-paths-for-package-nodejs.patch +++ nodejs-0.1.27+dfsg/debian/patches/0004-paths-for-package-nodejs.patch @@ -0,0 +1,43 @@ +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Fri, 1 Jan 2010 20:11:03 +0100 +Subject: [PATCH] paths for package nodejs + +--- + src/node.js | 2 +- + wscript | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/node.js b/src/node.js +index dcd0d1b..df25436 100644 +--- a/src/node.js ++++ b/src/node.js +@@ -741,7 +741,7 @@ var pathModule = createInternalModule("path", function (exports) { + var path = pathModule.exports; + + +-process.paths = [ path.join(process.installPrefix, "lib/node/libraries") ++process.paths = [ path.join(process.installPrefix, "lib/nodejs/libraries") + ]; + + if (process.env["HOME"]) { +diff --git a/wscript b/wscript +index cad1088..2b4468f 100644 +--- a/wscript ++++ b/wscript +@@ -420,12 +420,14 @@ def build(bld): + bld.install_files('${PREFIX}/share/man/man1/', 'doc/node.1') + + bld.install_files('${PREFIX}/bin/', 'bin/*', chmod=0755) ++ # bld.install_files('${PREFIX}/lib/nodejs/bin/', 'bin/*', chmod=0755) + + # Why am I using two lines? Because WAF SUCKS. + # bld.install_files('${PREFIX}/lib/node/wafadmin', 'tools/wafadmin/*.py') + # bld.install_files('${PREFIX}/lib/node/wafadmin/Tools', 'tools/wafadmin/Tools/*.py') + +- bld.install_files('${PREFIX}/lib/node/libraries/', 'lib/*.js') ++ # bld.install_files('${PREFIX}/lib/node/libraries/', 'lib/*.js') ++ bld.install_files('${PREFIX}/lib/nodejs/libraries/', 'lib/*.js') + + def shutdown(): + Options.options.debug +-- --- nodejs-0.1.27+dfsg.orig/debian/patches/0010-clean-should-not-clean-doc.patch +++ nodejs-0.1.27+dfsg/debian/patches/0010-clean-should-not-clean-doc.patch @@ -0,0 +1,26 @@ +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Sat, 6 Feb 2010 02:32:15 +0100 +Subject: [PATCH] clean should not clean doc + +--- + Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index a0098a1..86f9d77 100644 +--- a/Makefile ++++ b/Makefile +@@ -48,10 +48,10 @@ website-upload: doc + docclean: + @-rm -f doc/node.1 doc/api.xml doc/api.html + +-clean: docclean ++clean: + @$(WAF) clean + +-distclean: docclean ++distclean: + @-rm -rf build/ + @-find tools/ -name "*.pyc" -delete + +--