[openlayers] 06/07: Add patch to use packaged Bootstrap.

Tue Dec 22 17:56:14 UTC 2015

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

sebastic pushed a commit to branch master
in repository openlayers.

commit 23abd4c0fc8661c2a0902eb1cb59da7258f356fd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Dec 22 18:09:00 2015 +0100

    Add patch to use packaged Bootstrap.
---
 debian/changelog                                       |  1 +
 debian/control                                         |  3 ++-
 debian/libjs-openlayers-doc.links                      |  1 +
 debian/patches/privacy-breach-uses-embedded-file.patch | 15 +++++++++++++++
 debian/patches/series                                  |  1 +
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6be2ce1..a76bc37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openlayers (2.13.1+ds2-2) UNRELEASED; urgency=medium
   * Update GitHub URL for OpenLayers 2.x.
   * Update Vcs-Browser URL to use HTTPS.
   * Use uscan instead custom script in get-orig-source target.
+  * Add patch to use packaged Bootstrap.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 22 Dec 2015 16:16:26 +0100
 
diff --git a/debian/control b/debian/control
index 17123b0..08ded87 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,8 @@ Description: JavaScript library for displaying map data in web browsers
 Package: libjs-openlayers-doc
 Architecture: all
 Section: doc
-Depends: libjs-jquery,
+Depends: libjs-bootstrap,
+         libjs-jquery,
          libjs-jquery-mobile,
          ${misc:Depends}
 Recommends: libjs-openlayers
diff --git a/debian/libjs-openlayers-doc.links b/debian/libjs-openlayers-doc.links
index 2c5ec69..4733774 100644
--- a/debian/libjs-openlayers-doc.links
+++ b/debian/libjs-openlayers-doc.links
@@ -1,3 +1,4 @@
+usr/share/javascript/bootstrap     usr/share/doc/libjs-openlayers-doc/examples/bootstrap
 usr/share/javascript/jquery        usr/share/doc/libjs-openlayers-doc/examples/jquery
 usr/share/javascript/jquery-mobile usr/share/doc/libjs-openlayers-doc/examples/jquery-mobile
 usr/share/javascript/openlayers    usr/share/doc/libjs-openlayers-doc/examples/openlayers
diff --git a/debian/patches/privacy-breach-uses-embedded-file.patch b/debian/patches/privacy-breach-uses-embedded-file.patch
new file mode 100644
index 0000000..24521aa
--- /dev/null
+++ b/debian/patches/privacy-breach-uses-embedded-file.patch
@@ -0,0 +1,15 @@
+Description: Use packaged Bootstrap.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/examples/bootstrap.html
++++ b/examples/bootstrap.html
+@@ -3,7 +3,7 @@
+ <head>
+     <title>Bootstraped OpenLayers</title>
+     <link rel="stylesheet" href="openlayers/theme/default/style.css">
+-    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap.min.css" rel="stylesheet">
++    <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
+     <style>
+         body {
+             padding-top: 60px;
diff --git a/debian/patches/series b/debian/patches/series
index f3bd99b..5d42882 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 improved-GeoRSS-parsing.patch
 privacy-breach-w3c-valid-html.patch
 privacy-breach-may-use-debian-package.patch
+privacy-breach-uses-embedded-file.patch

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

