[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#684044: marked as done (unblock: nodejs/0.6.19~dfsg1-4)

Your message dated Wed, 3 Oct 2012 18:27:05 +0200
with message-id <20121003162705.GR31434@radis.cristau.org>
and subject line Re: Bug#684044: unblock: nodejs/0.6.19~dfsg1-4
has caused the Debian Bug report #684044,
regarding unblock: nodejs/0.6.19~dfsg1-4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
684044: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684044
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package nodejs

We have now adjusted nodejs as ruled by tech-ctte at
<https://lists.debian.org/debian-devel-announce/2012/07/msg00002.html>,
and consider it ready for inclusion in Wheezy.

Attached is a debdiff of changes made since 0.6.19~dfsg1-2 - the version
that would've entered testing had it not been held back by bugs #611698
and #681360.


Kind regards, and thanks for your tireless work,

 - Jonas

unblock nodejs/0.6.19~dfsg1-4

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

diff -Nru nodejs-0.6.19~dfsg1/debian/changelog nodejs-0.6.19~dfsg1/debian/changelog
--- nodejs-0.6.19~dfsg1/debian/changelog	2012-06-06 23:36:53.000000000 +0200
+++ nodejs-0.6.19~dfsg1/debian/changelog	2012-08-06 14:51:34.000000000 +0200
@@ -1,3 +1,44 @@
+nodejs (0.6.19~dfsg1-4) unstable; urgency=medium
+
+  * Update package relations:
+    + Break only packages actually calling /usr/bin/node (directly or
+      via env).
+    + Tighten breaks for packages with fixed release.
+  * Set urgency=medium as this change affects only packaging hints so
+    should not need reset of aging timer in unstable.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 06 Aug 2012 14:51:31 +0200
+
+nodejs (0.6.19~dfsg1-3) unstable; urgency=low
+
+  [ Jérémy Lal ]
+  * debian/patches:
+    + 2012_fix_v8_3_10.patch, fix crash on exit when building
+      against libv8-3.10.8.
+    + 2013_waf_linkflags.patch, waf must support LINKFLAGS,
+      Closes: #678563.
+
+  [ Jonas Smedegaard ]
+  * Rename binary node → nodejs:
+    + Adjust paths of binary and manpage.
+    + Fix avoid bogus explicit installation of debug files.
+    + Adjust install scripts and add cleanup for old alternative.
+    + Patch manpage to adjust command name.
+    + Have binary package nodejs break any packages in Debian that
+      reference /usr/bin/node.
+    + Add new binary package nodejs-legacy, and have that (not nodejs)
+      conflict with node.
+    + Add NEWS entry.
+    Closes: bug#611698, #681360. See also bug#614907. Thanks to
+    tech-ctte and everyone else helping to resolve this.
+  * Work around upstream shipping docs in wrong subdir, and disable huge
+    patch 1002 attempting same but causing FTBFS for me. Keep patch 1002
+    in source, to ease proof-reading by release team.
+  * Add patch 2004 to fix FTBFS: Relax a test to work with slightly
+    different output when linked against recent v8.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 28 Jul 2012 11:19:38 +0200
+
 nodejs (0.6.19~dfsg1-2) unstable; urgency=low
 
   * debian/patches:
diff -Nru nodejs-0.6.19~dfsg1/debian/control nodejs-0.6.19~dfsg1/debian/control
--- nodejs-0.6.19~dfsg1/debian/control	2012-05-16 01:59:26.000000000 +0200
+++ nodejs-0.6.19~dfsg1/debian/control	2012-08-06 14:45:13.000000000 +0200
@@ -51,7 +51,24 @@
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: node
+Breaks:
+ buddycloud-server (<= 0.3.1-1),
+ carto (<= 0.4.6+ds1-1),
+ coffeescript (<< 1.3.3-3~),
+ node-bones (<= 2.0.1+ds1-1),
+ node-cli (<= 0.4.2~20120411-1),
+ node-express (<= 2.5.9-1),
+ node-get (<= 1.1.5+ds1-1),
+ node-jake (<= 0.2.32-1),
+ node-less (<< 1.3.0~20120310-3~),
+ node-mapnik (<= 0.6.7-2),
+ node-mbtiles (<= 0.2.3-1),
+ node-optimist (<= 0.3.1-1),
+ node-semver (<= 1.0.13-1),
+ node-tilelive (<= 4.2.1-3),
+ node-uglify (<< 1.2.6-2~),
+ node-vows (<= 0.6.3-1),
+ npm (<= 1.1.4~dfsg-1),
 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.
@@ -81,3 +98,27 @@
  HTTP, Multipart Parsing, TCP, DNS, Assert, Path, URL, Query Strings.
  .
  This package contains the debugging symbols.
+
+Package: nodejs-legacy
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends},
+ nodejs (>= 0.6.19~dfsg1-3~)
+Conflicts: node
+Description: Node.js event-based server-side javascript engine (legacy symlink)
+ 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 a symlink for legacy Node.js code requiring
+ binary to be /usr/bin/node (not /usr/bin/nodejs as provided in Debian).
+ .
+ No other Debian packages should depend on this package.  For more
+ information, see
+ <http://lists.debian.org/debian-devel-announce/2012/07/msg00002.html>
diff -Nru nodejs-0.6.19~dfsg1/debian/NEWS nodejs-0.6.19~dfsg1/debian/NEWS
--- nodejs-0.6.19~dfsg1/debian/NEWS	2012-02-14 00:05:02.000000000 +0100
+++ nodejs-0.6.19~dfsg1/debian/NEWS	2012-07-25 18:05:00.000000000 +0200
@@ -1,3 +1,11 @@
+nodejs (0.6.19~dfsg1-3) unstable; urgency=low
+
+  * The nodejs package now provides /usr/bin/nodejs, not /usr/bin/node.
+    For more information, see
+    <http://lists.debian.org/debian-devel-announce/2012/07/msg00002.html>
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 25 Jul 2012 17:54:27 +0200
+
 nodejs (0.4.12-2) unstable; urgency=low
 
     Do not search for modules in /usr/local/lib/nodejs.
