[SCM] libkgeomap packaging branch, master, updated. 619125c46fa9d16b4747bac2a294a7546ed5e937

Sun Jun 14 17:31:58 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkgeomap.git;a=commitdiff;h=619125c

The following commit has been merged in the master branch:
commit 619125c46fa9d16b4747bac2a294a7546ed5e937
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 27 17:54:18 2015 +0200

    Use libjs-openlayers.
---
 debian/changelog                    |  1 +
 debian/control                      |  2 +-
 debian/libkgeomap-data.links        |  1 +
 debian/patches/series               |  1 +
 debian/patches/use_local_openlayers | 12 ++++++++++++
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6f3e586..ecd92c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,5 +2,6 @@ libkgeomap (15.04.0-1~) UNRELEASED; urgency=medium
 
   * Initial release (15.04.0).
   * New patch: test_data_dir.patch
+  * New patch: use_local_openlayers
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 23 Apr 2015 16:28:26 +0200
diff --git a/debian/control b/debian/control
index 8e40290..d8e0c19 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Description: World-Map Library interface for KDE - shared library
 
 Package: libkgeomap-data
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-openlayers
 Description: World-Map Library interface for KDE - data files
  Libkgeomap is a wrapper around different world-map components, to browse and
  arrange photos over a map.
diff --git a/debian/libkgeomap-data.links b/debian/libkgeomap-data.links
new file mode 100644
index 0000000..3a8aa5a
--- /dev/null
+++ b/debian/libkgeomap-data.links
@@ -0,0 +1 @@
+/usr/share/javascript/OpenLayers.js usr/share/kde4/apps/libkgeomap/OpenLayers.js
diff --git a/debian/patches/series b/debian/patches/series
index 427174b..0f50f6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 test_data_dir.patch
+use_local_openlayers
diff --git a/debian/patches/use_local_openlayers b/debian/patches/use_local_openlayers
new file mode 100644
index 0000000..10e579e
--- /dev/null
+++ b/debian/patches/use_local_openlayers
@@ -0,0 +1,12 @@
+Index: libkgeomap/data/backend-osm.html
+===================================================================
+--- libkgeomap.orig/data/backend-osm.html	2015-05-27 17:42:54.108132161 +0200
++++ libkgeomap/data/backend-osm.html	2015-05-27 17:52:20.841047631 +0200
+@@ -1,6 +1,6 @@
+ <html>
+ <head>
+-<script type="text/javascript" src="http://www.openlayers.org/api/OpenLayers.js"></script>
++<script type="text/javascript" src="OpenLayers.js"></script>
+ <script type="text/javascript" src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>
+ <script type="text/javascript" src="backend-osm-js.js"></script>
+ </head>

-- 
libkgeomap packaging

