[hamradio-commits] [xastir] 02/05: Imported Debian patch 2.0.4-2
Iain Learmonth
irl-guest at moszumanska.debian.org
Sat Nov 15 18:59:07 UTC 2014
This is an automated email from the git hooks/post-receive script.
irl-guest pushed a commit to branch master
in repository xastir.
commit c80f85629aae38a58edc074054cb5b545fee059b
Author: Colin Tuckley <colint at debian.org>
Date: Thu Jul 31 17:46:54 2014 +0100
Imported Debian patch 2.0.4-2
---
debian/README.source | 5 +
debian/changelog | 439 ++++++++++++++++++++++
debian/compat | 1 +
debian/control | 19 +
debian/copyright | 79 ++++
debian/patches/OSM_config.patch | 652 +++++++++++++++++++++++++++++++++
debian/patches/geotiff_directory.patch | 23 ++
debian/patches/link.patch | 31 ++
debian/patches/series | 4 +
debian/patches/simple_db.patch | 12 +
debian/rules | 60 +++
debian/source/format | 1 +
debian/watch | 2 +
debian/xastir.dirs | 4 +
debian/xastir.links | 1 +
debian/xastir.menu | 12 +
16 files changed, 1345 insertions(+)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..9dc3fca
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..d9e14ed
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,439 @@
+xastir (2.0.4-2) unstable; urgency=medium
+
+ * Prevent build-stamp rule from running multiple times
+ patch from Breno Leitao <brenohl at br.ibm.com> (Closes: #756638)
+ * Avoid outdated-autotools-helper-file by using dh_autoreconf
+ patch from Breno Leitao <brenohl at br.ibm.com> (Closes: #756640)
+
+ -- Colin Tuckley <colint at debian.org> Thu, 31 Jul 2014 17:46:54 +0100
+
+xastir (2.0.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Ack the NMU.
+ * Upgrade to 3.9.5 packaging standard.
+
+ -- Colin Tuckley <colint at debian.org> Mon, 16 Jun 2014 20:36:42 +0100
+
+xastir (2.0.0-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Incorporate patch from Peter Michael Green to fix FTBFS
+ (Closes: #733383)
+ * Fix build-dep on gdal (Closes: #732390)
+
+ -- Colin Tuckley <colint at debian.org> Mon, 05 May 2014 17:01:49 +0100
+
+xastir (2.0.0-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Drop lesstif2-dev alternative dependency (Closes: #714672).
+
+ -- Luk Claes <luk at debian.org> Sat, 14 Sep 2013 18:45:01 +0200
+
+xastir (2.0.0-2) unstable; urgency=low
+
+ * Upgrade to 3.9.2 packaging standard.
+ * Remove direct dependency on libxp-dev package. (Closes: #623653)
+ * Added patch file to support CVS since release for NWS updates.
+
+ -- Jerry Stueve <k4int at arrl.net> Tue, 21 Jun 2011 19:25:00 +0000
+
+xastir (2.0.0-1) unstable; urgency=low
+
+ * Move db entry to front of list. (Closes: #621450)
+ * Quiet some warnings in clean build.
+ * Clean up build dependencies & suggests entries.
+ * Suffer the misfortune of autoconf version changes.
+ * Move to extra instead of optional to match priority doctrine.
+ * Added patch files to support CVS upgrades since release.
+ * Update to current upstream release.
+
+ -- Jerry Stueve <k4int at arrl.net> Tue, 26 Apr 2011 13:15:00 +0000
+
+xastir (1.9.9-2010-08-16-1) unstable; urgency=low
+
+ * Improve OSM support with tiling.
+ * Incorporate CVS changes for topOSM tiling.
+ * move manual link hook to dh support to get it right.
+ * reapply setlocale to remove character set warning.
+ * Improved config file processing (closes LP: #425475)
+ * Added ID to uploaders list to support package.
+
+ -- Jerry Stueve <k4int at arrl.net> Mon, 16 Aug 2010 23:43:42 +0000
+
+xastir (1.9.9-2010-08-01-0.1) unstable; urgency=low
+
+ * NMU Improve OSM support with tiling.
+
+ -- Jerry Stueve <k4int at arrl.net> Wed, 04 Aug 2010 14:43:42 +0000
+
+xastir (1.9.9-0.1) unstable; urgency=low
+
+ * NMU Update to include OSM files since TigerMaps are off-line.
+ * Fix X11 window lock-down with right mouse click (close LP: #572620)
+
+ -- Jerry Stueve <gstueve at hotmail.com> Wed, 14 Jul 2010 04:49:11 +0000
+
+xastir (1.9.8-0.1) unstable; urgency=low
+
+ * NMU to add new upstream release (closes: #551578)
+
+ -- Jerry Stueve <gstueve at hotmail.com> Mon, 01 Feb 2010 11:55:41 -0500
+
+xastir (1.9.6-0.1) unstable; urgency=low
+
+ * NMU to add new upstream release (closes: #551578)
+ * Added fix from CVS for QuantumDepth problem with graphics files
+ * changed build-dep for updated libproj-dev packaging (closes: #521820)
+ * scripts are now based on installation prefix (closes: #561173, LP: #492867)
+ * Add testdbfawk to installed set (closes: #397144)
+ * Use command-line option -t to get internal SIGSEGV handler (closes: #159281)
+ * Use mktemp to create temporary files in scripts (closes: CVE-2008-4987)
+ * Added updated man pages from CVS to quiet lintian warnings
+ * Switch to quilt format for patches
+
+ -- Jerry Stueve <gstueve at hotmail.com> Fri, 22 Jan 2010 10:30:41 -0500
+
+xastir (1.9.4-3.1) unstable; urgency=low
+
+ * Retiring - remove myself from the uploaders list
+
+ -- Joop Stakenborg <pa3aba at debian.org> Wed, 18 Nov 2009 20:27:08 +0000
+
+xastir (1.9.4-3) unstable; urgency=low
+
+ * Make sure to delete the files created by mktemp.
+
+ -- Joop Stakenborg <pa3aba at debian.org> Mon, 24 Nov 2008 13:04:17 +0100
+
+xastir (1.9.4-2) unstable; urgency=low
+
+ * Depend on xfontsel binary (x11-utils package), both for building
+ and running.
+ * Add patch from CVS to work around unavailable xfontsel binary.
+
+ -- Joop Stakenborg <pa3aba at debian.org> Mon, 17 Nov 2008 19:22:12 +0100
+
+xastir (1.9.4-1) unstable; urgency=low
+
+ * New upstream.
+ * Suggests python because we ditribute a python script in /usr/lib/xastir.
+ * Lintian fixes.
+
+ -- Joop Stakenborg <pa3aba at debian.org> Mon, 17 Nov 2008 15:22:47 +0100
+
+xastir (1.9.2-2.1) unstable; urgency=low
+
+ * NMU to fix security bug: Actually use backticks instead of quotes for the
+ mktemp call (closes: #496383)
+
+ -- Gerfried Fuchs <rhonda at debian.at> Sun, 31 Aug 2008 17:55:56 +0200
+
+xastir (1.9.2-2) unstable; urgency=low
+
+ * Remove spaces in "TMPFILE = 'mktemp -t'", sorry about that.
+
+ -- Joop Stakenborg <pa3aba at debian.org> Thu, 28 Aug 2008 18:44:52 +0200
+
+xastir (1.9.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix attack with the help of symlinks. scripts/get-maptools.sh and
+ scripts/get_shapelib.sh now use mktemp -t. Closes: #496383.
+ * Add myself to the uploaders field.
+
+ -- Joop Stakenborg <pa3aba at debian.org> Tue, 26 Aug 2008 15:48:02 +0200
+
+xastir (1.9.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bumped standards-revision to 3.7.2.
+ * Switched build-dependency on ImageMagick to GraphicsMagick
+ (libgraphicsmagick1-dev) which is preferred by xastir at configure time.
+ * Added build-dependency on libdb-dev to enable map caching.
+ * Added build-dependency on libgeotiff-dev which can be optionally used by
+ xastir.
+ * Fixed configure-time detection of libgdal1 due to Debian's
+ unusual "libgdal1.4.0.so" naming.
+ * Removed exclusion of festival build-dep on hppa.
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 27 Jan 2008 13:50:56 +1100
+
+xastir (1.9.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Build-depend on libgdal1-dev instead of obselete libgdal1-1.3.2-dev
+ (closes: #423539)
+ * Build-depend on libcurl4-gnutls-dev instead of libcurl3-...
+ * Change maintainer to debian-hams
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 13 May 2007 22:54:44 +1000
+
+xastir (1.8.4-2) unstable; urgency=low
+
+ * Fix build-dep libgdal1-1.3.1-dev -> 1.3.2-dev again (closes: #398247)
+
+ -- Hamish Moffatt <hamish at debian.org> Mon, 13 Nov 2006 08:27:02 +1100
+
+xastir (1.8.4-1) unstable; urgency=low
+
+ * New upstream release 1.8.4
+ * Provided testawk tool in /usr/lib/xastir
+ * Updated standards-revision to 3.7.2
+ * Put watch file in correct directory this time :-|
+
+ -- Hamish Moffatt <hamish at debian.org> Sat, 11 Nov 2006 17:34:37 +1100
+
+xastir (1.8.2-2) unstable; urgency=medium
+
+ * Update build-dep on libgdal1-1.3.1-dev to -1.3.2-dev
+
+ -- Hamish Moffatt <hamish at debian.org> Tue, 24 Oct 2006 10:41:08 +1000
+
+xastir (1.8.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Added watch file to check for new upstream versions at sf.net
+ * Acknowledge fixes in NMU:
+ * Update build-deps: use libgdal-1.3.1-dev | libgdal-dev,
+ replacing old libgdal1-dev (closes: #352371)
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 2 Jul 2006 00:01:08 +1000
+
+xastir (1.8.0-1.1) unstable; urgency=medium
+
+ * NMU.
+ * Update GDAL build dependency to libgdal1-1.3.1-dev. Closes: #352371.
+
+ -- Matej Vela <vela at debian.org> Sat, 18 Feb 2006 23:23:40 +0100
+
+xastir (1.8.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Hamish Moffatt <hamish at debian.org> Tue, 17 Jan 2006 23:31:33 +1100
+
+xastir (1.7.0-2) unstable; urgency=low
+
+ * Changed build-dep on xlibs-dev to individual X libraries
+ * Fixed XASTIR path in fcc-get and get-gnis scripts (closes: #338853)
+
+ -- Hamish Moffatt <hamish at debian.org> Sat, 7 Jan 2006 01:00:30 +0000
+
+xastir (1.7.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Update build depends for libcurl3-gnutls-dev | libcurl-ssl-dev
+
+ -- Hamish Moffatt <hamish at debian.org> Mon, 24 Oct 2005 08:42:35 +1000
+
+xastir (1.6.0-2) unstable; urgency=low
+
+ * Add build-dep for libgdal1-dev back
+ * Updated libmagick build-dep to libmagick9-dev (closes: #332458)
+ with minimum version 6:6.2.4.5-0.2 to work around bugs
+
+ -- Hamish Moffatt <hamish at debian.org> Sat, 8 Oct 2005 13:45:03 +1000
+
+xastir (1.6.0-1) unstable; urgency=low
+
+ * New upstream release (closes: #317837)
+ * Fix FTBFS with gcc-4.0 (closes: #288697); thanks to Andreas Jochens
+ for the patch
+ * Added additional README files to the binary package (closes: #134452)
+ * Temporarily removed build-dep on libgdal1-dev, which is stuck waiting
+ on Qt to be migrated to the new C++ ABI
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 7 Aug 2005 18:08:09 +1000
+
+xastir (1.4.1-2) unstable; urgency=low
+
+ * Recompile with libcurl3 (closes: #279455)
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 12 Dec 2004 23:15:44 +1100
+
+xastir (1.4.1-1) unstable; urgency=medium
+
+ * New upstream release to fix a potientially nasty bug where recorded
+ log files may be injected back into the internet APRS network
+ automatically (closes: #279885)
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 7 Nov 2004 23:47:09 +1100
+
+xastir (1.4.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Added build-dep for libcurl-dev (closes: #272027)
+
+ -- Hamish Moffatt <hamish at debian.org> Sat, 2 Oct 2004 23:51:53 +1000
+
+xastir (1.3.2-2) unstable; urgency=low
+
+ * Compile with libtiff4, though we don't depend on it directly
+ * Build-depend on new imagemagick 5:6.0.3.5-2 to ensure we get libtiff4
+ (or better)
+
+ -- Hamish Moffatt <hamish at debian.org> Fri, 30 Jul 2004 00:06:47 +1000
+
+xastir (1.3.2-1) unstable; urgency=low
+
+ * New upstream release (closes: #233120)
+ * Use libmagick6 since 5.5.7 no longer available (closes: #250087)
+ * Add build-depends for proj, libgdal1-dev and libpcre3-dev to enable
+ additional XASTIR features
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 4 Jul 2004 16:48:24 +1000
+
+xastir (1.2.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 15 Jun 2003 23:03:08 +1000
+
+xastir (1.1.5.20030515-1) unstable; urgency=low
+
+ * New upstream snapshot
+ * Build with latest libmagick5.5.7
+
+ -- Hamish Moffatt <hamish at debian.org> Tue, 27 May 2003 23:47:49 +1000
+
+xastir (1.1.4.20030503-1) unstable; urgency=low
+
+ * New upstream snapshot
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 4 May 2003 12:36:51 +1000
+
+xastir (1.1.4.20030415-1) unstable; urgency=low
+
+ * New upstream snapshot
+
+ -- Hamish Moffatt <hamish at debian.org> Sat, 26 Apr 2003 14:45:48 +1000
+
+xastir (1.1.4.20030314-1) unstable; urgency=low
+
+ * New upstreamrelease
+ * Build with libmagick5.5.5
+ * Build with gpsman support
+
+ -- Hamish Moffatt <hamish at debian.org> Wed, 19 Mar 2003 21:29:31 +1100
+
+xastir (1.1.4.20030303-1) unstable; urgency=low
+
+ * New upstream release
+ * Upgrade debhelper compatibility level from 1 to 4
+
+ -- Hamish Moffatt <hamish at debian.org> Wed, 5 Mar 2003 23:34:21 +1100
+
+xastir (1.1.4.20030219-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Hamish Moffatt <hamish at debian.org> Tue, 25 Feb 2003 22:20:33 +1100
+
+xastir (1.1.3.20030202-2) unstable; urgency=low
+
+ * Recompile with libmagick5.5.4 (closes: #182049)
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 23 Feb 2003 08:39:48 +1100
+
+xastir (1.1.3.20030202-1) unstable; urgency=low
+
+ * New upstream release
+ * Built with ShapeLib support
+
+ -- Hamish Moffatt <hamish at debian.org> Wed, 19 Feb 2003 08:46:09 +1100
+
+xastir (1.1.3.20030117-1) unstable; urgency=low
+
+ * New upstream release
+ * Compile with newer libmagick
+
+ -- Hamish Moffatt <hamish at debian.org> Wed, 29 Jan 2003 23:32:05 +1100
+
+xastir (1.1.3.20021206-1) unstable; urgency=low
+
+ * New upstream snapshot.
+
+ -- Hamish Moffatt <hamish at debian.org> Sat, 14 Dec 2002 20:42:13 +1100
+
+xastir (1.1.3.20021001-1) unstable; urgency=low
+
+ * New upstream release. This is a development snapshot, packaged as
+ recommended by one of the upstream authors.
+
+ -- Hamish Moffatt <hamish at debian.org> Tue, 8 Oct 2002 21:08:36 +1000
+
+xastir (1.1.0-3) unstable; urgency=low
+
+ * Recompiled for newer libraries (closes: #163411)
+ * Removed build-dependency on festival-dev on hppa as it is not available
+ on that platform
+
+ -- Hamish Moffatt <hamish at debian.org> Mon, 7 Oct 2002 23:01:46 +1000
+
+xastir (1.1.0-2) unstable; urgency=low
+
+ * Rebuild for new liblcms library
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 21 Jul 2002 21:35:52 +1000
+
+xastir (1.1.0-1) unstable; urgency=low
+
+ * New upstream version; thanks for John Laur <johnl at blurbco.com>
+ for the patch from 1.0.0 to 1.1.0
+ * xastir is now compiled with lots of optional libraries which
+ allow more map formats to be read and other features.
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 24 Feb 2002 22:17:57 +1100
+
+xastir (1.0.0-2) unstable; urgency=low
+
+ * Fixed includes in src/interfaces.c due to changes in libax25-dev
+
+ -- Hamish Moffatt <hamish at debian.org> Wed, 19 Sep 2001 00:13:10 +1000
+
+xastir (1.0.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Hamish Moffatt <hamish at debian.org> Tue, 8 May 2001 23:43:07 +1000
+
+xastir (0.3.6a-3) unstable; urgency=low
+
+ * Added build-dep for xutils, to pick up makedepends (closes: #90236)
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 1 Apr 2001 17:10:43 +1000
+
+xastir (0.3.6a-2) unstable; urgency=low
+
+ * Fixed missing include files (closes: #87110)
+ * Updated build-deps for xlibs-dev and lesstif-dev
+
+ -- Hamish Moffatt <hamish at debian.org> Fri, 23 Feb 2001 23:30:36 +1100
+
+xastir (0.3.6a-1) unstable; urgency=low
+
+ * New upstream release
+ * Compiled with libax25 0.0.7 (closes: #74207)
+
+ -- Hamish Moffatt <hamish at debian.org> Sat, 7 Oct 2000 12:21:04 +1100
+
+xastir (0.3.3-1) unstable; urgency=low
+
+ * New upstream alpha release
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 25 Jun 2000 13:48:42 +1000
+
+xastir (0.3.0-2) unstable; urgency=low
+
+ * Updated copyright file to include upstream author info
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 16 Apr 2000 22:10:06 +1000
+
+xastir (0.3.0-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 26 Mar 2000 19:52:27 +1000
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..ed6599c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,19 @@
+Source: xastir
+Section: hamradio
+Priority: extra
+Maintainer: Debian Hams group <debian-hams at lists.debian.org>
+Uploaders: Jerry Stueve <k4int at arrl.net>, Kamal Mostafa <kamal at whence.com>, Hamish Moffatt <hamish at debian.org>, Colin Tuckley <colint at debian.org>
+Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 7), libax25-dev, libmotif-dev, libxext-dev, libxt-dev, festival-dev, libgraphicsmagick1-dev | libgraphicsmagick-dev, libshp-dev, libproj-dev, libpcre3-dev, libcurl4-gnutls-dev | libcurl-ssl-dev, libgdal-dev (>= 1.10.0-0~), libdb-dev, libgeotiff-dev, dh-autoreconf
+Homepage: http://www.xastir.org/
+Vcs-Browser: http://xastir.cvs.sourceforge.net/viewvc/xastir/xastir/
+Vcs-Cvs: :pserver:anonymous at xastir.cvs.sourceforge.net/cvsroot/xastir
+
+Package: xastir
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: wget, python, festival, gpsman, gpsmanshp, x11-utils
+Description: X Amateur Station Tracking and Information Reporting
+ Xastir is an APRS client for X. APRS is the Automatic Position Reporting
+ System, a system where objects report their position (usually obtained from
+ GPS) on the air; Xastir displays this information graphically.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..8d30996
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,79 @@
+This is the Debian GNU/Linux package of Xastir.
+
+Xastir was written by Frank Giannandrea, KC2GJS <fgiannan at earthlink.net>.
+The Debian package was initially created by Hamish Moffatt
+<hamish at debian.org> from sources obtained at:
+ http://home.earthlink.net/~fgiannan/xastir/files/
+
+The current source location is
+ http://www.sourceforge.net/projects/xastir/
+
+A copy of the GNU General Public License is available as
+/usr/share/common-licenses/GPL in the Debian GNU/Linux distribution.
+
+From the LICENSE file in the source package:
+
+
+1) The majority of the Xastir source code is under the GPL license.
+See the file named "COPYING" for details.
+
+
+2) Some of the programs in the scripts directory may contain other
+licensing information. See the individual files for details.
+
+
+3) datum.h and datum.c were derived from public domain source code.
+The name and copyright are listed in that file.
+
+
+4) rotated.h and rotated.c are available under the following license:
+
+/* xvertext 5.0, Copyright (c) 1993 Alan Richardson (mppa3 at uk.ac.sussex.syma)
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both the
+ * copyright notice and this permission notice appear in supporting
+ * documentation. All work developed as a consequence of the use of
+ * this program should duly acknowledge such use. No representations are
+ * made about the suitability of this software for any purpose. It is
+ * provided "as is" without express or implied warranty.
+ */
+
+
+5) festival.h and festival.c are available under the following license:
+
+/*************************************************************************/
+/* */
+/* Centre for Speech Technology Research */
+/* University of Edinburgh, UK */
+/* Copyright (c) 1999 */
+/* All Rights Reserved. */
+/* */
+/* Permission is hereby granted, free of charge, to use and distribute */
+/* this software and its documentation without restriction, including */
+/* without limitation the rights to use, copy, modify, merge, publish, */
+/* distribute, sublicense, and/or sell copies of this work, and to */
+/* permit persons to whom this work is furnished to do so, subject to */
+/* the following conditions: */
+/* 1. The code must retain the above copyright notice, this list of */
+/* conditions and the following disclaimer. */
+/* 2. Any modifications must be clearly marked as such. */
+/* 3. Original authors' names are not deleted. */
+/* 4. The authors' names are not used to endorse or promote products */
+/* derived from this software without specific prior written */
+/* permission. */
+/* */
+/* THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK */
+/* DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING */
+/* ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT */
+/* SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE */
+/* FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES */
+/* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN */
+/* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, */
+/* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF */
+/* THIS SOFTWARE. */
+/* */
+/*************************************************************************/
+
+
diff --git a/debian/patches/OSM_config.patch b/debian/patches/OSM_config.patch
new file mode 100644
index 0000000..53bd46a
--- /dev/null
+++ b/debian/patches/OSM_config.patch
@@ -0,0 +1,652 @@
+Description: Upstream changes introduced in version 2.0.0-1
+ Update entries to support additional OSM map types.
+
+Origin: upstream
+--- /dev/null
++++ xastir-2.0.0/OSM_tiled_osmarender.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++#OSMSTATICMAP-osmarender
++# or
++OSM_TILED_MAP-osmarender
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++URL http://tah.openstreetmap.org/Tiles/tile/
++
++# Tile extension defaults to png
++#TILE_EXT png
++
++#ZOOM_LEVEL_MIN 0
++#ZOOM_LEVEL_MAX 18
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
+--- /dev/null
++++ xastir-2.0.0/OSM_tiled_topOSM_0_relief.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++#OSMSTATICMAP-topOSMr
++# or
++OSM_TILED_MAP-topOSMr
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++URL http://tile1.toposm.com/usw/color-relief/
++
++# Tile extension defaults to png
++TILE_EXT jpg
++
++ZOOM_LEVEL_MIN 5
++ZOOM_LEVEL_MAX 15
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
+--- /dev/null
++++ xastir-2.0.0/OSM_tiled_topOSM_2_features.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++#OSMSTATICMAP-topOSMf
++# or
++OSM_TILED_MAP-topOSMf
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++URL http://tile1.toposm.com/usw/features/
++
++# Tile extension defaults to png
++#TILE_EXT png
++
++ZOOM_LEVEL_MIN 5
++ZOOM_LEVEL_MAX 15
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
+--- /dev/null
++++ xastir-2.0.0/OSM_cloudmade_1.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++OSMSTATICMAP-layer=cloudmade_1
++# or
++#OSM_TILED_MAP-layer=cloudmade_1
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++#URL tileURL
++
++# Tile extension defaults to png
++#TILE_EXT png
++
++#ZOOM_LEVEL_MIN 0
++#ZOOM_LEVEL_MAX 18
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
+--- /dev/null
++++ xastir-2.0.0/OSM_cloudmade_5.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++OSMSTATICMAP-layer=cloudmade_5
++# or
++#OSM_TILED_MAP-layer=cloudmade_5
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++#URL tileURL
++
++# Tile extension defaults to png
++#TILE_EXT png
++
++#ZOOM_LEVEL_MIN 0
++#ZOOM_LEVEL_MAX 18
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
+--- /dev/null
++++ xastir-2.0.0/OSM_cloudmade_998.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++OSMSTATICMAP-layer=cloudmade_998
++# or
++#OSM_TILED_MAP-layer=cloudmade_998
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++#URL tileURL
++
++# Tile extension defaults to png
++#TILE_EXT png
++
++#ZOOM_LEVEL_MIN 0
++#ZOOM_LEVEL_MAX 18
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
+--- /dev/null
++++ xastir-2.0.0/OSM_tiled_mapnik.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++#OSMSTATICMAP-mapnik
++# or
++OSM_TILED_MAP-mapnik
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++URL http://tile.openstreetmap.org/
++
++# Tile extension defaults to png
++#TILE_EXT png
++
++#ZOOM_LEVEL_MIN 0
++#ZOOM_LEVEL_MAX 18
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
+--- /dev/null
++++ xastir-2.0.0/OSM_tiled_topOSM_1_contour.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++#OSMSTATICMAP-topOSMc
++# or
++OSM_TILED_MAP-topOSMc
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++URL http://tile1.toposm.com/usw/contours/
++
++# Tile extension defaults to png
++#TILE_EXT png
++
++ZOOM_LEVEL_MIN 5
++ZOOM_LEVEL_MAX 15
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
+--- /dev/null
++++ xastir-2.0.0/OSM_tiled_skiing.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++#OSMSTATICMAP-skiing
++# or
++OSM_TILED_MAP-skiing
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++URL http://tiles.openpistemap.org/contours/
++
++# Tile extension defaults to png
++#TILE_EXT png
++
++#ZOOM_LEVEL_MIN 0
++#ZOOM_LEVEL_MAX 18
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
+--- /dev/null
++++ xastir-2.0.0/OSM_cloudmade_999.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++#OSMSTATICMAP-layer=cloudmade_999
++# or
++#OSM_TILED_MAP-layer=cloudmade_999
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++#URL tileURL
++
++# Tile extension defaults to png
++#TILE_EXT png
++
++#ZOOM_LEVEL_MIN 0
++#ZOOM_LEVEL_MAX 18
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
+--- /dev/null
++++ xastir-2.0.0/OSM_cloudmade_2.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++OSMSTATICMAP-layer=cloudmade_2
++# or
++#OSM_TILED_MAP-layer=cloudmade_2
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++#URL tileURL
++
++# Tile extension defaults to png
++#TILE_EXT png
++
++#ZOOM_LEVEL_MIN 0
++#ZOOM_LEVEL_MAX 18
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
+--- /dev/null
++++ xastir-2.0.0/OSM_tiled_cycle.geo
+@@ -0,0 +1,51 @@
++#
++# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
++#
++#
++# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
++# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
++#
++# The string following OSMSTATICMAP-, is appended to the URL
++# The string is typically expected to select a layer, and possibly style
++# options. If not set it defaults to:
++# layer=osmarander
++#
++# The string following OSM_TILED_MAP-, is the name of a sub-directory in
++# the tile cache. It can be empty (delete the '-' too), though that is a
++# bad idea if multiple map styles are using the same TILE_DIR.
++#
++# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
++#
++#
++#OSMSTATICMAP-cycle
++# or
++OSM_TILED_MAP-cycle
++#
++# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
++# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
++URL http://andy.sandbox.cloudmade.com/tiles/cycle/
++
++# Tile extension defaults to png
++#TILE_EXT png
++
++#ZOOM_LEVEL_MIN 0
++#ZOOM_LEVEL_MAX 18
++
++# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
++# setting the following variable. If path does not begin with a '/' then
++# it will be relative to ~/.xastir/.
++#
++#TILE_DIR OSMtiles
++
++
++# When defined:
++# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
++# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
++# and OSM zoom level, but only for debug level 512 (-v 512)
++#
++# The values are X KeySym values.
++# 65473 = F4
++# 65474 = F5
++OSM_OPTIMIZE_KEY 65473
++OSM_REPORT_SCALE_KEY 65474
++
diff --git a/debian/patches/geotiff_directory.patch b/debian/patches/geotiff_directory.patch
new file mode 100644
index 0000000..8ae520d
--- /dev/null
+++ b/debian/patches/geotiff_directory.patch
@@ -0,0 +1,23 @@
+Debian put geotiff headers into subdirectory
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -37,6 +37,8 @@
+ [
+ AC_MSG_CHECKING([for search paths])
+
++test -d /usr/include/geotiff && CPPFLAGS="-I/usr/include/geotiff $CPPFLAGS"
++
+ test -d /usr/local/include && CPPFLAGS="-I/usr/local/include $CPPFLAGS"
+ test -d /usr/local/lib && LDFLAGS="-L/usr/local/lib $LDFLAGS"
+
+--- a/configure
++++ b/configure
+@@ -5457,6 +5457,8 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for search paths" >&5
+ $as_echo_n "checking for search paths... " >&6; }
+
++test -d /usr/include/geotiff && CPPFLAGS="-I/usr/include/geotiff $CPPFLAGS"
++
+ test -d /usr/local/include && CPPFLAGS="-I/usr/local/include $CPPFLAGS"
+ test -d /usr/local/lib && LDFLAGS="-L/usr/local/lib $LDFLAGS"
+
diff --git a/debian/patches/link.patch b/debian/patches/link.patch
new file mode 100644
index 0000000..2a60e3f
--- /dev/null
+++ b/debian/patches/link.patch
@@ -0,0 +1,31 @@
+Remove manual linking to allow dh_link for debian packaging.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -75,9 +75,9 @@
+ -rm -rf $(DESTDIR)${pkgdatadir}/doc
+
+ install-data-hook:
+- cd $(DESTDIR)$(mapdir) && \
+- rm -f CC_OpenStreetMap.png && \
+- $(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png
++ echo cd $(DESTDIR)$(mapdir) && \
++ echo rm -f CC_OpenStreetMap.png && \
++ echo $(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png
+
+ mandir=${prefix}/share/man
+ man_MANS=xastir.1 callpass.1 xastir_udp_client.1 testdbfawk.1
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1052,9 +1052,9 @@
+ -rm -rf $(DESTDIR)${pkgdatadir}/doc
+
+ install-data-hook:
+- cd $(DESTDIR)$(mapdir) && \
+- rm -f CC_OpenStreetMap.png && \
+- $(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png
++ echo cd $(DESTDIR)$(mapdir) && \
++ 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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c3bf2aa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+geotiff_directory.patch
+link.patch
+OSM_config.patch
+simple_db.patch
diff --git a/debian/patches/simple_db.patch b/debian/patches/simple_db.patch
new file mode 100644
index 0000000..ab54650
--- /dev/null
+++ b/debian/patches/simple_db.patch
@@ -0,0 +1,12 @@
+Description: Move simple db entry to front of list to use as default.
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1014,7 +1014,7 @@
+ # to specify the function call with the full prototype for it to be found.
+ BDB_LIB_FOUND="none"
+ AC_MSG_CHECKING([for a library containing db_create])
+- for dbname in db-4.9 db4.9 db49 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++ for dbname in db db-4.9 db4.9 db49 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ AC_TRY_LINK(
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..65af2eb
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,60 @@
+#!/usr/bin/make -f
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp:
+
+ dh_testdir
+ dh_autoreconf
+ touch aclocal.m4
+ touch Makefile.in */Makefile.in */*/Makefile.in
+ touch config.h.in
+ touch configure
+ CFLAGS="-I/usr/include/geotiff $(shell GraphicsMagick-config --cflags)" ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
+ $(MAKE)
+ touch build
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_autoreconf_clean
+ -rm -f build
+ -rm -f build-stamp
+ [ ! -f Makefile ] || $(MAKE) distclean
+ -rm -f src/callpass/Makefile
+ -rm -f config.log config.cache summary.log
+ dh_clean
+
+binary-indep: build
+# nothing else to do
+
+binary-arch: build
+ dh_clean
+ dh_installdirs
+ CFLAGS=-I/usr/include/geotiff $(MAKE) install DESTDIR=`pwd`/debian/xastir
+ cp src/testdbfawk debian/xastir/usr/lib/xastir
+ rm -f debian/xastir/usr/share/doc/xastir/*
+
+ dh_installdocs AUTHORS README README.MAPS README.Contributing README.CVS README.Getting-Started FAQ NEWS UPGRADE
+ dh_installmenu
+ dh_installchangelogs ChangeLog
+ dh_installman
+ dh_strip
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+
+checkroot:
+ dh_testdir
+ dh_testroot
+
+.PHONY: binary binary-arch binary-indep clean checkroot
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..46ebe02
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..55ba987
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/xastir/xastir-(.*)\.tar\.gz
diff --git a/debian/xastir.dirs b/debian/xastir.dirs
new file mode 100644
index 0000000..04bc324
--- /dev/null
+++ b/debian/xastir.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/share/menu
+usr/share/doc/xastir
+usr/lib/xastir
diff --git a/debian/xastir.links b/debian/xastir.links
new file mode 100644
index 0000000..ad01da0
--- /dev/null
+++ b/debian/xastir.links
@@ -0,0 +1 @@
+usr/share/xastir/maps/CC_OpenStreetMap_logo.png usr/share/xastir/maps/CC_OpenStreetMap.png
diff --git a/debian/xastir.menu b/debian/xastir.menu
new file mode 100644
index 0000000..9f4f710
--- /dev/null
+++ b/debian/xastir.menu
@@ -0,0 +1,12 @@
+?package(xastir):needs="X11" section="Applications/Amateur Radio" \
+ title="xastir" longtitle="Xastir" \
+ description="APRS client for X11" \
+ command="/usr/bin/xastir"
+?package(xastir):needs="text" section="Applications/Amateur Radio" \
+ title="xastir_udp_client" longtitle="Xastir_UDP_Client" \
+ description="Client to send data to APRS network" \
+ command="/usr/bin/xastir_udp_client"
+?package(xastir):needs="text" section="Applications/Amateur Radio" \
+ title="testdbfawk" longtitle="testdbfawk" \
+ description="Utility to check dbfawk translation" \
+ command="/usr/bin/testdbfawk"
--
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