[Pkg-javascript-commits] [SCM] framework for using backbone.js on client and server for NodeJS branch, master, updated. debian/2.0.0+ds1-1-7-g745b6a0

[David Paleino]

The following commit has been merged in the master branch:
commit b2386e9098c54672f75acbddc17cd76864f1dcef
Author: David Paleino <dapal at debian.org>
Date:   Sat Oct 29 19:22:36 2011 +0200

    Drop the need for package.json, which doesn't get installed

diff --git a/debian/changelog b/debian/changelog
index 4aed8b3..ec61544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ node-bones (2.0.0+ds1-2) UNRELEASED; urgency=low
   TODO: before upload, make sure node-jquery is packaged
 
   * Make Route.bones depend on systemwide node-jquery
+  * Drop the need for package.json, which doesn't get installed
 
- -- David Paleino <dapal at debian.org>  Fri, 28 Oct 2011 22:36:43 +0200
+ -- David Paleino <dapal at debian.org>  Sat, 29 Oct 2011 19:22:17 +0200
 
 node-bones (2.0.0+ds1-1) unstable; urgency=low
 
diff --git a/debian/patches/01-dont_use_package-json.patch b/debian/patches/01-dont_use_package-json.patch
new file mode 100644
index 0000000..0051b44
--- /dev/null
+++ b/debian/patches/01-dont_use_package-json.patch
@@ -0,0 +1,21 @@
+From: David Paleino <dapal at debian.org>
+Subject: drop the need of package.json
+Origin: vendor
+Forwarded: no
+
+---
+ servers/Asset.bones |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- node-bones.orig/servers/Asset.bones
++++ node-bones/servers/Asset.bones
+@@ -7,8 +7,7 @@ server = Bones.Server.extend({});
+ 
+ server.prototype.initialize = function(app) {
+     app.directories.forEach(function(dir) {
+-        var pkg = JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), 'utf8'));
+-        this.use('/assets/' + pkg.name, middleware['static'](
++        this.use('/assets/bones', middleware['static'](
+             path.join(dir, 'assets'),
+             { maxAge: env === 'production' ? 3600 * 1000 : 0 } // 1 hour
+         ));
diff --git a/debian/patches/series b/debian/patches/series
index b829a4c..78a1d4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 00-depend_on_systemwide_modules.patch
+01-dont_use_package-json.patch

-- 
framework for using backbone.js on client and server for NodeJS