[osm-gps-map] 148/153: Imported Upstream version 1.0.2

[Ross Gammon]

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

ross-guest pushed a commit to branch master
in repository osm-gps-map.

commit d17d399751e282c6d3272396a5bf2097007d5197
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Sat May 10 19:27:27 2014 +0200

    Imported Upstream version 1.0.2
---
 NEWS                     |  6 ++++++
 configure.ac             |  2 +-
 src/Makefile.am          | 11 ++++++-----
 src/osm-gps-map-source.c |  3 ++-
 src/osm-gps-map-widget.c |  2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 6a4a586..ed3ce93 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Changes in 1.0.2
+======================
+  * Fix build with new giscanner
+  * Build fixes guillomovitch <guillomovitch at gmail.com>
+  * Fix open-street-maps Andrew Gee <andrew at andrewgee.org>
+
 Changes in 1.0.1
 ======================
   * Build fixes
diff --git a/configure.ac b/configure.ac
index 16424f7..d5a6cd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.63])
 AC_INIT([osm-gps-map],
-        [1.0.1],
+        [1.0.2],
         [http://github.com/nzjrs/osm-gps-map/issues],
         [osm-gps-map])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 37415b9..66d67da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,8 @@ libosmgpsmap_1_0_la_LDFLAGS = \
 	$(no_undefined)
 
 libosmgpsmap_1_0_la_LIBADD =    \
-    $(OSMGPSMAP_LIBS)
+    $(OSMGPSMAP_LIBS) \
+    -lm
 
 sources_private_h =         \
 	converter.h             \
@@ -73,18 +74,18 @@ CLEANFILES =
 ## GObject Introspection Support
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(builddir) --warn-all
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --add-include-path=$(srcdir) --add-include-path=$(builddir) --warn-all
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(builddir)
 
 if HAVE_INTROSPECTION
 introspection_sources = $(sources_c) $(sources_public_h)
 
 OsmGpsMap-1.0.gir: libosmgpsmap-1.0.la
 OsmGpsMap_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
-OsmGpsMap_1_0_gir_CFLAGS = $(OSMGPSMAP_CFLAGS)
+OsmGpsMap_1_0_gir_CFLAGS = $(OSMGPSMAP_CFLAGS) -I$(srcdir) -I$(builddir)
 OsmGpsMap_1_0_gir_LIBS = libosmgpsmap-1.0.la
 OsmGpsMap_1_0_gir_FILES = $(introspection_sources)
-OsmGpsMap_1_0_gir_SCANNERFLAGS = --identifier-prefix=OsmGps
+OsmGpsMap_1_0_gir_SCANNERFLAGS = --identifier-prefix=OsmGps --c-include "osm-gps-map.h"
 INTROSPECTION_GIRS += OsmGpsMap-1.0.gir
 
 girdir = $(datadir)/gir-1.0
diff --git a/src/osm-gps-map-source.c b/src/osm-gps-map-source.c
index 4ee1702..9dbb807 100644
--- a/src/osm-gps-map-source.c
+++ b/src/osm-gps-map-source.c
@@ -93,7 +93,8 @@ osm_gps_map_source_get_repo_uri(OsmGpsMapSource_t source)
         case OSM_GPS_MAP_SOURCE_OSM_PUBLIC_TRANSPORT:
             return "http://tile.xn--pnvkarte-m4a.de/tilegen/#Z/#X/#Y.png";
         case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
-            return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
+            // Appears to be shut down
+            return NULL;
         case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
             return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
         case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
diff --git a/src/osm-gps-map-widget.c b/src/osm-gps-map-widget.c
index 30b0900..b6fd542 100644
--- a/src/osm-gps-map-widget.c
+++ b/src/osm-gps-map-widget.c
@@ -145,7 +145,7 @@
 #define ENABLE_DEBUG                (0)
 #define EXTRA_BORDER                (0)
 #define OSM_GPS_MAP_SCROLL_STEP     (10)
-#define USER_AGENT                  "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11"
+#define USER_AGENT                  "libosmgpsmap/1.0"
 #define DOWNLOAD_RETRIES            3
 #define MAX_DOWNLOAD_TILES          10000
 

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