[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.3.1-1-16-gd1c6144

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 1e590d3ae4515bb41fc24d06095f84a227e1908c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jul 30 20:29:09 2012 +0200

    Add copyright hints, and skip checking an image.

diff --git a/debian/copyright_hints b/debian/copyright_hints
new file mode 100644
index 0000000..32a8426
--- /dev/null
+++ b/debian/copyright_hints
@@ -0,0 +1,189 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: FIXME
+Upstream-Contact: FIXME
+Source: FIXME
+Disclaimer: Autogenerated by CDBS
+
+Files: CHANGELOG.md
+ README.md
+ build/build.html
+ build/build.js
+ build/deps.js
+ build/hint.js
+ build/hintrc.js
+ debian/compat
+ debian/control
+ debian/control.in
+ debian/patches/README
+ debian/patches/series
+ debian/source/format
+ debian/watch
+ debug/css/mobile.css
+ debug/css/screen.css
+ debug/hacks/jitter.html
+ debug/leaflet-include.js
+ debug/map/canvas.html
+ debug/map/controls.html
+ debug/map/geolocation.html
+ debug/map/image-overlay.html
+ debug/map/map-mobile.html
+ debug/map/map.html
+ debug/map/max-bounds.html
+ debug/map/scroll.html
+ debug/map/wms-marble.html
+ debug/map/wms.html
+ debug/vector/bounds-extend.html
+ debug/vector/editable.html
+ debug/vector/feature-group-bounds.html
+ debug/vector/geojson-sample.js
+ debug/vector/geojson.html
+ debug/vector/rectangle.html
+ debug/vector/route.js
+ debug/vector/touchzoomemu.html
+ debug/vector/vector-bounds.html
+ debug/vector/vector-canvas.html
+ debug/vector/vector-mobile.html
+ debug/vector/vector-simple.html
+ debug/vector/vector.html
+ dist/images/marker-icon.png
+ dist/images/marker-shadow.png
+ dist/images/zoom-in.png
+ dist/images/zoom-out.png
+ dist/leaflet.css
+ dist/leaflet.ie.css
+ spec/jasmine/jasmine-html.js
+ spec/jasmine/jasmine.css
+ spec/jasmine/jasmine.js
+ spec/runner.html
+ spec/suites/LeafletSpec.js
+ spec/suites/SpecHelper.js
+ spec/suites/core/ClassSpec.js
+ spec/suites/core/EventsSpec.js
+ spec/suites/core/UtilSpec.js
+ spec/suites/dom/DomEventSpec.js
+ spec/suites/dom/DomUtilSpec.js
+ spec/suites/geo/LatLngBoundsSpec.js
+ spec/suites/geo/LatLngSpec.js
+ spec/suites/geo/ProjectionSpec.js
+ spec/suites/geometry/BoundsSpec.js
+ spec/suites/geometry/PointSpec.js
+ spec/suites/geometry/TransformationSpec.js
+ spec/suites/layer/TileLayerSpec.js
+ spec/suites/layer/vector/PolylineGeometrySpec.js
+ spec/suites/map/MapSpec.js
+ src/Leaflet.js
+ src/control/Control.Attribution.js
+ src/control/Control.Layers.js
+ src/control/Control.Scale.js
+ src/control/Control.Zoom.js
+ src/control/Control.js
+ src/core/Browser.js
+ src/core/Class.js
+ src/core/Events.js
+ src/core/Handler.js
+ src/core/Util.js
+ src/dom/DomEvent.DoubleTap.js
+ src/dom/DomEvent.js
+ src/dom/DomUtil.js
+ src/dom/Draggable.js
+ src/dom/transition/Transition.Native.js
+ src/dom/transition/Transition.Timer.js
+ src/dom/transition/Transition.js
+ src/geo/LatLng.js
+ src/geo/LatLngBounds.js
+ src/geo/crs/CRS.EPSG3395.js
+ src/geo/crs/CRS.EPSG3857.js
+ src/geo/crs/CRS.EPSG4326.js
+ src/geo/crs/CRS.Simple.js
+ src/geo/crs/CRS.js
+ src/geo/projection/Projection.LonLat.js
+ src/geo/projection/Projection.Mercator.js
+ src/geo/projection/Projection.SphericalMercator.js
+ src/geo/projection/Projection.js
+ src/geometry/Bounds.js
+ src/geometry/LineUtil.js
+ src/geometry/Point.js
+ src/geometry/PolyUtil.js
+ src/geometry/Transformation.js
+ src/layer/FeatureGroup.js
+ src/layer/GeoJSON.js
+ src/layer/ImageOverlay.js
+ src/layer/LayerGroup.js
+ src/layer/Popup.js
+ src/layer/marker/DivIcon.js
+ src/layer/marker/Icon.Default.js
+ src/layer/marker/Icon.js
+ src/layer/marker/Marker.Drag.js
+ src/layer/marker/Marker.Popup.js
+ src/layer/marker/Marker.js
+ src/layer/tile/TileLayer.Canvas.js
+ src/layer/tile/TileLayer.WMS.js
+ src/layer/tile/TileLayer.js
+ src/layer/vector/Circle.js
+ src/layer/vector/CircleMarker.js
+ src/layer/vector/MultiPoly.js
+ src/layer/vector/Path.Popup.js
+ src/layer/vector/Path.SVG.js
+ src/layer/vector/Path.VML.js
+ src/layer/vector/Path.js
+ src/layer/vector/Polygon.js
+ src/layer/vector/Polyline.Edit.js
+ src/layer/vector/Polyline.js
+ src/layer/vector/Rectangle.js
+ src/layer/vector/canvas/Circle.Canvas.js
+ src/layer/vector/canvas/Path.Canvas.js
+ src/layer/vector/canvas/Polygon.Canvas.js
+ src/layer/vector/canvas/Polyline.Canvas.js
+ src/map/Map.js
+ src/map/anim/Map.PanAnimation.js
+ src/map/anim/Map.ZoomAnimation.js
+ src/map/ext/Map.Control.js
+ src/map/ext/Map.Geolocation.js
+ src/map/ext/Map.Popup.js
+ src/map/handler/Map.BoxZoom.js
+ src/map/handler/Map.DoubleClickZoom.js
+ src/map/handler/Map.Drag.js
+ src/map/handler/Map.Keyboard.js
+ src/map/handler/Map.ScrollWheelZoom.js
+ src/map/handler/Map.TouchZoom.js
+Copyright: *No copyright*
+License: UNKNOWN
+ FIXME
+
+Files: dist/leaflet-src.js
+ dist/leaflet.js
+Copyright: 2010-2012, CloudMade, Vladimir Agafonkin
+License: UNKNOWN
+ FIXME
+
+Files: LICENSE
+Copyright: 2010-2011, CloudMade, Vladimir Agafonkin
+  HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL
+  HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+License: BSD (2 clause)
+ FIXME
+
+Files: debian/rules
+Copyright: 2010-2011, Jonas Smedegaard <dr at jones.dk>
+  2011, Andrew Harvey <andrew.harvey4 at gmail.com>
+License: GPL-2+
+ FIXME
+
+Files: spec/jasmine/MIT.LICENSE
+Copyright: 2008-2011, Pivotal Labs
+  HOLDERS BE
+License: MIT/X11 (BSD like)
+ FIXME
+
+Files: Jakefile.js
+Copyright: + build.uglify(content)
+  + content
+  = '/*\n 2010-2012, CloudMade, Vladimir Agafonkin\n' +
+License: UNKNOWN
+ FIXME
+
+Files: debian/patches/2001-dont_test_during_build.patch
+Copyright: = '/*\n 2010-2012, CloudMade, Vladimir Agafonkin\n' +
+License: UNKNOWN
+ FIXME
+
diff --git a/debian/rules b/debian/rules
index 9f35453..288c5a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,9 @@ DEB_UPSTREAM_RECEIVED_EXTENSION = tar.gz
 DEB_UPSTREAM_WGET_OPTS += --no-check-certificate
 DEB_UPSTREAM_TARBALL_MD5 = d6d966e0dc09c9459ec68d5be79f4be9
 
+# Skip checking an image (in addition to the defaults)
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(dist/images/layers\.png|debian/(changelog|copyright(|_hints|_newhints)))$
+
 # Put aside upstream shipped autogenerated files during build
 DEB_UPSTREAM_CRUFT_MOVE = dist/leaflet.js dist/leaflet-src.js
 

-- 
JavaScript library for displaying map data in web browsers