diff -Nru nodejs-0.6.19~dfsg1/debian/nodejs-dbg.dirs nodejs-0.6.19~dfsg1/debian/nodejs-dbg.dirs
--- nodejs-0.6.19~dfsg1/debian/nodejs-dbg.dirs	2012-02-14 00:05:02.000000000 +0100
+++ nodejs-0.6.19~dfsg1/debian/nodejs-dbg.dirs	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/lib/debug/usr/bin/
diff -Nru nodejs-0.6.19~dfsg1/debian/nodejs-dbg.install nodejs-0.6.19~dfsg1/debian/nodejs-dbg.install
--- nodejs-0.6.19~dfsg1/debian/nodejs-dbg.install	2012-02-14 00:05:02.000000000 +0100
+++ nodejs-0.6.19~dfsg1/debian/nodejs-dbg.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-out/Debug/node usr/lib/debug/usr/bin
diff -Nru nodejs-0.6.19~dfsg1/debian/nodejs-legacy.links nodejs-0.6.19~dfsg1/debian/nodejs-legacy.links
--- nodejs-0.6.19~dfsg1/debian/nodejs-legacy.links	1970-01-01 01:00:00.000000000 +0100
+++ nodejs-0.6.19~dfsg1/debian/nodejs-legacy.links	2012-07-28 11:14:28.000000000 +0200
@@ -0,0 +1,2 @@
+usr/bin/nodejs usr/bin/node
+usr/share/man/man1/nodejs.1.gz usr/share/man/man1/node.1.gz
diff -Nru nodejs-0.6.19~dfsg1/debian/nodejs.links nodejs-0.6.19~dfsg1/debian/nodejs.links
--- nodejs-0.6.19~dfsg1/debian/nodejs.links	2012-04-30 20:18:08.000000000 +0200
+++ nodejs-0.6.19~dfsg1/debian/nodejs.links	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin/node usr/bin/nodejs
-usr/share/man/man1/node.1.gz usr/share/man/man1/nodejs.1.gz
diff -Nru nodejs-0.6.19~dfsg1/debian/nodejs.postinst nodejs-0.6.19~dfsg1/debian/nodejs.postinst
--- nodejs-0.6.19~dfsg1/debian/nodejs.postinst	2012-02-14 00:05:02.000000000 +0100
+++ nodejs-0.6.19~dfsg1/debian/nodejs.postinst	2012-07-25 18:05:00.000000000 +0200
@@ -3,8 +3,12 @@
 set -e
 
 if [ "$1" = "configure" ]; then
-    update-alternatives --install /usr/bin/js js /usr/bin/node 200 \
-                        --slave /usr/share/man/man1/js.1.gz js.1.gz /usr/share/man/man1/node.1.gz
+	if dpkg --compare-versions "$2" le 0.6.19~dfsg1-2; then
+		update-alternatives --remove js /usr/bin/node
+	fi
+
+    update-alternatives --install /usr/bin/js js /usr/bin/nodejs 200 \
+                        --slave /usr/share/man/man1/js.1.gz js.1.gz /usr/share/man/man1/nodejs.1.gz
 fi
 
 #DEBHELPER#
