[Pkg-javascript-commits] [SCM] web maps visualization library branch, master, updated. debian/4.1.3+ds1-1-10-g0294a07

[David Paleino]

The following commit has been merged in the master branch:
commit f291fff63cf9dee515c4b384e9a4f68b4df3ee15
Author: David Paleino <dapal at debian.org>
Date:   Mon Apr 9 23:37:17 2012 +0200

    Patch refreshed

diff --git a/debian/patches/00-fix_Makefile.patch b/debian/patches/00-fix_Makefile.patch
index 5cec458..0cf1f5e 100644
--- a/debian/patches/00-fix_Makefile.patch
+++ b/debian/patches/00-fix_Makefile.patch
@@ -4,12 +4,12 @@ Origin: vendor
 Forwarded: no
 
 ---
- Makefile |   40 +++++++++++++++-------------------------
- 1 file changed, 15 insertions(+), 25 deletions(-)
+ Makefile |   39 ++++++++++++---------------------------
+ 1 file changed, 12 insertions(+), 27 deletions(-)
 
 --- wax.js.orig/Makefile
 +++ wax.js/Makefile
-@@ -1,47 +1,39 @@
+@@ -1,49 +1,37 @@
 -UGLIFYJS = ./node_modules/.bin/uglifyjs
 -BANNER = ./node_modules/.bin/banner
 +UGLIFYJS = uglifyjs
@@ -18,20 +18,19 @@ Forwarded: no
 +	ext/html-sanitizer.js \
 +	ext/html-sanitizer-loosen.js \
 +	$(NULL)
-+#	/usr/share/javascript/reqwest/reqwest.js \
-+#	/usr/share/javascript/mustache/mustache.js \
  
--dist: dist_setup dist/wax.ol.min.js dist/wax.g.min.js dist/wax.mm.min.js dist/wax.leaf.min.js lint
-+dist: dist_setup dist/wax.ol.min.js dist/wax.g.min.js dist/wax.mm.min.js dist/wax.leaf.min.js
+ dist: dist_setup dist/wax.ol.min.js \
+ 	dist/wax.g.min.js dist/wax.mm.min.js \
+-	dist/wax.leaf.min.js dist/wax.p.min.js lint
++	dist/wax.leaf.min.js dist/wax.p.min.js
  
  dist/wax.ol.min.js:
 -	cat build/header.js \
 -		ext/reqwest.min.js \
 -		ext/html-sanitizer-bundle.js \
-+	cat $(BUNDLE) \
-+		ext/html-sanitizer.js \
- 		ext/html-sanitizer-loosen.js \
+-		ext/html-sanitizer-loosen.js \
 -		ext/mustache.js \
++	cat $(BUNDLE) \
  		connectors/ol/*.js \
  		control/lib/*.js \
  		control/ol/*.js > dist/wax.ol.js
@@ -71,7 +70,14 @@ Forwarded: no
  		control/lib/*.js \
  		control/leaf/*.js \
  		connectors/leaf/*.js > dist/wax.leaf.js
-@@ -49,10 +41,8 @@ dist/wax.leaf.min.js:
+@@ -51,17 +39,14 @@ dist/wax.leaf.min.js:
+ 
+ dist/wax.p.min.js:
+ 	cat build/header.js \
+-		ext/reqwest.min.js \
+ 		control/lib/*.js \
+ 		connectors/p/*.js > dist/wax.p.js
+ 	$(UGLIFYJS) dist/wax.p.js > dist/wax.p.min.js
  
  dist_setup:
  	rm -rf dist
@@ -81,5 +87,5 @@ Forwarded: no
 -	$(BANNER) package.json > build/header.js
 +	[ -d build ] || mkdir build
  
- doc:
- 	./node_modules/.bin/docco control/mm/*.js
+ ext:
+ 	-test ! -d ext && mkdir ext

-- 
web maps visualization library