[Pkg-javascript-commits] [sockjs-client] 01/03: Pull in the Debian version of libjs-json rather than using the version shipped in this package. Also, delete qunit as it is shipped as a precompiled file and we don't use it anyway.

[Tonnerre Lombard]

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

tonnerre-guest pushed a commit to branch master
in repository sockjs-client.

commit 21211a63b7de49d43d3f18742c70a03508ce02af
Author: Tonnerre LOMBARD <tonnerre at ancient-solutions.com>
Date:   Fri Feb 28 06:06:16 2014 +0000

    Pull in the Debian version of libjs-json rather than using the version
    shipped in this package. Also, delete qunit as it is shipped as a
    precompiled file and we don't use it anyway.
---
 debian/control |  4 ++--
 debian/rules   | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index adc5f25..8bb24f7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Tonnerre LOMBARD <tonnerre at ancient-solutions.com>
 Build-Depends: coffeescript, debhelper (>= 9), node-optimist, node-static,
- node-uglify, nodejs
+ node-uglify, nodejs, libjs-json
 Standards-Version: 3.9.5
 Homepage: https://github.com/sockjs/sockjs-client
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-javascript/sockjs-client.git
@@ -11,7 +11,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-javascript/sockjs-client.git
 
 Package: libjs-sockjs
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-json
 Recommends: javascript-common
 Description: WebSocket emulation - Javascript client
  SockJS is a browser JavaScript library that provides a WebSocket-like object.
diff --git a/debian/rules b/debian/rules
index ce9c7b5..1ce9efc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,16 @@ export NODE_PATH=/usr/lib/nodejs/optparse
 # We cannot run the tests, we'd need sockjs-node for that.
 override_dh_auto_test:
 
+# Delete copyright-problematic files from the tests.
+override_dh_auto_clean:
+	rm -f lib/json2.min.js tests/html/qunit.min.js
+	rm -f tests/html/static/jquery.min.js
+	dh_auto_clean
+
+override_dh_auto_configure:
+	ln -s /usr/share/javascript/json/json2.min.js lib/json2.min.js
+	dh_auto_configure
+
 override_dh_auto_build:
 	make build
 

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