Merge branch 'master' into gtk3

Conflicts: configure.ac python/configure.ac python/osmgpsmap.defs python/setup.py
nzjrs · Mar 19, 2011 · 1381c0e · 1381c0e
2 parents 4b95e51 + 1885505
commit 1381c0e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -3,8 +3,7 @@
 SUBDIRS = src examples docs
 DISTCHECK_CONFIGURE_FLAGS =                     \
     --enable-gtk-doc                            \
-    --enable-maintainer-flags                   \
+    --enable-maintainer-flags
-    --enable-introspection
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
@@ -37,7 +36,7 @@ distclean-local:
 ChangeLog:
 	@echo Creating $@
 	@if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log 0.7.2.. --stat -M -C --name-status  --date=short --no-color) | fmt --split-only > $@.tmp \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log 0.7.3.. --stat -M -C --name-status  --date=short --no-color) | fmt --split-only > $@.tmp \
 	  && mv -f $@.tmp $@ \
 	  || ($(RM) $@.tmp; \
 	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \

diff --git a/NEWS b/NEWS
@@ -1,3 +1,6 @@
+Changes in 0.7.4
+======================
+
 Changes in 0.7.3
 ======================
   * When using the mouse scroll wheel to zoom in, centre on the mouse pointer

diff --git a/autogen.sh b/autogen.sh
@@ -5,7 +5,7 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="osm-gps-map"
-# REQUIRED_M4MACROS=introspection.m4
+#REQUIRED_M4MACROS=introspection.m4
 
 (test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
@@ -18,5 +18,6 @@ which gnome-autogen.sh || {
 	exit 1
 }
 
-. gnome-autogen.sh --enable-gtk-doc "$@"
+REQUIRED_AUTOMAKE_VERSION=1.11 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh --enable-gtk-doc "$@"
+
 
diff --git a/configure.ac b/configure.ac
@@ -1,22 +1,20 @@
-AC_PREREQ([2.62])
+AC_PREREQ([2.63])
 AC_INIT([osm-gps-map],
-        [0.7.3],
+        [0.7.4],
         [http://github.com/nzjrs/osm-gps-map/issues],
         [osm-gps-map])
-AM_INIT_AUTOMAKE([1.10])
+AM_INIT_AUTOMAKE([1.11])
 
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([src/osm-gps-map.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_MAINTAINER_MODE
-
 AM_PROG_CC_C_O
 
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
 
 # Library dependencies
 PKG_CHECK_MODULES(GLIB,     [glib-2.0 >= 2.16])

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
@@ -89,7 +89,8 @@ include $(top_srcdir)/gtk-doc.make
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST += version.xml.in
 
-if ENABLE_GTK_DOC
+# disable gtkdoc-check, I hate it
-TESTS_ENVIRONMENT = cd $(srcdir) &&
+#if ENABLE_GTK_DOC
-TESTS = $(GTKDOC_CHECK)
+#TESTS_ENVIRONMENT = cd $(srcdir) &&
-endif
+#TESTS = $(GTKDOC_CHECK)
+#endif
diff --git a/python/.gitignore b/python/.gitignore
diff --git a/src/osm-gps-map-source.c b/src/osm-gps-map-source.c
@@ -75,11 +75,11 @@ osm_gps_map_source_get_repo_uri(OsmGpsMapSource_t source)
         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:
-            return "http://mt#R.google.com/vt/lyrs=m@140&hl=en&x=#X&s=&y=#Y&z=#Z";
+            return "http://mt#R.google.com/vt/lyrs=m@146&hl=en&x=#X&s=&y=#Y&z=#Z";
         case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
-            return "http://mt#R.google.com/vt/lyrs=h@140&hl=en&x=#X&s=&y=#Y&z=#Z";
+            return "http://mt#R.google.com/vt/lyrs=h@146&hl=en&x=#X&s=&y=#Y&z=#Z";
         case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
-            return "http://khm#R.google.com/kh/v=75&x=#X&y=#Y&z=#Z";
+            return "http://khm#R.google.com/kh/v=80&x=#X&y=#Y&z=#Z";
         case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
             return "http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50";
         case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE: