[Pkg-javascript-commits] [uglifyjs] 01/06: Drop patch 2001, and instead install all code in subdirs referenced by package.json. Thanks to Jérémy Lal (see bug#784439).

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository uglifyjs.

commit 7418a6b0c659273ecf31423c21bbb267d9f706a5
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue May 19 10:56:00 2015 +0200

    Drop patch 2001, and instead install all code in subdirs referenced by package.json. Thanks to Jérémy Lal (see bug#784439).
---
 debian/node-uglify.install             |  2 --
 debian/patches/2001_fix_lib_path.patch | 63 ----------------------------------
 debian/patches/series                  |  1 -
 debian/rules                           |  6 ++--
 4 files changed, 3 insertions(+), 69 deletions(-)

diff --git a/debian/node-uglify.install b/debian/node-uglify.install
deleted file mode 100644
index a34ad11..0000000
--- a/debian/node-uglify.install
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/uglifyjs    /usr/bin/
-lib/*           /usr/lib/nodejs/uglify-js/
diff --git a/debian/patches/2001_fix_lib_path.patch b/debian/patches/2001_fix_lib_path.patch
deleted file mode 100644
index 786dc2d..0000000
--- a/debian/patches/2001_fix_lib_path.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Adapt paths to system-wide install
-Forwarded: not-needed
-Author: Marcelo Jorge Vieira <metal at alucinados.com>
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2014-05-02
-
---- a/bin/uglifyjs
-+++ b/bin/uglifyjs
-@@ -3,7 +3,7 @@
- 
- "use strict";
- 
--var UglifyJS = require("../tools/node");
-+var UglifyJS = require("uglify-js");
- var sys = require("util");
- var optimist = require("optimist");
- var fs = require("fs");
-@@ -115,7 +115,7 @@
- }
- 
- if (ARGS.version || ARGS.V) {
--    var json = require("../package.json");
-+    var json = require("uglify-js/package.json");
-     sys.puts(json.name + ' ' + json.version);
-     process.exit(0);
- }
---- a/test/run-tests.js
-+++ b/test/run-tests.js
-@@ -1,6 +1,6 @@
- #! /usr/bin/env node
- 
--var U = require("../tools/node");
-+var U = require("uglify-js");
- var path = require("path");
- var fs = require("fs");
- var assert = require("assert");
---- a/tools/node.js
-+++ b/tools/node.js
-@@ -28,15 +28,15 @@
- };
- 
- var FILES = exports.FILES = [
--    "../lib/utils.js",
--    "../lib/ast.js",
--    "../lib/parse.js",
--    "../lib/transform.js",
--    "../lib/scope.js",
--    "../lib/output.js",
--    "../lib/compress.js",
--    "../lib/sourcemap.js",
--    "../lib/mozilla-ast.js"
-+    "./utils.js",
-+    "./ast.js",
-+    "./parse.js",
-+    "./transform.js",
-+    "./scope.js",
-+    "./output.js",
-+    "./compress.js",
-+    "./sourcemap.js",
-+    "./mozilla-ast.js"
- ].map(function(file){
-     return path.join(path.dirname(fs.realpathSync(__filename)), file);
- });
diff --git a/debian/patches/series b/debian/patches/series
index 4faca0f..bc69ea9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 1001_break_dep_loop.patch
-2001_fix_lib_path.patch
 2002_node_conflict.patch
diff --git a/debian/rules b/debian/rules
index b17dad7..b0bb499 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 pkg = node-uglify
+libdir = /usr/lib/nodejs/$(pkg)
 
 DEB_UPSTREAM_URL = https://github.com/mishoo/UglifyJS2/archive
 DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION)
@@ -28,9 +29,6 @@ DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION)
 CDBS_BUILD_DEPENDS +=, help2man
 common-build-indep:: debian/stamp-build
 debian/stamp-build:
-	cp tools/node.js lib/index.js
-	cp package.json lib/package.json
-	ln -s . lib/uglify-js
 	NODE_PATH=lib help2man --no-info bin/uglifyjs > debian/uglifyjs.1
 	$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),\
 		,\
@@ -42,6 +40,8 @@ clean::
 	rm -f lib/index.js lib/package.json
 	rm -f debian/stamp-build debian/uglifyjs.1
 
+DEB_DH_INSTALL_ARGS_$(pkg) = package.json bin lib tools $(libdir)
+DEB_DH_LINK_$(pkg) = $(libdir)/bin/uglifyjs /usr/bin/uglifyjs
 DEB_INSTALL_DOCS_ALL += README.md
 
 # Needed by upstream build process and (always) at runtime

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/uglifyjs.git