diff -Nru nodejs-0.6.19~dfsg1/debian/nodejs.prerm nodejs-0.6.19~dfsg1/debian/nodejs.prerm
--- nodejs-0.6.19~dfsg1/debian/nodejs.prerm	2012-02-14 00:05:02.000000000 +0100
+++ nodejs-0.6.19~dfsg1/debian/nodejs.prerm	2012-07-25 18:05:00.000000000 +0200
@@ -3,7 +3,7 @@
 set -e
 
 if [ "$1" = "remove" ]; then
-    update-alternatives --remove js /usr/bin/node
+    update-alternatives --remove js /usr/bin/nodejs
 fi
 
 #DEBHELPER#
diff -Nru nodejs-0.6.19~dfsg1/debian/nodejs.README.Debian nodejs-0.6.19~dfsg1/debian/nodejs.README.Debian
--- nodejs-0.6.19~dfsg1/debian/nodejs.README.Debian	2012-04-30 20:18:08.000000000 +0200
+++ nodejs-0.6.19~dfsg1/debian/nodejs.README.Debian	2012-07-25 18:05:00.000000000 +0200
@@ -29,13 +29,12 @@
 nodejs command
 --------------
 
-The upstream name for the Node.js interpreter command is "node", and
-Debian provides the same for compatibility.
+The upstream name for the Node.js interpreter command is "node".
+In Debian the interpreter command has been changed to "nodejs".
 
-That is a very generic name and there are other commands that use
+This was done to prevent a namespace collision: other commands use
 the same name in their upstreams, such as ax25-node from the "node"
 package.
 
