[tilecache] 12/14: Use packaged OpenLayers.js & underscore.js.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Mon Aug 24 19:51:28 UTC 2015


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

sebastic pushed a commit to branch master
in repository tilecache.

commit b9be7bcdfeb7106a065393271aa44fc3d12cf957
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 24 21:00:47 2015 +0200

    Use packaged OpenLayers.js & underscore.js.
---
 debian/changelog                                       |  1 +
 debian/control                                         |  4 +++-
 debian/links                                           |  3 +++
 debian/patches/privacy-breach-uses-embedded-file.patch | 15 +++++++++++++++
 debian/patches/series                                  |  1 +
 debian/rules                                           |  3 +--
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc39966..02bcd8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ tilecache (2.11+ds-1) UNRELEASED; urgency=medium
   * Add gbp.conf to use pristine-tar by default.
   * Repack upstream tarball to fix tar-errors-from-source issues.
   * Don't start description synopsis with an article.
+  * Use packaged OpenLayers.js & underscore.js.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 24 Aug 2015 20:23:38 +0200
 
diff --git a/debian/control b/debian/control
index ac45397..748840c 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,9 @@ Package: tilecache
 Architecture: all
 Depends: ${misc:Depends},
          ${python:Depends},
-         libjs-jquery
+         libjs-jquery,
+         libjs-openlayers,
+         libjs-underscore
 Recommends: python-imaging
 Suggests: python-mapscript,
           python-mapnik,
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..ecfef96
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,3 @@
+usr/share/javascript/openlayers               usr/share/doc/tilecache/examples/openlayers
+usr/share/javascript/jquery/jquery.js         usr/share/doc/tilecache/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/tilecache/html/_static/underscore.js
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..8471562
--- /dev/null
+++ b/debian/patches/privacy-breach-uses-embedded-file.patch
@@ -0,0 +1,15 @@
+Description: Use packaged OpenLayers.js to fix privacy breach.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/index.html
++++ b/index.html
+@@ -18,7 +18,7 @@
+ 	 z-index: 5000;
+         }	 
+     </style>
+-    <script src="http://openlayers.org/api/OpenLayers.js"></script>
++    <script src="openlayers/OpenLayers.js"></script>
+     <script type="text/javascript">
+         <!--
+         var map, layer;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1a4adf4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+privacy-breach-uses-embedded-file.patch
diff --git a/debian/rules b/debian/rules
index e11734f..bc930e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,8 +44,7 @@ override_dh_install:
 	rm -rf $(PREFIX)/usr/share/doc/tilecache/html/.doctrees/
 	rm -rf $(PREFIX)/usr/share/doc/tilecache/html/_sources/
 	rm -f $(PREFIX)/usr/share/doc/tilecache/html/_static/jquery.js
-	ln -s /usr/share/javascript/jquery/jquery.js \
-		$(PREFIX)/usr/share/doc/tilecache/html/_static/jquery.js
+	rm -f $(PREFIX)/usr/share/doc/tilecache/html/_static/underscore.js
 
 override_dh_installchangelogs:
 	dh_installchangelogs docs/NEWS.txt

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



More information about the Pkg-grass-devel mailing list