Merge lp:~yolanda.robla/ubuntu/trusty/nodejs/add_distribution into lp:ubuntu/trusty/nodejs

[Yolanda Robla]

  * debian/patches/fix_distribution.patch: show version in nodejs
  * debian/control: added lsb-release as build dependency

[lp:~yolanda.robla/ubuntu/trusty/nodejs/add_distribution]

35. By Yolanda Robla on 2013-12-03

added trusty distribution

[Dmitry Shachnev (mitya57)]

Yet again, this change is too minor to carry it as an Ubuntu-specific patch, please forward it upstream (or at least get an ACK from upstream about that).

Also, “UBUNTU_DISTRIBUTION” is a bad name for variable, as this patch will work on Debian and any other Linux release.

−1 from me.

[Iain Lane (laney)]

Please respond once you've heard back from Debian - setting to WIP

[Yolanda Robla (yolanda.robla)]

Send to debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734578

Unmerged revisions

35. By Yolanda Robla on 2013-12-03

added trusty distribution

34. By Yolanda Robla on 2013-12-03

* debian/patches/fix_distribution.patch: show version in nodejs
* debian/control: added lsb-release as build dependency

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-11-30 23:54:20 +0000
+++ .pc/applied-patches	2013-12-03 12:23:15 +0000
@@ -9,3 +9,4 @@
 1003_test_disable_chunked_response.patch
 1004_test_writeNaN.patch
 1005_unbreak_bsd_builds.patch
+fix_distribution.patch
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-11-30 23:54:20 +0000
+++ debian/changelog	2013-12-03 12:23:15 +0000
@@ -1,3 +1,10 @@
+nodejs (0.10.22~dfsg1-2ubuntu1) trusty; urgency=low
+
+  * debian/patches/fix_distribution.patch: show version in nodejs
+  * debian/control: added lsb-release as build dependency
+
+ -- Yolanda Robla <[e-mail]>  Tue, 03 Dec 2013 12:56:36 +0100
+
 nodejs (0.10.22~dfsg1-2) unstable; urgency=low
 
   * Update 2005 patch, allow test-cluster-dgram-2 to time out.
 
=== modified file 'debian/control'
--- debian/control	2013-08-14 00:16:46 +0000
+++ debian/control	2013-12-03 12:23:15 +0000
@@ -20,7 +20,8 @@
  python,
  libv8-3.14-dev (>= 3.7),
  libssl-dev (>= 1.0.0g),
- libc-ares-dev (>= 1.7.5)
+ libc-ares-dev (>= 1.7.5),
+ lsb-release
 Standards-Version: 3.9.4
 Homepage: http://nodejs.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/nodejs.git
 
=== added file 'debian/patches/fix_distribution.patch'
--- debian/patches/fix_distribution.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_distribution.patch	2013-12-03 12:23:15 +0000
@@ -0,0 +1,21 @@
+--- a/node.gyp    2013-12-03 11:50:27.741880000 +0000
++++ b/node.gyp    2013-12-03 11:55:02.162386103 +0000
+@@ -144,6 +144,7 @@
+         'ARCH="<(target_arch)"',
+         'PLATFORM="<(OS)"',
+         'NODE_TAG="<(node_tag)"',
++        'UBUNTU_DISTRIBUTION="<!(lsb_release -si)"'
+       ],
+ 
+       'conditions': [
+--- a/src/node_version.h      2013-12-03 11:50:27.741880000 +0000
++++ b/src/node_version.h      2013-12-03 12:05:31.774386103 +0000
+@@ -49,7 +49,7 @@
+                               NODE_TAG "-pre"
+ #endif
+ 
+-#define NODE_VERSION "v" NODE_VERSION_STRING
++#define NODE_VERSION "v" NODE_VERSION_STRING " (" UBUNTU_DISTRIBUTION ")"
+ 
+ 
+ #define NODE_VERSION_AT_LEAST(major, minor, patch) \
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-11-30 23:54:20 +0000
+++ debian/patches/series	2013-12-03 12:23:15 +0000
@@ -9,3 +9,4 @@
 1003_test_disable_chunked_response.patch
 1004_test_writeNaN.patch
 1005_unbreak_bsd_builds.patch
+fix_distribution.patch
 
=== modified file 'node.gyp'
--- node.gyp	2013-07-28 18:50:13 +0000
+++ node.gyp	2013-12-03 12:23:15 +0000
@@ -144,6 +144,7 @@
         'ARCH="<(target_arch)"',
         'PLATFORM="<(OS)"',
         'NODE_TAG="<(node_tag)"',
+        'UBUNTU_DISTRIBUTION="<!(lsb_release -si)>"'
       ],
 
       'conditions': [
 
=== modified file 'src/node_version.h'
--- src/node_version.h	2013-11-13 23:17:51 +0000
+++ src/node_version.h	2013-12-03 12:23:15 +0000
@@ -49,7 +49,7 @@
                               NODE_TAG "-pre"
 #endif
 
-#define NODE_VERSION "v" NODE_VERSION_STRING
+#define NODE_VERSION "v" NODE_VERSION_STRING " (" UBUNTU_DISTRIBUTION ")"
 
 
 #define NODE_VERSION_AT_LEAST(major, minor, patch) \