The following commit has been merged in the master branch:
commit b730c62b0ce6f2673c9d36d3ce20275c503d9aee
Author: Andrew Harvey <andrew.harv...@gmail.com>
Date: Tue Feb 14 09:03:52 2012 +1100
updating debian files for 0.3-1 release
diff --git a/debian/changelog b/debian/changelog
index 67bf7ff..7347bde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+leaflet (0.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Update debian/rules for new upstream build system.
+ * Patch upstream build system to avoid running tests until jshlint is
packaged
+
+ -- Andrew Harvey <andrew.harv...@gmail.com> Tue, 14 Feb 2012 07:11:04 +1100
+
leaflet (0.2.1-1) unstable; urgency=low
* Initial release.
diff --git a/debian/control b/debian/control
index a3a6f81..c6631f9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: extra
Maintainer: Debian OpenStreetMap Team <pkg-osm-ma...@lists.alioth.debian.org>
Uploaders: Andrew Harvey <andrew.harv...@gmail.com>
-Build-Depends: debhelper (>= 8.0.0), libnode-uglify, cdbs
+Build-Depends: debhelper (>= 8.0.0), node-uglify, node-jake, cdbs
Standards-Version: 3.9.2
Homepage: http://leaflet.cloudmade.com/
Vcs-Git: git://git.debian.org/pkg-osm/leaflet.git
diff --git a/debian/patches/01-buildsystem.diff
b/debian/patches/01-buildsystem.diff
deleted file mode 100644
index dc8df9a..0000000
--- a/debian/patches/01-buildsystem.diff
+++ /dev/null
@@ -1,142 +0,0 @@
---- a/build/Makefile
-+++ b/build/Makefile
-@@ -1,65 +1,65 @@
- ../dist/leaflet.js: Makefile
-- java -jar ../lib/closure-compiler/compiler.jar \
-- --js ../src/Leaflet.js \
-- --js ../src/core/Util.js \
-- --js ../src/core/Class.js \
-- --js ../src/core/Events.js \
-- --js ../src/core/Browser.js \
-- --js ../src/geometry/Point.js \
-- --js ../src/geometry/Bounds.js \
-- --js ../src/geometry/Transformation.js \
-- --js ../src/geometry/LineUtil.js \
-- --js ../src/geometry/PolyUtil.js \
-- --js ../src/dom/DomEvent.js \
-- --js ../src/dom/DomEvent.DoubleTap.js \
-- --js ../src/dom/DomUtil.js \
-- --js ../src/dom/Draggable.js \
-- --js ../src/dom/transition/Transition.js \
-- --js ../src/dom/transition/Transition.Native.js \
-- --js ../src/dom/transition/Transition.Timer.js \
-- --js ../src/geo/LatLng.js \
-- --js ../src/geo/LatLngBounds.js \
-- --js ../src/geo/projection/Projection.js \
-- --js ../src/geo/projection/Projection.SphericalMercator.js \
-- --js ../src/geo/projection/Projection.LonLat.js \
-- --js ../src/geo/projection/Projection.Mercator.js \
-- --js ../src/geo/crs/CRS.js \
-- --js ../src/geo/crs/CRS.EPSG3857.js \
-- --js ../src/geo/crs/CRS.EPSG4326.js \
-- --js ../src/geo/crs/CRS.EPSG3395.js \
-- --js ../src/layer/LayerGroup.js \
-- --js ../src/layer/FeatureGroup.js \
-- --js ../src/layer/tile/TileLayer.js \
-- --js ../src/layer/tile/TileLayer.WMS.js \
-- --js ../src/layer/tile/TileLayer.Canvas.js \
-- --js ../src/layer/ImageOverlay.js \
-- --js ../src/layer/Popup.js \
-- --js ../src/layer/marker/Icon.js \
-- --js ../src/layer/marker/Marker.js \
-- --js ../src/layer/marker/Marker.Popup.js \
-- --js ../src/layer/vector/Path.js \
-- --js ../src/layer/vector/Path.VML.js \
-- --js ../src/layer/vector/Path.Popup.js \
-- --js ../src/layer/vector/Polyline.js \
-- --js ../src/layer/vector/Polygon.js \
-- --js ../src/layer/vector/MultiPoly.js \
-- --js ../src/layer/vector/Circle.js \
-- --js ../src/layer/vector/CircleMarker.js \
-- --js ../src/layer/GeoJSON.js \
-- --js ../src/handler/Handler.js \
-- --js ../src/handler/MapDrag.js \
-- --js ../src/handler/TouchZoom.js \
-- --js ../src/handler/ScrollWheelZoom.js \
-- --js ../src/handler/DoubleClickZoom.js \
-- --js ../src/handler/ShiftDragZoom.js \
-- --js ../src/handler/MarkerDrag.js \
-- --js ../src/control/Control.js \
-- --js ../src/control/Control.Zoom.js \
-- --js ../src/control/Control.Attribution.js \
-- --js ../src/map/Map.js \
-- --js ../src/map/ext/Map.Geolocation.js \
-- --js ../src/map/ext/Map.Popup.js \
-- --js ../src/map/ext/Map.PanAnimation.js \
-- --js ../src/map/ext/Map.ZoomAnimation.js \
-- --js ../src/map/ext/Map.Control.js \
-- --js_output_file ../dist/leaflet.js
-+ cat \
-+ ../src/Leaflet.js \
-+ ../src/core/Util.js \
-+ ../src/core/Class.js \
-+ ../src/core/Events.js \
-+ ../src/core/Browser.js \
-+ ../src/geometry/Point.js \
-+ ../src/geometry/Bounds.js \
-+ ../src/geometry/Transformation.js \
-+ ../src/geometry/LineUtil.js \
-+ ../src/geometry/PolyUtil.js \
-+ ../src/dom/DomEvent.js \
-+ ../src/dom/DomEvent.DoubleTap.js \
-+ ../src/dom/DomUtil.js \
-+ ../src/dom/Draggable.js \
-+ ../src/dom/transition/Transition.js \
-+ ../src/dom/transition/Transition.Native.js \
-+ ../src/dom/transition/Transition.Timer.js \
-+ ../src/geo/LatLng.js \
-+ ../src/geo/LatLngBounds.js \
-+ ../src/geo/projection/Projection.js \
-+ ../src/geo/projection/Projection.SphericalMercator.js \
-+ ../src/geo/projection/Projection.LonLat.js \
-+ ../src/geo/projection/Projection.Mercator.js \
-+ ../src/geo/crs/CRS.js \
-+ ../src/geo/crs/CRS.EPSG3857.js \
-+ ../src/geo/crs/CRS.EPSG4326.js \
-+ ../src/geo/crs/CRS.EPSG3395.js \
-+ ../src/layer/LayerGroup.js \
-+ ../src/layer/FeatureGroup.js \
-+ ../src/layer/tile/TileLayer.js \
-+ ../src/layer/tile/TileLayer.WMS.js \
-+ ../src/layer/tile/TileLayer.Canvas.js \
-+ ../src/layer/ImageOverlay.js \
-+ ../src/layer/Popup.js \
-+ ../src/layer/marker/Icon.js \
-+ ../src/layer/marker/Marker.js \
-+ ../src/layer/marker/Marker.Popup.js \
-+ ../src/layer/vector/Path.js \
-+ ../src/layer/vector/Path.VML.js \
-+ ../src/layer/vector/Path.Popup.js \
-+ ../src/layer/vector/Polyline.js \
-+ ../src/layer/vector/Polygon.js \
-+ ../src/layer/vector/MultiPoly.js \
-+ ../src/layer/vector/Circle.js \
-+ ../src/layer/vector/CircleMarker.js \
-+ ../src/layer/GeoJSON.js \
-+ ../src/handler/Handler.js \
-+ ../src/handler/MapDrag.js \
-+ ../src/handler/TouchZoom.js \
-+ ../src/handler/ScrollWheelZoom.js \
-+ ../src/handler/DoubleClickZoom.js \
-+ ../src/handler/ShiftDragZoom.js \
-+ ../src/handler/MarkerDrag.js \
-+ ../src/control/Control.js \
-+ ../src/control/Control.Zoom.js \
-+ ../src/control/Control.Attribution.js \
-+ ../src/map/Map.js \
-+ ../src/map/ext/Map.Geolocation.js \
-+ ../src/map/ext/Map.Popup.js \
-+ ../src/map/ext/Map.PanAnimation.js \
-+ ../src/map/ext/Map.ZoomAnimation.js \
-+ ../src/map/ext/Map.Control.js \
-+ | uglifyjs -o ../dist/leaflet.js
---- a/src/geo/LatLngBounds.js
-+++ b/src/geo/LatLngBounds.js
-@@ -59,4 +59,5 @@
- }
- });
-
--//TODO International date line?
-\ No newline at end of file
-+//TODO International date line?
-+
diff --git a/debian/patches/01-dont_test_during_build.diff
b/debian/patches/01-dont_test_during_build.diff
new file mode 100644
index 0000000..77fd223
--- /dev/null
+++ b/debian/patches/01-dont_test_during_build.diff
@@ -0,0 +1,41 @@
+--- a/Jakefile.js
++++ b/Jakefile.js
+@@ -1,29 +1,12 @@
+-var build = require('./build/build.js'),
+- lint = require('./build/hint.js');
++var build = require('./build/build.js');
+
+ var crlf = '\r\n',
+ COPYRIGHT = '/*' + crlf + ' Copyright (c) 2010-2011, CloudMade,
Vladimir Agafonkin' + crlf +
+ ' Leaflet is a modern open-source JavaScript library for
interactive maps.' + crlf +
+ ' http://leaflet.cloudmade.com' + crlf + '*/' + crlf;
+
+-desc('Check Leaflet source for errors with JSHint');
+-task('lint', function () {
+- var files = build.getFiles();
+-
+- console.log('Checking for JS errors...');
+-
+- var errorsFound = lint.jshint(files);
+-
+- if (errorsFound > 0) {
+- console.log(errorsFound + ' error(s) found.\n');
+- fail();
+- } else {
+- console.log('\tCheck passed');
+- }
+-});
+-
+ desc('Combine and compress Leaflet source files');
+-task('build', ['lint'], function (compsBase32, buildName) {
++task('build', function (compsBase32, buildName) {
+ var pathPart = 'dist/leaflet' + (buildName ? '-' + buildName : ''),
+ srcPath = pathPart + '-src.js',
+ path = pathPart + '.js';
+@@ -62,4 +45,4 @@
+ }
+ });
+
+-task('default', ['build']);
+\ No newline at end of file
++task('default', ['build']);
diff --git a/debian/patches/series b/debian/patches/series
index d611568..77ff6fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01-buildsystem.diff
+01-dont_test_during_build.diff
diff --git a/debian/rules b/debian/rules
index 478ca19..3490217 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,14 +28,14 @@ libpkgname = libjs-leaflet
CDBS_BUILD_DEPENDS_rules_upstream-tarball =
CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
-CDBS_BUILD_DEPENDS += , libnode-uglify
+CDBS_BUILD_DEPENDS += , node-uglify , node-jake
DEB_UPSTREAM_URL = http://githubredir.debian.net/github/CloudMade/leaflet
DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION)
DEB_UPSTREAM_WGET_OPTS += --no-check-certificate
DEB_UPSTREAM_TARBALL_MD5 =
-DEB_UPSTREAM_REPACKAGE_EXCLUDES = ./lib/ ./dist/leaflet.js ./build/build.bat
-DEB_UPSTREAM_TARBALL_SRCDIR = CloudMade-Leaflet-404b097
+DEB_UPSTREAM_REPACKAGE_EXCLUDES = ./lib/ ./dist/leaflet.js
./dist/leaflet-src.js
+DEB_UPSTREAM_TARBALL_SRCDIR = CloudMade-Leaflet-ee46879
# suppress checking binary files, to not upset dpkg-source
DEB_COPYRIGHT_CHECK_IGNORE_REGEX =
^(.*/\..*\.swp|.*\?.*|debian/(changelog|copyright(|_hints|_newhints)))$
@@ -45,9 +45,9 @@ js-destdir = /usr/share/javascript/$(libname)
DEB_DH_INSTALL_ARGS_DEFAULT = dist/* $(js-destdir)
build/$(libpkgname)::
- make -C build
+ jake
clean::
- rm -f dist/leaflet.js
+ rm -f dist/leaflet.js dist/leaflet-src.js
# No files here should be set executable
#common-binary-fixup-indep::
--
JavaScript library for displaying map data in web browsers
_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
