Merge lp:~saltmakrell/ubuntu/trusty/osm-gps-map/fixtiles-osm-gps-map into lp:ubuntu/trusty/osm-gps-map

[Ruben Undheim]

Fixes both #1312890 and #1320359.
This fix is needed for osm-gps-map to behave as required by openstreetmap (not sending fake User-Agent in the HTTP request).

[Łukasz Zemczak (sil2100)]

Looking good, fixes the FTBFS properly and seems to be a correct backport of the utopic-proposed user-agent fix.

review: Approve

[Sebastien Bacher (seb128)]

setting as merged, it's uploaded

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-10 09:01:42 +0000
+++ debian/changelog	2014-06-19 15:37:46 +0000
@@ -1,3 +1,10 @@
+osm-gps-map (0.7.3-3ubuntu1) trusty; urgency=low
+
+  * Fixing "failing to build from source (FTBFS)" (LP: #1312890)
+  * Fix for invalid user-agent (LP: #1320359) 
+
+ -- Ruben Undheim <[e-mail]>  Thu, 19 Jun 2014 17:22:23 +0200
+
 osm-gps-map (0.7.3-3) unstable; urgency=low
 
   * Add missing dependency on python-gtk2 (Closes: #680815)

=== added file 'debian/patches/02-fix_type_for_amd64.patch'
--- debian/patches/02-fix_type_for_amd64.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02-fix_type_for_amd64.patch	2014-06-19 15:37:46 +0000
@@ -0,0 +1,11 @@
+--- osm-gps-map-0.7.3.orig/src/osm-gps-map-widget.c
++++ osm-gps-map-0.7.3/src/osm-gps-map-widget.c
+@@ -775,7 +775,7 @@ osm_gps_map_tile_download_complete (Soup
+                 if (file != NULL) {
+                     fwrite (MSG_RESPONSE_BODY(msg), 1, MSG_RESPONSE_LEN(msg), file);
+                     file_saved = TRUE;
+-                    g_debug("Wrote "MSG_RESPONSE_LEN_FORMAT" bytes to %s", MSG_RESPONSE_LEN(msg), dl->filename);
++                    g_debug("Wrote "MSG_RESPONSE_LEN_FORMAT" bytes to %s", (long long int)MSG_RESPONSE_LEN(msg), dl->filename);
+                     fclose (file);
+ 
+                 }

=== added file 'debian/patches/03-wrong_user_agent.patch'
--- debian/patches/03-wrong_user_agent.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03-wrong_user_agent.patch	2014-06-19 15:37:46 +0000
@@ -0,0 +1,13 @@
+Index: osm-gps-map-0.7.3/src/osm-gps-map-widget.c
+===================================================================
+--- osm-gps-map-0.7.3.orig/src/osm-gps-map-widget.c    2014-05-16 21:11:48.853708626 +0200
++++ osm-gps-map-0.7.3/src/osm-gps-map-widget.c 2014-05-16 21:12:18.825708575 +0200
+@@ -143,7 +143,7 @@
+ #define ENABLE_DEBUG                (0)
+ #define EXTRA_BORDER                (TILESIZE / 2)
+ #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/0.7.3"
+ #define DOWNLOAD_RETRIES            3
+ #define MAX_DOWNLOAD_TILES          10000
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-12-31 11:16:10 +0000
+++ debian/patches/series	2014-06-19 15:37:46 +0000
@@ -1,1 +1,3 @@
 01-fix_python_linking.patch
+02-fix_type_for_amd64.patch
+03-wrong_user_agent.patch

=== modified file 'debian/rules'
--- debian/rules	2012-06-27 09:22:21 +0000
+++ debian/rules	2014-06-19 15:37:46 +0000
@@ -15,10 +15,12 @@
 		--disable-introspection \
 		--enable-gtk-doc \
 		--enable-gtk-doc-html \
-		--enable-gtk-doc-pdf
+		--enable-gtk-doc-pdf \
+		--prefix=/usr
 
 override_dh_auto_install:
 	for py in $(shell pyversions -r); do \
+		cd python && gnome-autogen.sh && cd .. ; \
 		PYTHON=$$py dh_auto_configure -Dpython/; \
 		dh_auto_build -Dpython/; \
 		dh_auto_install -Dpython/; \