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

Mon Jul 30 18:37:22 UTC 2012

The following commit has been merged in the master branch:
commit 1eb70859b41bb8cb9a05fa084c9084fdc0c53d34
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jul 30 19:53:02 2012 +0200

    Drop patch cherry-picked upstream: Included upstream.

diff --git a/debian/patches/020120215~ba5b40c.patch b/debian/patches/020120215~ba5b40c.patch
deleted file mode 100644
index 31f8b16..0000000
--- a/debian/patches/020120215~ba5b40c.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Description: fix non-removable attributions regression
-Origin: upstream, https://github.com/CloudMade/Leaflet/commit/ba5b40
-Bug: https://github.com/CloudMade/Leaflet/issues/488
-Author: mourner <agafonkin at gmail.com>
-Last-Update: 2012-02-15
-
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -15,6 +15,10 @@
- 
-  * Fixed a bug where `TileLayer.WMS` wouldn't take `insertAtTheBottom` option into account (by [@bmcbride](https://github.com/bmcbride)). [#478](https://github.com/CloudMade/Leaflet/pull/478)
- 
-+## 0.3.2 RC
-+
-+ * Fixed a regression where removeLayer would not remove corresponding attribution. [#488](https://github.com/CloudMade/Leaflet/issues/488)
-+
- ## 0.3.1 (14.02.2012)
- 
-  * Fixed a regression where default marker icons wouldn't work if Leaflet include url contained a query string.
---- a/debug/control/control-layers.html
-+++ b/debug/control/control-layers.html
-@@ -5,9 +5,9 @@
- 
- 	<link rel="stylesheet" href="../../dist/leaflet.css" />
- 	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
--	
-+
- 	<link rel="stylesheet" href="../css/screen.css" />
--	
-+
- 	<script src="../leaflet-include.js"></script>
- </head>
- <body>
-@@ -15,23 +15,23 @@
- 	<div id="map"></div>
- 
- 	<script type="text/javascript">
--	
-+
- 		function getCloudMadeUrl(styleId) {
- 			return 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/' + styleId + '/256/{z}/{x}/{y}.png';
- 		}
- 
- 		var cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
- 			cloudmade = new L.TileLayer(getCloudMadeUrl(997), {attribution: cloudmadeAttribution}),
--			cloudmade2 = new L.TileLayer(getCloudMadeUrl(998), {attribution: cloudmadeAttribution});
--		
-+			cloudmade2 = new L.TileLayer(getCloudMadeUrl(998), {attribution: 'Hello world'});
-+
- 		var map = new L.Map('map').addLayer(cloudmade).setView(new L.LatLng(50.5, 30.51), 15);
--		
-+
- 		var marker = new L.Marker(new L.LatLng(50.5, 30.505));
- 		map.addLayer(marker);
--		
-+
- 		var marker2 = new L.Marker(new L.LatLng(50.502, 30.515));
- 		map.addLayer(marker2);
--		
-+
- 		var layersControl = new L.Control.Layers({
- 			'CloudMade Fresh': cloudmade,
- 			'CloudMade Pale Dawn': cloudmade2
-@@ -39,9 +39,9 @@
- 			'Some marker': marker,
- 			'Another marker': marker2
- 		});
--		
-+
- 		map.addControl(layersControl);
--		
-+
- 	</script>
- </body>
--</html>
-\ No newline at end of file
-+</html>
---- a/src/control/Control.Attribution.js
-+++ b/src/control/Control.Attribution.js
-@@ -51,7 +51,7 @@
- 		var attribs = [];
- 
- 		for (var i in this._attributions) {
--			if (this._attributions.hasOwnProperty(i)) {
-+			if (this._attributions.hasOwnProperty(i) && this._attributions[i]) {
- 				attribs.push(i);
- 			}
- 		}
diff --git a/debian/patches/series b/debian/patches/series
index 21f1844..cb10c03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-020120215~ba5b40c.patch
 2001-dont_test_during_build.patch

-- 
JavaScript library for displaying map data in web browsers

