[Pkg-osm-commits] [SCM] openlayers branch, master, updated. debian/2.11+ds1-1-3-g59dad3d

[David Paleino]

The following commit has been merged in the master branch:
commit 59dad3d85c90db8cdcb894970dc2a70020077698
Author: David Paleino <dapal at debian.org>
Date:   Sun Oct 9 13:14:26 2011 +0200

    Use uglifyjs instead of yui-compressor.

diff --git a/debian/changelog b/debian/changelog
index 3453b2a..a284d0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 openlayers (2.11+ds1-2) UNRELEASED; urgency=low
 
+  [ Jonas Smedegaard ]
   * Add patch to improve GeoRSS parsing.
 
- -- Jonas Smedegaard <dr at jones.dk>  Sun, 09 Oct 2011 12:52:16 +0200
+  [ David Paleino ]
+  * Use uglifyjs instead of yui-compressor.
+
+ -- David Paleino <dapal at debian.org>  Sun, 09 Oct 2011 13:14:14 +0200
 
 openlayers (2.11+ds1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3c86615..ab04760 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Paleino <dapal at debian.org>
 Build-Depends: debhelper (>= 8~)
  , python
 Build-Depends-Indep:
- yui-compressor
+ libnode-uglifyjs
  , naturaldocs
 Standards-Version: 3.9.2
 Homepage: http://openlayers.org/
diff --git a/debian/rules b/debian/rules
index 9c595c8..b03c1df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ override_dh_auto_build:
 	
 	( cd build ; \
 	./build.py ; \
-	yui-compressor -o min.js OpenLayers.js ; \
+	uglifyjs -o min.js OpenLayers.js ; \
 	cat license.txt min.js > OpenLayers.min.js )
 
 	mkdir gendoc

-- 
JavaScript library for displaying map data in web browsers