[Pkg-javascript-commits] [uglifyjs] 03/04: Extend patch 2001 to cover hardcoded path to package.json, and adapt its install routine. Closes: bug#784439. Thanks to Pau Garcia i Quiles.

[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 e716cbcd4f621bcc6580012014d5cbaaa5da674b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon May 18 19:27:57 2015 +0200

    Extend patch 2001 to cover hardcoded path to package.json, and adapt its install routine. Closes: bug#784439. Thanks to Pau Garcia i Quiles.
---
 debian/node-uglify.install             | 1 -
 debian/patches/2001_fix_lib_path.patch | 9 +++++++++
 debian/rules                           | 5 +++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/node-uglify.install b/debian/node-uglify.install
index 8485d83..a34ad11 100644
--- a/debian/node-uglify.install
+++ b/debian/node-uglify.install
@@ -1,3 +1,2 @@
 bin/uglifyjs    /usr/bin/
 lib/*           /usr/lib/nodejs/uglify-js/
-package.json    /usr/lib/nodejs/uglify-js/
diff --git a/debian/patches/2001_fix_lib_path.patch b/debian/patches/2001_fix_lib_path.patch
index 30088f2..786dc2d 100644
--- a/debian/patches/2001_fix_lib_path.patch
+++ b/debian/patches/2001_fix_lib_path.patch
@@ -15,6 +15,15 @@ Last-Update: 2014-05-02
  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 @@
diff --git a/debian/rules b/debian/rules
index c29ac12..b17dad7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,7 @@ 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)),\
@@ -38,8 +39,8 @@ debian/stamp-build:
 common-post-build-indep::
 	rm -f lib/uglify-js
 clean::
-	rm -f debian/stamp-build lib/index.js
-	rm -f debian/stamp-build lib/index.js debian/uglifyjs.1
+	rm -f lib/index.js lib/package.json
+	rm -f debian/stamp-build debian/uglifyjs.1
 
 DEB_INSTALL_DOCS_ALL += README.md
 

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