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

Bug#684181: unblock: uglifyjs/1.2.6-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package uglifyjs

We have now adjusted uglifyjs use nodejs (not node) as hashbang, and
consider it ready for inclusion in Wheezy.

Attached is a debdiff of changes made since the version that would've
entered testing had it not been held back by nodejs and bug#614907.


Cheers,

-- 
Marcelo Jorge Vieira
xmpp:metal@jabber-br.org
http://metaldot.alucinados.com
diff -Nru uglifyjs-1.2.6/debian/changelog uglifyjs-1.2.6/debian/changelog
--- uglifyjs-1.2.6/debian/changelog	2012-07-31 18:50:46.000000000 -0300
+++ uglifyjs-1.2.6/debian/changelog	2012-08-01 10:20:10.000000000 -0300
@@ -1,3 +1,16 @@
+uglifyjs (1.2.6-3) unstable; urgency=low
+
+  * Uglify should depend on new nodejs package
+
+ -- Marcelo Jorge Vieira (metal) <metal@debian.org>  Wed, 01 Aug 2012 10:16:03 -0300
+
+uglifyjs (1.2.6-2) unstable; urgency=low
+
+  * Node conflict; For more info, see:
+    http://lists.debian.org/debian-devel-announce/2012/07/msg00002.html
+
+ -- Marcelo Jorge Vieira (metal) <metal@debian.org>  Tue, 31 Jul 2012 18:31:20 -0300
+
 uglifyjs (1.2.6-1) unstable; urgency=low
 
   * New Upstream Release
diff -Nru uglifyjs-1.2.6/debian/control uglifyjs-1.2.6/debian/control
--- uglifyjs-1.2.6/debian/control	2012-07-31 18:50:46.000000000 -0300
+++ uglifyjs-1.2.6/debian/control	2012-08-01 10:14:32.000000000 -0300
@@ -12,7 +12,7 @@
 
 Package: node-uglify
 Architecture: all
-Depends: ${misc:Depends}, nodejs
+Depends: ${misc:Depends}, nodejs (>= 0.6.19~dfsg1-3)
 Provides: uglifyjs
 Replaces: libnode-uglify (<< 1.1.1-2~)
 Conflicts: libnode-uglify (<< 1.1.1-2~)
diff -Nru uglifyjs-1.2.6/debian/patches/node_conflict.patch uglifyjs-1.2.6/debian/patches/node_conflict.patch
--- uglifyjs-1.2.6/debian/patches/node_conflict.patch	1969-12-31 21:00:00.000000000 -0300
+++ uglifyjs-1.2.6/debian/patches/node_conflict.patch	2012-07-31 20:15:38.000000000 -0300
@@ -0,0 +1,35 @@
+--- uglifyjs.orig/bin/uglifyjs	2012-07-31 19:24:04.000000000 -0300
++++ uglifyjs/bin/uglifyjs	2012-07-31 19:24:13.000000000 -0300
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env node
++#!/usr/bin/env nodejs
+ // -*- js -*-
+ 
+ global.sys = require(/^v0\.[012]/.test(process.version) ? "sys" : "util");
+
+--- uglifyjs.orig/test/testparser.js	2012-07-31 19:29:59.000000000 -0300
++++ uglifyjs/test/testparser.js	2012-07-31 19:30:08.000000000 -0300
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env node
++#! /usr/bin/env nodejs
+ 
+ var parseJS = require("../lib/parse-js");
+ var sys = require("sys");
+
+--- uglifyjs.orig/test/beautify.js	2012-07-31 19:32:44.000000000 -0300
++++ uglifyjs/test/beautify.js	2012-07-31 19:33:02.000000000 -0300
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env node
++#! /usr/bin/env nodejs
+ 
+ global.sys = require("sys");
+ var fs = require("fs");
+
+--- uglifyjs.orig/tmp/test.js	2012-07-31 19:35:10.000000000 -0300
++++ uglifyjs/tmp/test.js	2012-07-31 19:35:16.000000000 -0300
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env node
++#! /usr/bin/env nodejs
+ 
+ global.sys = require(/^v0\.[012]/.test(process.version) ? "sys" : "util");
+ var fs = require("fs");
diff -Nru uglifyjs-1.2.6/debian/patches/series uglifyjs-1.2.6/debian/patches/series
--- uglifyjs-1.2.6/debian/patches/series	2012-07-31 18:50:18.000000000 -0300
+++ uglifyjs-1.2.6/debian/patches/series	2012-07-31 20:15:38.000000000 -0300
@@ -1 +1,2 @@
 fix_lib_path.patch
+node_conflict.patch

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: