diff --git a/AUTHORS b/AUTHORS
index 981cd0f755..2a573c32c4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -463,3 +463,4 @@ Veres Lajos
Yuan Chuan
Krzysztof Chrapka
Linus Mårtensson
+Peter Rust
diff --git a/ChangeLog b/ChangeLog
index 0e23b03aba..5d3293faf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -144,6 +144,31 @@
* console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
+2013.07.09, Version 0.10.13 (Stable), e32660a984427d46af6a144983cf7b8045b7299c
+
+* uv: Upgrade to v0.10.12
+
+* npm: Upgrade to 1.3.2
+
+* windows: get proper errno (Ben Noordhuis)
+
+* tls: only wait for finish if we haven't seen it (Timothy J Fontaine)
+
+* http: Dump response when request is aborted (isaacs)
+
+* http: use an unref'd timer to fix delay in exit (Peter Rust)
+
+* zlib: level can be negative (Brian White)
+
+* zlib: allow zero values for level and strategy (Brian White)
+
+* buffer: add comment explaining buffer alignment (Ben Noordhuis)
+
+* string_bytes: properly detect 64bit (Timothy J Fontaine)
+
+* src: fix memory leak in UsingDomains() (Ben Noordhuis)
+
+
2013.06.18, Version 0.10.12 (Stable), a088cf4f930d3928c97d239adf950ab43e7794aa
* npm: Upgrade to 1.2.32
diff --git a/Makefile b/Makefile
index dc53b90dce..60f112f57f 100644
--- a/Makefile
+++ b/Makefile
@@ -278,7 +278,7 @@ $(PKG): release-only
rm -rf out/deps out/Release
$(PYTHON) ./configure --without-snapshot --dest-cpu=x64 --tag=$(TAG)
$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
- SIGN="$(SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
+ SIGN="$(APP_SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
lipo $(PKGDIR)/32/usr/local/bin/node \
$(PKGDIR)/usr/local/bin/node \
-output $(PKGDIR)/usr/local/bin/node-universal \
@@ -289,7 +289,7 @@ $(PKG): release-only
--id "org.nodejs.Node" \
--doc tools/osx-pkg.pmdoc \
--out $(PKG)
- SIGN="$(SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh
+ SIGN="$(INT_SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh
$(TARBALL): release-only node doc
git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
diff --git a/deps/npm/Makefile b/deps/npm/Makefile
index 01228c1cd1..28c7ff6b3f 100644
--- a/deps/npm/Makefile
+++ b/deps/npm/Makefile
@@ -27,7 +27,7 @@ files_mandocs = $(shell find doc/files -name '*.md' \
misc_mandocs = $(shell find doc/misc -name '*.md' \
|sed 's|.md|.7|g' \
|sed 's|doc/misc/|man/man7/|g' ) \
- man/man7/index.7
+ man/man7/npm-index.7
cli_htmldocs = $(shell find doc/cli -name '*.md' \
|sed 's|.md|.html|g' \
@@ -61,7 +61,7 @@ latest:
@echo "in this folder that you're looking at right now."
node cli.js install -g -f npm
-install: all
+install: docclean all
node cli.js install -g -f
# backwards compat
@@ -70,7 +70,7 @@ dev: install
link: uninstall
node cli.js link -f
-clean: doc-clean uninstall
+clean: ronnclean doc-clean uninstall
rm npmrc
node cli.js cache clean
@@ -79,15 +79,16 @@ uninstall:
doc: $(mandocs) $(htmldocs)
+ronnclean:
+ rm -rf node_modules/ronn node_modules/.bin/ronn .building_ronn
+
docclean: doc-clean
doc-clean:
rm -rf \
- node_modules/ronn \
- node_modules/.bin/ronn \
.building_ronn \
html/doc \
html/api \
- man/man*
+ man
# use `npm install ronn` for this to work.
man/man1/npm-README.1: README.md scripts/doc-build.sh package.json
@@ -150,6 +151,7 @@ html/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
+ronn: node_modules/.bin/ronn
node_modules/.bin/ronn:
node cli.js install ronn
diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html
index 9d666ede3e..f1611d5386 100644
--- a/deps/npm/html/doc/README.html
+++ b/deps/npm/html/doc/README.html
@@ -240,7 +240,7 @@ will no doubt tell you to put the output in a gist or email.
-
+