diff -Nru nodejs-4.8.4~dfsg/debian/changelog nodejs-4.8.4~dfsg/debian/changelog --- nodejs-4.8.4~dfsg/debian/changelog 2017-07-17 15:08:48.000000000 -0500 +++ nodejs-4.8.4~dfsg/debian/changelog 2017-07-21 10:33:40.000000000 -0500 @@ -1,3 +1,11 @@ +nodejs (4.8.4~dfsg-1ubuntu1) artful; urgency=medium + + * Merge from Debian Sid (LP: #1705727). Remaining changes: + - Revert upstream's fix for openssl 1.0.2h, since we still have + 1.0.2g in Ubuntu. + + -- Simon Quigley Fri, 21 Jul 2017 10:33:40 -0500 + nodejs (4.8.4~dfsg-1) unstable; urgency=medium * New upstream version 4.8.4~dfsg @@ -10,6 +18,14 @@ -- Jérémy Lal Mon, 17 Jul 2017 22:08:48 +0200 +nodejs (4.8.3~dfsg-1ubuntu1) artful; urgency=medium + + * Merge with Debian unstable, remaining changes: + + Revert upstream's fix for openssl 1.0.2h, + since we still have 1.0.2g in Ubuntu + + -- Graham Inggs Thu, 22 Jun 2017 11:08:14 +0200 + nodejs (4.8.3~dfsg-1) unstable; urgency=medium * New upstream version 4.8.3~dfsg @@ -22,6 +38,16 @@ -- Jérémy Lal Wed, 14 Jun 2017 00:23:33 +0200 +nodejs (4.8.2~dfsg-1ubuntu1) artful; urgency=medium + + * Merge with Debian unstable, remaining changes: + + Disable test-process-config because it needs configured tree + (Closes: #855018) + * Revert upstream's fix for openssl 1.0.2h, + since we still have 1.0.2g in Ubuntu + + -- Graham Inggs Mon, 24 Apr 2017 13:50:29 +0200 + nodejs (4.8.2~dfsg-1) unstable; urgency=medium * New upstream version 4.8.2~dfsg @@ -46,6 +72,27 @@ * Patch fixing openssl 1.1 client test failure (Closes: #855018) -- Jérémy Lal Mon, 13 Feb 2017 12:00:20 +0100 + +nodejs (4.7.2~dfsg-1ubuntu3) zesty; urgency=medium + + * Disable test-process-config because it needs configured tree + + -- Graham Inggs Sun, 12 Feb 2017 08:42:42 +0200 + +nodejs (4.7.2~dfsg-1ubuntu2) zesty; urgency=medium + + * Make sure we don't try to build for ppc64 on powerpc + + -- Graham Inggs Thu, 09 Feb 2017 11:24:53 +0200 + +nodejs (4.7.2~dfsg-1ubuntu1) zesty; urgency=medium + + * Merge with Debian unstable, remaining changes: + + Add debian/patches/fix_sslv3_test.patch: + properly handle how SSLv3 was disabled in openssl + * Enable building for powerpc architecture again + + -- Graham Inggs Wed, 08 Feb 2017 16:52:42 +0200 nodejs (4.7.2~dfsg-1) unstable; urgency=medium @@ -59,6 +106,14 @@ -- Jérémy Lal Fri, 06 Jan 2017 01:25:51 +0100 +nodejs (4.6.1~dfsg-1ubuntu1) zesty; urgency=medium + + * Sync with Debian. Remaining change: + - Add debian/patches/fix_sslv3_test.patch: + properly handle how SSLv3 was disabled in openssl. + + -- Jeremy Bicha Tue, 20 Dec 2016 23:02:48 -0500 + nodejs (4.6.1~dfsg-1) unstable; urgency=medium * test-regress-GH-746 moved from sequential to parallel diff -Nru nodejs-4.8.4~dfsg/debian/control nodejs-4.8.4~dfsg/debian/control --- nodejs-4.8.4~dfsg/debian/control 2017-06-13 16:00:41.000000000 -0500 +++ nodejs-4.8.4~dfsg/debian/control 2017-07-21 10:33:03.000000000 -0500 @@ -1,6 +1,7 @@ Source: nodejs Section: web -Maintainer: Debian Javascript Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Javascript Maintainers Uploaders: Jérémy Lal , Jonas Smedegaard Build-Depends: cdbs, diff -Nru nodejs-4.8.4~dfsg/debian/control.in nodejs-4.8.4~dfsg/debian/control.in --- nodejs-4.8.4~dfsg/debian/control.in 2017-06-13 16:01:01.000000000 -0500 +++ nodejs-4.8.4~dfsg/debian/control.in 2017-07-21 10:33:03.000000000 -0500 @@ -1,7 +1,8 @@ Source: nodejs Section: web Priority: optional -Maintainer: Debian Javascript Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Javascript Maintainers Uploaders: Jérémy Lal , Jonas Smedegaard Build-Depends: @cdbs@ diff -Nru nodejs-4.8.4~dfsg/debian/patches/revert_openssl1.0.2h_fix.patch nodejs-4.8.4~dfsg/debian/patches/revert_openssl1.0.2h_fix.patch --- nodejs-4.8.4~dfsg/debian/patches/revert_openssl1.0.2h_fix.patch 1969-12-31 18:00:00.000000000 -0600 +++ nodejs-4.8.4~dfsg/debian/patches/revert_openssl1.0.2h_fix.patch 2017-07-21 10:33:03.000000000 -0500 @@ -0,0 +1,53 @@ +Description: Revert upstream's fix for openssl 1.0.2h + We still have openssl 1.0.2g in Ubuntu. + https://github.com/nodejs/node/commit/be480b14996153e93326cdf17ea86f85c0b43fa6 +Forwarded: not-needed +Author: Graham Inggs +Last-Update: 2017-04-24 +--- a/test/parallel/test-tls-alpn-server-client.js ++++ b/test/parallel/test-tls-alpn-server-client.js +@@ -99,8 +99,8 @@ + client: {ALPN: 'b', NPN: undefined}}); + // nothing is selected by ALPN + checkResults(results[2], +- {server: {ALPN: false, NPN: 'first-priority-unsupported'}, +- client: {ALPN: false, NPN: false}}); ++ {server: {ALPN: false, NPN: false}, ++ client: {ALPN: false, NPN: undefined}}); + // execute next test + Test2(); + }); +@@ -132,8 +132,8 @@ + client: {ALPN: 'b', NPN: undefined}}); + // nothing is selected by ALPN + checkResults(results[2], +- {server: {ALPN: false, NPN: 'http/1.1'}, +- client: {ALPN: false, NPN: false}}); ++ {server: {ALPN: false, NPN: false}, ++ client: {ALPN: false, NPN: undefined}}); + // execute next test + Test3(); + }); +@@ -224,9 +224,8 @@ + checkResults(results[1], {server: {ALPN: 'b', NPN: false}, + client: {ALPN: 'b', NPN: undefined}}); + // nothing is selected by ALPN +- checkResults(results[2], {server: {ALPN: false, +- NPN: 'first-priority-unsupported'}, +- client: {ALPN: false, NPN: false}}); ++ checkResults(results[2], {server: {ALPN: false, NPN: false}, ++ client: {ALPN: false, NPN: undefined}}); + // execute next test + Test6(); + }); +@@ -254,8 +253,8 @@ + checkResults(results[1], {server: {ALPN: 'b', NPN: false}, + client: {ALPN: 'b', NPN: undefined}}); + // nothing is selected by ALPN +- checkResults(results[2], {server: {ALPN: false, NPN: 'http/1.1'}, +- client: {ALPN: false, NPN: false}}); ++ checkResults(results[2], {server: {ALPN: false, NPN: false}, ++ client: {ALPN: false, NPN: undefined}}); + // execute next test + Test7(); + }); diff -Nru nodejs-4.8.4~dfsg/debian/patches/series nodejs-4.8.4~dfsg/debian/patches/series --- nodejs-4.8.4~dfsg/debian/patches/series 2017-06-13 16:00:41.000000000 -0500 +++ nodejs-4.8.4~dfsg/debian/patches/series 2017-07-21 10:33:03.000000000 -0500 @@ -13,3 +13,4 @@ test_ci_buildd.patch dest_cpu_x87.patch doctool-yaml.patch +revert_openssl1.0.2h_fix.patch