← Back to branch summary

~ubuntu-branches/ubuntu/trusty/s3d/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/110-s3dosm-api06.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sven Eckelmann
  • Date: 2009-07-11 17:00:52 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090711170052-2lltwp4rr01e6oly
* New upstream release
* debian/control:
  - Reduce debhelper dependency to 5
  - Only depend on xmlto and docbook-xml in Build-Depends-Indep for
    arch all package s3d-doc
* debian/patches:
  - Add 100-installable-examples.patch, make example usable without
    extra headers
  - Remove upstream merged patches 100-hyphen-used-as-minus-sign.patch,
    101-fix-sigbus-on-mips.patch, 102-send-correct-load-over-net.patch,
    103-endian-safe-float.patch, 104-reduce-depends.patch,
    105-s3dfm-pathnames.patch, 106-g3dorientation.patch,
    107-fix-cmake-ftbfs.patch, 108-fix-gpsd-ftbfs.patch,
    109-strip-libs3d-parameters.patch, 110-s3dosm-api06.patch,
    111-xmlto-documentation.patch
* Install examples with libs3d-dev and libs3dw-dev
* Convert debian/copyright to new dep5 version
* Upgraded to policy 3.8.2, no changes required
* Install upstream changelogs

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/110-s3dosm-api06.patch
1
 
From ca729dce39d56ac1abecd5729d06ff8d8c532e3c Mon Sep 17 00:00:00 2001
2
 
From: Sven Eckelmann <sven.eckelmann@gmx.de>
3
 
Date: Sat, 18 Apr 2009 13:11:23 +0000
4
 
Subject: [PATCH] s3dosm: Move to upcoming osm api 0.6
5
 
 
6
 
Openstreetmap.org changes it's api to a newer version on
7
 
17-19th April, 2009. No further changes should be needed for read-only
8
 
applications.
9
 
---
10
 
 apps/s3dosm/io.c  |    2 +-
11
 
 apps/s3dosm/osm.c |    2 +-
12
 
 2 files changed, 2 insertions(+), 2 deletions(-)
13
 
 
14
 
diff --git a/apps/s3dosm/io.c b/apps/s3dosm/io.c
15
 
index 2bf5b7e..9727839 100644
16
 
--- a/apps/s3dosm/io.c
17
 
+++ b/apps/s3dosm/io.c
18
 
@@ -69,7 +69,7 @@ int process_args(int argc, char **argv)
19
 
        };
20
 
        optind = 0;
21
 
        opterr = 0;
22
 
-       while (-1 != (c = getopt_long(argc, argv, "dH:?ho", long_options, &lopt_idx))) {
23
 
+       while (-1 != (c = getopt_long(argc, argv, "dH:?ho:", long_options, &lopt_idx))) {
24
 
                switch (c) {
25
 
                case 0:
26
 
                        break;
27
 
diff --git a/apps/s3dosm/osm.c b/apps/s3dosm/osm.c
28
 
index e8e1d89..f803263 100644
29
 
--- a/apps/s3dosm/osm.c
30
 
+++ b/apps/s3dosm/osm.c
31
 
@@ -149,7 +149,7 @@ layer_t *load_osm_web(float minlon, float minlat, float maxlon, float maxlat)
32
 
        char url[1024];
33
 
        char *fileBuf;      /* Pointer to downloaded data */
34
 
        layer_t *layer;
35
 
-       snprintf(url, 1024, "www.openstreetmap.org/api/0.5/map?bbox=%f,%f,%f,%f", minlon, minlat, maxlon, maxlat);
36
 
+       snprintf(url, 1024, "www.openstreetmap.org/api/0.6/map?bbox=%f,%f,%f,%f", minlon, minlat, maxlon, maxlat);
37
 
        printf("downloading url [ %s ]\n", url);
38
 
 
39
 
        ret = http_fetch(url, &fileBuf); /* Downloads page */
40
 
1.6.2.3
41