-Scripts wishing to refer unambiguously to the Node.js interpreter
-can use the "nodejs" command instead.
-We are pursuing inclusion of this synonym upstream.
+Scripts calling Node.js as a shell command must be changed to instead
+use the "nodejs" command.
diff -Nru nodejs-0.6.19~dfsg1/debian/patches/2003_rename_node_to_nodejs.patch nodejs-0.6.19~dfsg1/debian/patches/2003_rename_node_to_nodejs.patch
--- nodejs-0.6.19~dfsg1/debian/patches/2003_rename_node_to_nodejs.patch	1970-01-01 01:00:00.000000000 +0100
+++ nodejs-0.6.19~dfsg1/debian/patches/2003_rename_node_to_nodejs.patch	2012-07-28 10:58:23.000000000 +0200
@@ -0,0 +1,22 @@
+Description: Change shell command from node to nodejs
+Author: Jonas Smedegaard <dr@jones.dk>
+Bug-Debian: http://bugs.debian.org/614907
+Last-Update: 2012-07-25
+
+--- a/doc/node.1
++++ b/doc/node.1
+@@ -2,12 +2,12 @@
+ 
+ 
+ .SH "NAME"
+-node \- Server-side JavaScript
++nodejs \- Server-side JavaScript
+ 
+ .SH SYNOPSIS
+ 
+ 
+-.B node
++.B nodejs
+ [
+ .B \-v
+ ]
diff -Nru nodejs-0.6.19~dfsg1/debian/patches/2004_relax_failing_test.patch nodejs-0.6.19~dfsg1/debian/patches/2004_relax_failing_test.patch
--- nodejs-0.6.19~dfsg1/debian/patches/2004_relax_failing_test.patch	1970-01-01 01:00:00.000000000 +0100
+++ nodejs-0.6.19~dfsg1/debian/patches/2004_relax_failing_test.patch	2012-07-28 02:42:52.000000000 +0200
@@ -0,0 +1,17 @@
+Description: Relax test failing with recent v8
+Author: Jérémy Lal <kapouer@melix.org>
+Origin: http://lists.alioth.debian.org/pipermail/pkg-javascript-devel/2012-July/003951.html
+Last-Update: 2012-07-26
+
+--- a/test/message/stack_overflow.out
++++ b/test/message/stack_overflow.out
+@@ -1,6 +1,6 @@
+ before
+ 
+-*test*message*stack_overflow.js:31
+-function stackOverflow() {
+-                      ^
++*test*message*stack_overflow.js:*
++*function*
++*^
+ RangeError: Maximum call stack size exceeded
diff -Nru nodejs-0.6.19~dfsg1/debian/patches/2012_fix_v8_3_10.patch nodejs-0.6.19~dfsg1/debian/patches/2012_fix_v8_3_10.patch
--- nodejs-0.6.19~dfsg1/debian/patches/2012_fix_v8_3_10.patch	1970-01-01 01:00:00.000000000 +0100
+++ nodejs-0.6.19~dfsg1/debian/patches/2012_fix_v8_3_10.patch	2012-07-25 18:05:00.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Fix build with v8 3.10
+ Node calls V8::Dispose on exit, and that makes v8 crash.
+Author: Jérémy Lal <kapouer@melix.org>
+Forwarded: https://github.com/joyent/node/issues/3184#issuecomment-6297038
+Last-Update: 2012-06-12
+--- a/src/node.cc
++++ b/src/node.cc
+@@ -2645,7 +2645,7 @@
+ #ifndef NDEBUG
+   // Clean up.
+   context.Dispose();
+-  V8::Dispose();
++  // V8::Dispose(); // this call crashes v8 3.10
+ #endif  // NDEBUG
+ 
+   return 0;
diff -Nru nodejs-0.6.19~dfsg1/debian/patches/2013_waf_linkflags.patch nodejs-0.6.19~dfsg1/debian/patches/2013_waf_linkflags.patch
--- nodejs-0.6.19~dfsg1/debian/patches/2013_waf_linkflags.patch	1970-01-01 01:00:00.000000000 +0100
+++ nodejs-0.6.19~dfsg1/debian/patches/2013_waf_linkflags.patch	2012-07-25 18:05:00.000000000 +0200
@@ -0,0 +1,13 @@
+Description: node-waf LINKFLAGS support 
+ Fix taken from waf 1.5.19
+Author: Jérémy Lal <kapouer@melix.org>
+Forwarded: https://github.com/joyent/node/issues/3524
+Last-Update: 2012-06-24
+--- a/tools/wafadmin/Tools/gxx.py
++++ b/tools/wafadmin/Tools/gxx.py
+@@ -131,4 +131,5 @@
+ 	conf.gxx_modifier_platform()
+ 	conf.cxx_load_tools()
+ 	conf.cxx_add_flags()
++	conf.link_add_flags()
+ 
diff -Nru nodejs-0.6.19~dfsg1/debian/patches/series nodejs-0.6.19~dfsg1/debian/patches/series
--- nodejs-0.6.19~dfsg1/debian/patches/series	2012-06-06 23:10:45.000000000 +0200
+++ nodejs-0.6.19~dfsg1/debian/patches/series	2012-07-28 02:43:43.000000000 +0200
@@ -1,9 +1,13 @@
 2001_FHS_paths_for_nodejs.patch
 2002_build_without_libv8_debug.patch
+2003_rename_node_to_nodejs.patch
+2004_relax_failing_test.patch
 2005_expected_failing_tests.patch
 2007_fix_use_shared_zlib.patch
 2008_fix_use_shared_cares.patch
 2009_fix_shared_ev.patch
 2011_enable_mipsel_build.patch
 1001_align_fast_buffers_8byte_boundary.patch
-1002_upstream_forgot_to_build_doc.patch
+#1002_upstream_forgot_to_build_doc.patch
+2012_fix_v8_3_10.patch
+2013_waf_linkflags.patch
diff -Nru nodejs-0.6.19~dfsg1/debian/rules nodejs-0.6.19~dfsg1/debian/rules
--- nodejs-0.6.19~dfsg1/debian/rules	2012-04-01 09:27:37.000000000 +0200
+++ nodejs-0.6.19~dfsg1/debian/rules	2012-07-28 11:15:56.000000000 +0200
@@ -49,6 +49,10 @@
 	find . -name "*.pyc" -delete
 	rm -rf out
 
+binary-post-install/nodejs::
+	mv debian/nodejs/usr/bin/node debian/nodejs/usr/bin/nodejs
+	mv debian/nodejs/usr/share/man/man1/node.1 debian/nodejs/usr/share/man/man1/nodejs.1
+
 # remove *.json files from documentation, remove google-analytics calls
 # TODO: when doc will be generated from markdown, remove it from doc/template.html
 binary-install/nodejs::
@@ -59,3 +63,13 @@
 install/nodejs-dev::
 	dh_bash-completion
 
+# Work around upstream shipping docs in wrong subdir
+pre-build:: debian/replace-items
+debian/replace-items: debian/stamp-copyright-check
+	cp -at doc/api doc/api/api/*
+	touch $@
+binary-post-install/nodejs::
+	rm -rf debian/nodejs/usr/share/doc/nodejs/api/api
+clean::
+	rm -rf $(patsubst doc/api/api/%,doc/api/%,$(wildcard doc/api/api/*))
+	rm -f debian/replace-items

--- End Message ---
--- Begin Message --- 
On Mon, Aug  6, 2012 at 15:20:15 +0200, Jonas Smedegaard wrote:

> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> Please unblock package nodejs
> 
We're not adding new packages to wheezy, closing.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: