[openlayers] 02/02: Add patches to fix privary breach issues in examples.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository openlayers.

commit 2c323c9601095db916efa9e97c2610c5dcee34c9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 26 04:46:27 2014 +0100

    Add patches to fix privary breach issues in examples.
---
 debian/changelog                                      |  1 +
 debian/control                                        |  4 +++-
 .../privacy-breach-may-use-debian-package.patch       | 16 ++++++++++++++++
 debian/patches/privacy-breach-w3c-valid-html.patch    | 19 +++++++++++++++++++
 debian/patches/series                                 |  2 ++
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 04ce12d..b182947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ openlayers (2.13.1+ds2-1) UNRELEASED; urgency=low
   * Also build light, lite, mobile & tests variants.
   * Also remove Jugl.js example, no source for minified JS.
   * Remove executable bit from image files.
+  * Add patches to fix privary breach issues in examples.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 26 Dec 2014 04:09:09 +0100
 
diff --git a/debian/control b/debian/control
index 6e56218..e914453 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,9 @@ Description: JavaScript library for displaying map data in web browsers
 Package: libjs-openlayers-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: libjs-jquery,
+         libjs-jquery-mobile,
+         ${misc:Depends}
 Description: documentation for OpenLayers
  OpenLayers is a pure JavaScript library for displaying map data in
  most modern web browsers, with no server-side dependencies.
diff --git a/debian/patches/privacy-breach-may-use-debian-package.patch b/debian/patches/privacy-breach-may-use-debian-package.patch
new file mode 100644
index 0000000..d67e5a9
--- /dev/null
+++ b/debian/patches/privacy-breach-may-use-debian-package.patch
@@ -0,0 +1,16 @@
+Description: Use packaged JQuery & JQuery Mobile.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+
+--- a/examples/mobile-jq.html
++++ b/examples/mobile-jq.html
+@@ -6,8 +6,8 @@
+         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+         <meta name="apple-mobile-web-app-capable" content="yes">
+         <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.css">
+-        <script src="http://code.jquery.com/jquery-1.6.4.min.js"></script>
+-        <script src="http://code.jquery.com/mobile/1.0.1/jquery.mobile-1.0.1.min.js"></script>
++        <script src="/javascript/jquery/jquery.min.js"></script>
++        <script src="/javascript/jquery-mobile/jquery.mobile.min.js"></script>
+         <link rel="stylesheet" href="../theme/default/style.mobile.css" type="text/css">
+         <link rel="stylesheet" href="style.mobile-jq.css" type="text/css">
+         <script src="../lib/OpenLayers.js?mobile"></script>
diff --git a/debian/patches/privacy-breach-w3c-valid-html.patch b/debian/patches/privacy-breach-w3c-valid-html.patch
new file mode 100644
index 0000000..764ef63
--- /dev/null
+++ b/debian/patches/privacy-breach-w3c-valid-html.patch
@@ -0,0 +1,19 @@
+Description: Don't link the W3C valid XHTML image, use a text link instead.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+
+--- a/examples/xhtml.html
++++ b/examples/xhtml.html
+@@ -28,11 +28,9 @@
+     map.addLayer(wms);
+     map.zoomToMaxExtent();
+   </script>
+-      <div id="docs">This example shows openlayers using a XHTML 1.0 Strict Doctype click on the below image to validate.
++      <div id="docs">This example shows openlayers using a XHTML 1.0 Strict Doctype click on the link below to validate.
+           <p>
+-                <a href="http://validator.w3.org/check/referer"><img
+-                    src="http://www.w3.org/Icons/valid-xhtml10"
+-                    alt="Valid XHTML 1.0!" height="31" width="88" /></a>
++                <a href="http://validator.w3.org/check/referer">Validate</a>
+       </p>
+     </div>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3c9066c..f3bd99b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 improved-GeoRSS-parsing.patch
+privacy-breach-w3c-valid-html.patch
+privacy-breach-may-use-debian-package.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openlayers.git