[hamradio-commits] [xastir] 01/02: Update OSM patch again

[Iain Learmonth]

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

irl-guest pushed a commit to branch master
in repository xastir.

commit 5dc6f054763ca6f1121b2124b8e5dcd8bfeef1ae
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Tue Apr 21 15:30:51 2015 +0100

    Update OSM patch again
---
 debian/changelog                |  2 +-
 debian/patches/OSM_config.patch | 53 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d0fce01..8ea274f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,7 +40,7 @@ xastir (2.0.6-2) UNRELEASED; urgency=medium
   * debian/install:
     - Created to install the desktop file.
 
- -- Iain R. Learmonth <irl at fsfe.org>  Wed, 01 Apr 2015 19:55:56 +0100
+ -- Iain R. Learmonth <irl at fsfe.org>  Tue, 21 Apr 2015 15:42:34 +0100
 
 xastir (2.0.6-1) unstable; urgency=medium
 
diff --git a/debian/patches/OSM_config.patch b/debian/patches/OSM_config.patch
index d5b6af9..3af505d 100644
--- a/debian/patches/OSM_config.patch
+++ b/debian/patches/OSM_config.patch
@@ -404,3 +404,56 @@ Origin: upstream
  
  gpsdir=${pkgdatadir}/maps/GPS
  gps_DATA=placeholder
+--- xastir.orig/Makefile.in
++++ xastir/Makefile.in
+@@ -314,10 +314,8 @@
+         missing mkinstalldirs placeholder FAQ LICENSE README README.CVS \
+         README.CYGWIN README.Getting-Started README.Contributing \
+         README.MAPS README.win32 README.OSM_maps testdbfawk.1 \
+-        DEBUG_LEVELS bootstrap.sh INSTALL UPGRADE callpass.1 xastir.1 xastir_udp_client.1 terraserver.geo \
+-        terraserver-reflectivity.geo terraserver-urban.geo worldhi.map \
+-        terraserver-topo.geo USRadar.geo CanadaTopo250k.geo \
+-        CanadaTopo50k.geo TXRadar.geo WMSRadar.geo Davis LaCrosse \
++        DEBUG_LEVELS bootstrap.sh INSTALL UPGRADE callpass.1 xastir.1 xastir_udp_client.1 \
++        Davis LaCrosse \
+         OSM_template \
+         CC_OpenStreetMap_logo.png CC_OpenStreetMap_txt.png \
+         COPYING COPYING.LIB.LESSTIF AUTHORS
+@@ -335,16 +333,7 @@
+ mapdir = ${pkgdatadir}/maps
+ map_DATA = worldhi.map CC_OpenStreetMap_logo.png CC_OpenStreetMap_txt.png
+ onlinedir = ${pkgdatadir}/maps/Online
+-online_DATA = terraserver.geo terraserver-topo.geo \
+-        terraserver-reflectivity.geo terraserver-urban.geo \
+-        USRadar.geo CanadaTopo250k.geo CanadaTopo50k.geo \
+-        TXRadar.geo WMSRadar.geo \
+-        OSM_cloudmade_1.geo OSM_cloudmade_2.geo \
+-        OSM_cloudmade_5.geo OSM_cloudmade_998.geo \
+-        OSM_cloudmade_999.geo OSM_tiled_cycle.geo OSM_tiled_mapnik.geo \
+-        OSM_tiled_osmarender.geo OSM_tiled_skiing.geo \
+-        OSM_tiled_topOSM_0_relief.geo \
+-        OSM_tiled_topOSM_1_contour.geo  OSM_tiled_topOSM_2_features.geo
++online_DATA = *.geo
+ 
+ gpsdir = ${pkgdatadir}/maps/GPS
+ gps_DATA = placeholder
+--- xastir.orig/terraserver-reflectivity.geo
++++ /dev/null
+@@ -1,2 +0,0 @@
+-TERRASERVER-REFLECTIVITY
+-
+--- xastir.orig/terraserver-topo.geo
++++ /dev/null
+@@ -1,2 +0,0 @@
+-TERRASERVER-TOPO
+-
+--- xastir.orig/terraserver-urban.geo
++++ /dev/null
+@@ -1,2 +0,0 @@
+-TERRASERVER-URBAN
+-
+--- xastir.orig/terraserver.geo
++++ /dev/null
+@@ -1,2 +0,0 @@
+-TERRASERVER-SATELLITE
+-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/xastir.git