[Pkg-javascript-commits] [SCM] web maps visualization library branch, master, updated. debian/5.0.1+ds1-1-5-gac14b50

[David Paleino]

The following commit has been merged in the master branch:
commit ac14b5054e32166667306b9f529295f4ea7b2280
Author: David Paleino <dapal at debian.org>
Date:   Wed Sep 5 11:18:11 2012 +0200

    Make get-orig-source download an old revision of html4-defs.js to mimick the bundled version of html-sanitizer.js (Closes: #684480)

diff --git a/debian/changelog b/debian/changelog
index d697379..d731f84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 wax.js (5.0.1+ds2-1) UNRELEASED; urgency=low
 
   * New repacked tarball
+  * Make get-orig-source download an old revision of html4-defs.js to
+    mimick the bundled version of html-sanitizer.js (Closes: #684480)
 
  -- David Paleino <dapal at debian.org>  Wed, 05 Sep 2012 11:14:08 +0200
 
diff --git a/debian/patches/00-fix_Makefile.patch b/debian/patches/00-fix_Makefile.patch
index 0cf1f5e..1375b7f 100644
--- a/debian/patches/00-fix_Makefile.patch
+++ b/debian/patches/00-fix_Makefile.patch
@@ -4,17 +4,18 @@ Origin: vendor
 Forwarded: no
 
 ---
- Makefile |   39 ++++++++++++---------------------------
- 1 file changed, 12 insertions(+), 27 deletions(-)
+ Makefile |   40 +++++++++++++---------------------------
+ 1 file changed, 13 insertions(+), 27 deletions(-)
 
 --- wax.js.orig/Makefile
 +++ wax.js/Makefile
-@@ -1,49 +1,37 @@
+@@ -1,49 +1,38 @@
 -UGLIFYJS = ./node_modules/.bin/uglifyjs
 -BANNER = ./node_modules/.bin/banner
 +UGLIFYJS = uglifyjs
 +NULL =
 +BUNDLE = build/header.js \
++	ext/html4-defs.js \
 +	ext/html-sanitizer.js \
 +	ext/html-sanitizer-loosen.js \
 +	$(NULL)
@@ -70,7 +71,7 @@ Forwarded: no
  		control/lib/*.js \
  		control/leaf/*.js \
  		connectors/leaf/*.js > dist/wax.leaf.js
-@@ -51,17 +39,14 @@ dist/wax.leaf.min.js:
+@@ -51,17 +40,14 @@ dist/wax.leaf.min.js:
  
  dist/wax.p.min.js:
  	cat build/header.js \
diff --git a/debian/rules b/debian/rules
index c3fcdff..d8a00a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,11 +44,14 @@ get-orig-source:
 		mapbox-wax-*/ext/polymaps*
 	@echo Downloading current version of html-sanitizer
 	@wget http://google-caja.googlecode.com/svn/trunk/src/com/google/caja/plugin/html-sanitizer.js
+	@echo Downloading revision 2832 of html4-defs.js
+	@wget http://google-caja.googlecode.com/svn-history/r2832/trunk/src/com/google/caja/plugin/html4-defs.js
+	@mv html4-defs.js mapbox-wax-*/ext/
 	@mv html-sanitizer.js mapbox-wax-*/ext/
 	@echo Removing _site
 	@rm -rf mapbox-wax-*/_site/
 	@echo Removing pre-compiled files
 	@rm -rf mapbox-wax-*/dist/
-	tar cf wax.js_$(UPVER)+ds1.orig.tar mapbox-wax-*/
-	gzip -9 wax.js_$(UPVER)+ds1.orig.tar
+	tar cf wax.js_$(UPVER)+ds2.orig.tar mapbox-wax-*/
+	gzip -9 wax.js_$(UPVER)+ds2.orig.tar
 	rm -rf mapbox-wax-*/ wax.js_$(UPVER).orig.tar.gz

-- 
web maps visualization library