[Pkg-osm-commits] [SCM] openlayers branch, master, updated. debian/2.10+ds1-2-8-gef7373c
David Paleino
dapal at debian.org
Tue Sep 13 13:59:29 UTC 2011
The following commit has been merged in the master branch:
commit cfe821c6247ae164d88c333624885126848ec2cf
Author: David Paleino <dapal at debian.org>
Date: Tue Sep 13 15:40:23 2011 +0200
Make resources available from a web browser, thanks to Andrew Harvey (Closes: #624604)
diff --git a/debian/changelog b/debian/changelog
index 8ad609a..716fd68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
openlayers (2.11+ds1-1) UNRELEASED; urgency=low
* New upstream release
+ * Make resources available from a web browser, thanks to Andrew Harvey
+ (Closes: #624604)
- -- David Paleino <dapal at debian.org> Tue, 13 Sep 2011 15:37:06 +0200
+ -- David Paleino <dapal at debian.org> Tue, 13 Sep 2011 15:39:44 +0200
openlayers (2.10+ds1-2) unstable; urgency=low
diff --git a/debian/libjs-openlayers.links b/debian/libjs-openlayers.links
new file mode 100644
index 0000000..f23c1d3
--- /dev/null
+++ b/debian/libjs-openlayers.links
@@ -0,0 +1,2 @@
+/usr/share/openlayers/theme /usr/share/javascript/openlayers/theme
+/usr/share/openlayers/img /usr/share/javascript/openlayers/img
diff --git a/debian/patches/00-fix_data_paths.patch b/debian/patches/00-fix_data_paths.patch
deleted file mode 100644
index 4f48a62..0000000
--- a/debian/patches/00-fix_data_paths.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: fix paths to images and themes
-Origin: vendor
-Forwarded: not-needed
-
----
- lib/OpenLayers/Control/PanPanel.js | 2 +-
- lib/OpenLayers/Control/ZoomPanel.js | 2 +-
- lib/OpenLayers/Map.js | 2 +-
- lib/OpenLayers/Util.js | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
---- openlayers.orig/lib/OpenLayers/Util.js
-+++ openlayers/lib/OpenLayers/Util.js
-@@ -668,7 +668,7 @@ OpenLayers.Util.urlAppend = function(url
- * Property: ImgPath
- * {String} Default is ''.
- */
--OpenLayers.ImgPath = '';
-+OpenLayers.ImgPath = '/usr/share/openlayers/img/';
-
- /**
- * Function: getImagesLocation
---- openlayers.orig/lib/OpenLayers/Map.js
-+++ openlayers/lib/OpenLayers/Map.js
-@@ -475,7 +475,7 @@ OpenLayers.Map = OpenLayers.Class({
-
- this.paddingForPopups = new OpenLayers.Bounds(15, 15, 15, 15);
-
-- this.theme = OpenLayers._getScriptLocation() +
-+ this.theme = '/usr/share/openlayers/' +
- 'theme/default/style.css';
-
- // now override default options
---- openlayers.orig/lib/OpenLayers/Control/PanPanel.js
-+++ openlayers/lib/OpenLayers/Control/PanPanel.js
-@@ -21,7 +21,7 @@
- *
- * (code)
- * <!--[if lte IE 6]>
-- * <link rel="stylesheet" href="../theme/default/ie6-style.css" type="text/css" />
-+ * <link rel="stylesheet" href="/usr/share/openlayers/theme/default/ie6-style.css" type="text/css" />
- * <![endif]-->
- * (end)
- *
---- openlayers.orig/lib/OpenLayers/Control/ZoomPanel.js
-+++ openlayers/lib/OpenLayers/Control/ZoomPanel.js
-@@ -24,7 +24,7 @@
- *
- * (code)
- * <!--[if lte IE 6]>
-- * <link rel="stylesheet" href="../theme/default/ie6-style.css" type="text/css" />
-+ * <link rel="stylesheet" href="/usr/share/openlayers/theme/default/ie6-style.css" type="text/css" />
- * <![endif]-->
- * (end)
- *
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c7cb77f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-00-fix_data_paths.patch
--
JavaScript library for displaying map data in web browsers
More information about the Pkg-osm-commits
mailing list