[hamradio-commits] [xastir] 03/05: Update debian/ for new upstream
Iain R. Learmonth
irl at moszumanska.debian.org
Tue Jul 26 15:42:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
irl pushed a commit to branch master
in repository xastir.
commit fef314d1d7b0ec36c7c9dad5334375c7b22c3886
Author: Iain R. Learmonth <irl at debian.org>
Date: Fri Jul 1 23:39:27 2016 +0100
Update debian/ for new upstream
---
debian/changelog | 9 ++
debian/patches/OSM_config.patch | 193 ++--------------------------------------
debian/patches/link.patch | 16 ++--
3 files changed, 22 insertions(+), 196 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f0eb442..775c796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xastir (2.0.8-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Refreshed patches:
+ - OSM maps patch, this is mostly what upstream has now.
+ - Linking patch, some links were removed upstream.
+
+ -- Iain R. Learmonth <irl at debian.org> Fri, 01 Jul 2016 23:37:46 +0100
+
xastir (2.0.6-5) unstable; urgency=medium
* Removed dependency on Jasper, disabled in build process (Closes: #818217)
diff --git a/debian/patches/OSM_config.patch b/debian/patches/OSM_config.patch
index 3af505d..7241e93 100644
--- a/debian/patches/OSM_config.patch
+++ b/debian/patches/OSM_config.patch
@@ -4,104 +4,8 @@ Description: Upstream changes to maps introduced for 2.0.7.
Origin: upstream
---- xastir.orig/CanadaTopo250k.geo
-+++ /dev/null
-@@ -1,2 +0,0 @@
--TOPORAMA-250k
--
---- xastir.orig/CanadaTopo50k.geo
-+++ /dev/null
-@@ -1,2 +0,0 @@
--TOPORAMA-50k
--
---- xastir.orig/TXRadar.geo
-+++ /dev/null
-@@ -1,23 +0,0 @@
--#
--# $Id: TXRadar.geo,v 1.1 2004/10/05 15:54:25 we7u Exp $
--#
--#US Composite Radar image (Unidata/LDM/Gempak) n5jxs 2003 08 25
--URL http://mesonet.tamu.edu/gemdata/images/radar/01_mesonet.png
--# X Y Long Lat
--TIEPOINT 200 200 -104.80000 35.50000
--TIEPOINT 1130 1090 -95.50000 26.60000
--# Image extents: Lat: 24.6N to 37.5N, Lon: 93.5W to 106.8W (-93.5 to -106.8) # Image size extents: X: 1330 pixels, Y: 1290 pixels (.01 deg/pixel)
--IMAGESIZE 1330 1290
--#
--# REFRESH tells your program just how often to retrieve the radar
--# image. Images are recreated on the server every 6 minutes (720 sec).
--REFRESH 720
--# Transparent tells the program and image handling software what color
--#is to be considered transparent. In this case, it's white and valid
--# for a 24-bit color map.
--#TRANSPARENT 0xffffff
--# The following should work for a 16-bit color map.
--#TRANSPARENT 0x0ffff
--# The following should work for all color maps, now.
--TRANSPARENT 0x0ffffffff
--
---- xastir.orig/USRadar.geo
-+++ /dev/null
-@@ -1,37 +0,0 @@
--#
--# $Id: USRadar.geo,v 1.5 2006/12/01 21:47:11 we7u Exp $
--#
--#US Composite Radar image (Unidata/LDM/Gempak) n5jxs 2003 08 25
--# Modified for accuracy, comments: n5jxs 2004 03 15 1400UTC
--#
--# If you want to get a different image-type, change the selection
--# below by removing the '#' from the front of the URL, and placing
--# a '#' before all URLs for image-types you don't want.
--# I don't know what will happen if you have multiple URLs selected.
--URL http://mesonet.tamu.edu/gemdata/images/radar/01_USrad.png
--#URL http://mesonet.tamu.edu/gemdata/images/radar/01_USrad.gif
--#URL http://mesonet.tamu.edu/gemdata/images/radar/01_USrad.jpg
--#URL http://mesonet.tamu.edu/gemdata/images/radar/01_USrad.tif
--#
--#
--# X Y Long Lat
--TIEPOINT 200 200 -123.00000 48.00000
--TIEPOINT 5999 2499 -65.00000 23.00000
--# Image extents: Lat: 23.0N to 50.0N, Lon: 65.0W to 125.0W (-65.0 to -125.0)
--# Image size extents: X: 6000 pixels, Y: 2650 pixels (.01 deg/pixel)
--IMAGESIZE 6000 2500
--#
--# REFRESH tells your program just how often to retrieve the radar
--# image. Images are recreated on the server every 6 minutes (720
--# sec).
--REFRESH 720
--# Transparent tells the program and image handling software what
--# color is to be considered transparent. In this case, it's white
--# and valid for a 24-bit color map.
--#TRANSPARENT 0xffffff
--# The following should work for a 16-bit color map.
--#TRANSPARENT 0x0ffff
--# The following should work for all color maps, now.
--#TRANSPARENT 0x0ffffffff
--TRANSPARENT 0x000000000
--
---- xastir.orig/WMSRadar.geo
-+++ /dev/null
-@@ -1,17 +0,0 @@
--WMSSERVER
--#URL http://mesonet.tamu.edu/cgi-bin/CONUSradar?SERVICE=WMS&LAYERS=radar,nwscounties
--URL http://mesonet.tamu.edu/cgi-bin/CONUSradar?SERVICE=WMS&LAYERS=radar&FORMAT=image/png&TRANSPARENT=TRUE&CRS=CRS:84&BGCOLOR=0x000000&VERSION=1.1.0
--#
--#
--# REFRESH tells your program just how often to retrieve the radar
--# image. Images are recreated on the server every 6 minutes (720
--# sec).
--REFRESH 720
--#
--#
--# Black
--TRANSPARENT 0x010101
--TRANSPARENT 0x000000
--# White
--TRANSPARENT 0xffffff
--
--- /dev/null
-+++ xastir/OSM_tiled_cycle.geo
++++ b/OSM_tiled_cycle.geo
@@ -0,0 +1,51 @@
+#
+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
@@ -155,7 +59,7 @@ Origin: upstream
+OSM_REPORT_SCALE_KEY 65474
+
--- /dev/null
-+++ xastir/OSM_tiled_fosm.geo
++++ b/OSM_tiled_fosm.geo
@@ -0,0 +1,51 @@
+#
+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
@@ -209,7 +113,7 @@ Origin: upstream
+OSM_REPORT_SCALE_KEY 65474
+
--- /dev/null
-+++ xastir/OSM_tiled_mapnik.geo
++++ b/OSM_tiled_mapnik.geo
@@ -0,0 +1,51 @@
+#
+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
@@ -263,7 +167,7 @@ Origin: upstream
+OSM_REPORT_SCALE_KEY 65474
+
--- /dev/null
-+++ xastir/OSM_tiled_mapquest-aerial.geo
++++ b/OSM_tiled_mapquest-aerial.geo
@@ -0,0 +1,51 @@
+#
+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
@@ -317,7 +221,7 @@ Origin: upstream
+OSM_REPORT_SCALE_KEY 65474
+
--- /dev/null
-+++ xastir/OSM_tiled_mapquest.geo
++++ b/OSM_tiled_mapquest.geo
@@ -0,0 +1,51 @@
+#
+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
@@ -370,90 +274,3 @@ Origin: upstream
+OSM_OPTIMIZE_KEY 65473
+OSM_REPORT_SCALE_KEY 65474
+
---- xastir.orig/Makefile.am
-+++ xastir/Makefile.am
-@@ -18,10 +18,9 @@
- 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 \
-+ worldhi.map \
-+ Davis LaCrosse \
- OSM_template \
- CC_OpenStreetMap_logo.png CC_OpenStreetMap_txt.png \
- COPYING COPYING.LIB.LESSTIF AUTHORS
-@@ -43,16 +42,7 @@
- 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/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
--
diff --git a/debian/patches/link.patch b/debian/patches/link.patch
index 804ca8e..8b1a6c4 100644
--- a/debian/patches/link.patch
+++ b/debian/patches/link.patch
@@ -1,7 +1,7 @@
Remove manual linking to allow dh_link for debian packaging.
---- xastir.orig/Makefile.am
-+++ xastir/Makefile.am
-@@ -75,9 +75,9 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -67,9 +67,9 @@
-rm -rf $(DESTDIR)${pkgdatadir}/doc
install-data-hook:
@@ -14,9 +14,9 @@ Remove manual linking to allow dh_link for debian packaging.
mandir=${prefix}/share/man
man_MANS=xastir.1 callpass.1 xastir_udp_client.1 testdbfawk.1
---- xastir.orig/Makefile.in
-+++ xastir/Makefile.in
-@@ -1135,9 +1135,9 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1127,9 +1127,9 @@
-rm -rf $(DESTDIR)${pkgdatadir}/doc
install-data-hook:
@@ -27,5 +27,5 @@ Remove manual linking to allow dh_link for debian packaging.
+ echo rm -f CC_OpenStreetMap.png && \
+ echo $(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png
- # Tiles from cloudmade require an access code, so use the static map.
- OSM_cloudmade_1.geo: OSM_template
+ # Use tiles for these maps
+ OSM_tiled_cycle.geo: OSM_template
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/xastir.git
More information about the pkg-hamradio-commits
mailing list