From 7e44694d66448c7e89709d9af55d30d3b17afdc2 Mon Sep 17 00:00:00 2001
From: pzia <paparazzia@gmail.com>
Date: Sun, 26 Apr 2015 07:56:22 +0200
Subject: [PATCH 1/3] Note for debian & ubuntu users

---
 docs/source/development.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/source/development.rst b/docs/source/development.rst
index 962095224..51296f97b 100644
--- a/docs/source/development.rst
+++ b/docs/source/development.rst
@@ -34,6 +34,9 @@ Also make sure you have ``Git`` installed. `Details <http://git-scm.com/book/en/
 .. note::
     Windows users should use Chocolatey as recommended above.:
 
+.. note::
+    Debian & Ubuntu users : apt-get install git npm nodejs-legacy bundler
+
 Once you have *Node.js* and *git* installed, run the following command inside the Converse.js
 directory:
 

From 68d111e4b7e082822356b921de2e3cbcf8adc9d9 Mon Sep 17 00:00:00 2001
From: pzia <paparazzia@gmail.com>
Date: Sun, 26 Apr 2015 11:13:35 +0200
Subject: [PATCH 2/3] bundler is not needed anymore as a debian package

---
 docs/source/development.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/development.rst b/docs/source/development.rst
index 51296f97b..2ca2eb584 100644
--- a/docs/source/development.rst
+++ b/docs/source/development.rst
@@ -35,7 +35,7 @@ Also make sure you have ``Git`` installed. `Details <http://git-scm.com/book/en/
     Windows users should use Chocolatey as recommended above.:
 
 .. note::
-    Debian & Ubuntu users : apt-get install git npm nodejs-legacy bundler
+    Debian & Ubuntu users : apt-get install git npm nodejs-legacy
 
 Once you have *Node.js* and *git* installed, run the following command inside the Converse.js
 directory:

From 66c36ca57fee354827a2a35095f17a8be792fbef Mon Sep 17 00:00:00 2001
From: pzia <paparazzia@gmail.com>
Date: Sun, 26 Apr 2015 11:26:53 +0200
Subject: [PATCH 3/3] check for stamp-npm (not stamp-node)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 452d3db39..86e06dd56 100644
--- a/Makefile
+++ b/Makefile
@@ -112,10 +112,10 @@ watch:: dev-ruby
 jsmin:
 	./node_modules/requirejs/bin/r.js -o src/build.js && ./node_modules/requirejs/bin/r.js -o src/build-no-locales-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-website.js
 
-cssmin: stamp-node
+cssmin: stamp-npm
 	$(GRUNT) cssmin
 
-build:: stamp-node
+build:: stamp-npm
 	$(GRUNT) jst
 	$(GRUNT) minify