--- agtl-0.4.2.orig/debian/control +++ agtl-0.4.2/debian/control @@ -0,0 +1,22 @@ +Source: agtl +Section: python +Priority: extra +Maintainer: Heiko Stuebner +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.49), python2.5-dev (>= 2.3.5-11), python-support (>= 0.5.3), python-setuptools, cython +Standards-Version: 3.8.3 +Homepage: http://wiki.openmoko.org/wiki/Advanced_Geocaching_Tool_for_Linux +Vcs-git: git://git.debian.org/pkg-fso/advancedcaching.git + +Package: agtl +XB-Python-Version: ${python:Versions} +Provides: ${python:Provides} +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2, python-simplejson +Description: Tool for paperless geocaching + AGTL downloads cache locations in the area visible on the map + including their description, hints, difficulty levels and images. + Searching for caches in your local db is a matter of seconds. + The currently selected cache is shown on the map (and also all + the others if you want) and there's a traditional compass-like + view that always points at the cache. --- agtl-0.4.2.orig/debian/rules +++ agtl-0.4.2/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM=pysupport +DEB_SRCDIR=$(CURDIR)/files + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +binary-install/agtl:: + dh_installman $(CURDIR)/debian/agtl.1 + cp $(CURDIR)/files/advancedcaching.png $(CURDIR)/debian/agtl/usr/share/pixmaps/ + cp $(CURDIR)/files/advancedcaching.desktop $(CURDIR)/debian/agtl/usr/share/applications/ --- agtl-0.4.2.orig/debian/dirs +++ agtl-0.4.2/debian/dirs @@ -0,0 +1,2 @@ +usr/share/pixmaps +usr/share/applications --- agtl-0.4.2.orig/debian/agtl.1 +++ agtl-0.4.2/debian/agtl.1 @@ -0,0 +1,16 @@ +.TH AGTL 1 +.SH NAME +agtl \- tool for paperless geocaching +.SH SYNOPSIS +.B agtl +[ --simple ] [ --desktop ] +.SH DESCRIPTION +.IR Agtl +is used while geocaching to circumvent the need to have paper and pencils at hand. +.SH OPTIONS +.TP +.B --simple +Start with an user interface optimised for small displays e.g. smartphones. +.TP +.B --desktop +Start with a user interface for a desktop environment. This implementation is unfinished --- agtl-0.4.2.orig/debian/agtl.menu +++ agtl-0.4.2/debian/agtl.menu @@ -0,0 +1,4 @@ +?package(agtl):needs="X11" section="Applications/Network/Communication"\ + title="agtl" longtitle="Advanced Geocaching Application"\ + description="Agtl is a tool for paperless geocaching. It uses maps from Openstreetmap."\ + command="/usr/bin/agtl --simple" --- agtl-0.4.2.orig/debian/changelog +++ agtl-0.4.2/debian/changelog @@ -0,0 +1,28 @@ +agtl (0.4.2-1) unstable; urgency=low + + * new upstream-release + + -- Heiko Stuebner Sat, 07 Nov 2009 22:33:19 +0100 + +agtl (0.4.0+git20091011-1) unstable; urgency=low + + * new upstream-snapshot + * patches updated accordingly + * incorporated Steffen Moellers fixes to files in debian/ + + -- Heiko Stuebner Sat, 17 Oct 2009 15:07:19 +0200 + +agtl (0.3.0+git20090911-1) unstable; urgency=low + + * upload to unstable (Closes: #546220) + * added README.Debian + * added agtl.menu + * new upstream-snapshot + + -- Heiko Stuebner Fri, 11 Sep 2009 20:39:19 +0200 + +agtl (0.2.0+git20090909-1) UNRELEASED; urgency=low + + * Initial release + + -- Heiko Stuebner Wed, 09 Sep 2009 20:52:19 +0200 --- agtl-0.4.2.orig/debian/gbp.conf +++ agtl-0.4.2/debian/gbp.conf @@ -0,0 +1,53 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +# the default build command: +#builder = debuild -i\.git/ -I.git +# the default clean command: +#cleaner = debuild clean +# the default branch for upstream sources: +upstream-branch = master +# the default branch for the debian patch: +debian-branch = debian +# the default tag formats used: +#upstream-tag = upstream/%(version)s +#debian-tag = debian/%(version)s +# use pristine-tar: +pristine-tar = True + +# Options only affecting git-buildpackage +[git-buildpackage] +#upstream-branch = dfsgclean +# uncomment this to automatically GPG sign tags +#sign-tags = True +# keyid to GPG sign tags with +#keyid = 0xdeadbeef +# push to a remote repository after a successful tag: +#posttag = git-push git.example.com +# use this for more svn-buildpackage like behaviour: +#export-dir = ../build-area/ +#tarball-dir = ../tarballs/ +#ignore-new = True + +# Options only affecting git-import-orig +[git-import-orig] +#upstream-branch = newupstream +#debian-branch = dfsgclean +#filter = .svn + +# Options only affecting git-import-dsc +[git-import-dsc] +#upstream-branch = svn-upstream +#filter = [ 'CVS', '.cvsignore' ] + +# Options only affecting git-dch +[git-dch] +#git-log = --no-merges +#snapshot-number = snapshot + 1 +# include 0 digits of the commit id in the changelog enty +#id-length = 0 +# don't include information from meta tags +#meta = False +# what tags to look for to generate bug-closing changelog entries +#meta-closes = Closes|LP + --- agtl-0.4.2.orig/debian/copyright +++ agtl-0.4.2/debian/copyright @@ -0,0 +1,52 @@ +This package was debianized by Heiko Stuebner on +Tue, 053 May 2009 23:06:29 +0200. + +The source code was downloaded from: http://github.com/webhamster/advancedcaching + +Upstream Author: + Daniel Fett + +Copyright: + Copyright (C) 2009 Daniel Fett + +License: + agtl is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + agtl is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with python-elementary. If not, see . + + On Debian GNU/Linux systems, the complete text of the GNU General + Public License version 3 is in `/usr/share/common-licenses/GPL-3'. + + +agtl is using files/advancedcaching/extListview.py by Ingelrest François +under the following terms: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + On Debian GNU/Linux systems, the complete text of the GNU General + Public License version 2 is in `/usr/share/common-licenses/GPL-2'. + + +The Debian packaging is copyright 2009, Heiko Stuebner and +is licensed under the GPL version 2, see `/usr/share/common-licenses/GPL-2'. --- agtl-0.4.2.orig/debian/pyversions +++ agtl-0.4.2/debian/pyversions @@ -0,0 +1 @@ +2.5 --- agtl-0.4.2.orig/debian/README.Debian +++ agtl-0.4.2/debian/README.Debian @@ -0,0 +1,18 @@ +agtl for Debian +--------------- + +* map tiles: + +agtl downloads openstreetmap map tiles and saves them in the folder +specified under "opts". +The folder-default is ~/Maps/OSM, the same tangogps uses. +Currently this folder is not created by agtl resulting in a black +map-area when it does not exist. + +* cache-data + +downloaded cache-details are saved in a second directory which defaults +to ~/caches but may be specified in the opts-tab (default is ~/caches). +This directory is created by agtl. + + -- Heiko Stuebner , Fri, 11 Sep 2009 20:16:05 +0200 --- agtl-0.4.2.orig/debian/pycompat +++ agtl-0.4.2/debian/pycompat @@ -0,0 +1 @@ +2 --- agtl-0.4.2.orig/debian/compat +++ agtl-0.4.2/debian/compat @@ -0,0 +1 @@ +5 --- agtl-0.4.2.orig/debian/patches/0001-change-Exception-as-to-Exception-for-python2.5-compa.patch +++ agtl-0.4.2/debian/patches/0001-change-Exception-as-to-Exception-for-python2.5-compa.patch @@ -0,0 +1,185 @@ +From dfc4aa67abcbc87b8d24bda696d22fe823a5687f Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Sun, 11 Oct 2009 22:14:23 +0200 +Subject: [PATCH] python2.5 exception compatibility + +--- + files/advancedcaching/cli.py | 8 ++++---- + files/advancedcaching/core.py | 12 ++++++------ + files/advancedcaching/downloader.py | 2 +- + files/advancedcaching/geocaching.py | 2 +- + files/advancedcaching/gpsreader.py | 2 +- + files/advancedcaching/openstreetmap.py | 4 ++-- + files/advancedcaching/simplegui.py | 2 +- + 7 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/files/advancedcaching/cli.py b/files/advancedcaching/cli.py +index 42ed4f4..7d909d6 100644 +--- a/files/advancedcaching/cli.py ++++ b/files/advancedcaching/cli.py +@@ -65,13 +65,13 @@ class Cli(): + + try: + self.parse_input() +- except ParseError as e: ++ except ParseError, e: + if e.token == None: + print "# Parse Error at token '%s': " % sys.argv[self.nt - 1] + else: + print "# Parse Error after Token '%s':" % sys.argv[e.token] + print "# %s" % e.msg +- except RunError as e: ++ except RunError, e: + print "# Execution Error at token '%s': " % sys.argv[self.nt - 1] + print "# %s" % e.msg + +@@ -254,12 +254,12 @@ class Cli(): + query = text[2:] + try: + c = self.core.get_coord_by_name(query) +- except Exception as e: ++ except Exception, e: + raise ParseError(e) + else: + try: + c = geo.try_parse_coordinate(text) +- except Exception as e: ++ except Exception, e: + raise ParseError(e) + + return c +diff --git a/files/advancedcaching/core.py b/files/advancedcaching/core.py +index 8b1a92a..c2275a2 100755 +--- a/files/advancedcaching/core.py ++++ b/files/advancedcaching/core.py +@@ -174,7 +174,7 @@ class Standbypreventer(): + def __try_run(self, command): + try: + os.system(command) +- except Exception as e: ++ except Exception, e: + print "Could not prevent Standby: %s" % e + + class Core(): +@@ -282,7 +282,7 @@ class Core(): + cd = geocaching.CacheDownloader(self.downloader, self.settings['download_output_dir'], not self.settings['download_noimages']) + try: + caches = cd.get_geocaches(location) +- except Exception as e: ++ except Exception, e: + self.gui.show_error(e) + print e + return [] +@@ -307,7 +307,7 @@ class Core(): + full = cd.update_coordinate(cache) + self.pointprovider.add_point(full, True) + self.pointprovider.save() +- except Exception as e: ++ except Exception, e: + self.gui.show_error(e) + return cache + finally: +@@ -319,7 +319,7 @@ class Core(): + try: + exporter = geocaching.HTMLExporter(self.downloader, self.settings['download_output_dir']) + exporter.export(cache, folder) +- except Exception as e: ++ except Exception, e: + self.gui.show_error(e) + finally: + self.gui.hide_progress() +@@ -366,7 +366,7 @@ class Core(): + #exporter.export(full) + i += 1.0 + +- except Exception as e: ++ except Exception, e: + self.gui.show_error(e) + finally: + self.gui.hide_progress() +@@ -405,7 +405,7 @@ class Core(): + fn.add_fieldnote(c) + fn.upload() + +- except Exception as e: ++ except Exception, e: + self.gui.show_error(e) + else: + #self.gui.show_success("Field notes uploaded successfully.") +diff --git a/files/advancedcaching/downloader.py b/files/advancedcaching/downloader.py +index c2a9eb1..caba4ac 100644 +--- a/files/advancedcaching/downloader.py ++++ b/files/advancedcaching/downloader.py +@@ -88,7 +88,7 @@ class FileDownloader(): + self.logged_in = True + try: + cj.save() +- except Exception as e: ++ except Exception, e: + print "+ Could not save cookies:", e + + +diff --git a/files/advancedcaching/geocaching.py b/files/advancedcaching/geocaching.py +index 25373e7..61cd2d5 100644 +--- a/files/advancedcaching/geocaching.py ++++ b/files/advancedcaching/geocaching.py +@@ -325,7 +325,7 @@ class CacheDownloader(): + im = Image.open(filename) + im.thumbnail((self.resize, self.resize), Image.ANTIALIAS) + im.save(filename) +- except Exception as e: ++ except Exception, e: + print "could not download %s: %s" % (url, e) + return None + +diff --git a/files/advancedcaching/gpsreader.py b/files/advancedcaching/gpsreader.py +index 1c385ac..a77fba1 100644 +--- a/files/advancedcaching/gpsreader.py ++++ b/files/advancedcaching/gpsreader.py +@@ -168,7 +168,7 @@ class GpsReader(): + quality = quality, + error = err_hor + ) +- except Exception as e: ++ except Exception, e: + print "Fehler beim Auslesen der Daten: %s " % e + return self.EMPTY + +diff --git a/files/advancedcaching/openstreetmap.py b/files/advancedcaching/openstreetmap.py +index 215a9cb..df2a1bd 100644 +--- a/files/advancedcaching/openstreetmap.py ++++ b/files/advancedcaching/openstreetmap.py +@@ -103,7 +103,7 @@ class TileLoader(threading.Thread): + if self.pbuf.get_width() < self.gui.ts.tile_size() or self.pbuf.get_height() < self.gui.ts.tile_size(): + raise Exception("Image too small, probably corrupted file") + return True +- except Exception as e: ++ except Exception, e: + if tryno == 0: + return self.recover() + else: +@@ -180,7 +180,7 @@ class TileLoader(threading.Thread): + print "File not found: %s" % remote + return False + return True +- except Exception as e: ++ except Exception, e: + print "Download Error", e + return False + finally: +diff --git a/files/advancedcaching/simplegui.py b/files/advancedcaching/simplegui.py +index e03978f..2419fb1 100644 +--- a/files/advancedcaching/simplegui.py ++++ b/files/advancedcaching/simplegui.py +@@ -1282,7 +1282,7 @@ class SimpleGui(object): + + self.image_cache_caption.set_text("%d %s" % (self.image_no, caption)) + self.image_cache_caption.set_use_markup(True) +- except Exception as e: ++ except Exception, e: + print "Error loading image: %s" % e + + +-- +1.6.3.3 + --- agtl-0.4.2.orig/debian/patches/0004-remove-unkown-key-from-desktop.patch +++ agtl-0.4.2/debian/patches/0004-remove-unkown-key-from-desktop.patch @@ -0,0 +1,24 @@ +From 00365cfb4e26b4e9da6d67f2c95fdd78e21b3c45 Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Thu, 10 Sep 2009 00:01:14 +0200 +Subject: [PATCH] remove unknown key from .desktop + +--- + files/advancedcaching.desktop | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/files/advancedcaching.desktop b/files/advancedcaching.desktop +index 6fdfaae..49ca176 100644 +--- a/files/advancedcaching.desktop ++++ b/files/advancedcaching.desktop +@@ -9,7 +9,6 @@ Exec=agtl --simple + Icon=advancedcaching + Terminal=false + Categories=Office; +-SingleInstance=true + StartupNotify=true + Comment[de_DE.UTF-8]=An Advanced Linux Geocaching tool + Name[de_DE]=advancedcaching.desktop +-- +1.6.3.3 + --- agtl-0.4.2.orig/debian/patches/0002-change-json-module-to-the-python2.5-equivalent-simpl.patch +++ agtl-0.4.2/debian/patches/0002-change-json-module-to-the-python2.5-equivalent-simpl.patch @@ -0,0 +1,98 @@ +From 85fb556f6e8e9d5fd6aec48475666e65a5d961e1 Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Sun, 11 Oct 2009 22:20:33 +0200 +Subject: [PATCH] simplejson + +--- + files/advancedcaching/core.py | 6 +++--- + files/advancedcaching/geocaching.py | 14 +++++++------- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/files/advancedcaching/core.py b/files/advancedcaching/core.py +index 8b1a92a..83852b0 100755 +--- a/files/advancedcaching/core.py ++++ b/files/advancedcaching/core.py +@@ -113,7 +113,7 @@ Just start the string with 'q:': + + + +-import json ++import simplejson + import sys + + import downloader +@@ -431,7 +431,7 @@ class Core(): + string = f.read() + self.settings = {} + if string != '': +- tmp_settings = json.loads(string) ++ tmp_settings = simplejson.loads(string) + for k, v in self.DEFAULT_SETTINGS.items(): + if k in tmp_settings.keys() != None: + self.settings[k] = tmp_settings[k] +@@ -453,7 +453,7 @@ class Core(): + def __write_config(self): + filename = os.path.join(self.SETTINGS_DIR, 'config') + f = file(filename, 'w') +- f.write(json.dumps(self.settings, sort_keys=True, indent=4)) ++ f.write(simplejson.dumps(self.settings, sort_keys=True, indent=4)) + + + def determine_path (): +diff --git a/files/advancedcaching/geocaching.py b/files/advancedcaching/geocaching.py +index 25373e7..e882baa 100644 +--- a/files/advancedcaching/geocaching.py ++++ b/files/advancedcaching/geocaching.py +@@ -18,7 +18,7 @@ + # Author: Daniel Fett advancedcaching@fragcom.de + # + +-import json ++import simplejson + + import geo + import os +@@ -143,18 +143,18 @@ class GeocacheCoordinate(geo.Coordinate): + def get_waypoints(self): + if self.waypoints == None or self.waypoints == '': + return [] +- return json.loads(self.waypoints) ++ return simplejson.loads(self.waypoints) + + def get_images(self): + if self.images == None or self.images == '': + return [] +- return json.loads(self.images) ++ return simplejson.loads(self.images) + + def set_waypoints(self, wps): +- self.waypoints = json.dumps(wps) ++ self.waypoints = simplejson.dumps(wps) + + def set_images(self, imgs): +- self.images = json.dumps(imgs) ++ self.images = simplejson.dumps(imgs) + + + def was_downloaded(self): +@@ -393,7 +393,7 @@ class CacheDownloader(): + if match == None: + raise Exception('Seite konnte nicht abgerufen werden') + text = match.group(1).replace("\\'", "'") +- a = json.loads(text.replace('\t', ' ')) ++ a = simplejson.loads(text.replace('\t', ' ')) + points = [] + + if not 'cc' in a['cs'].keys(): +@@ -553,7 +553,7 @@ class HTMLExporter(): + + def write_index(self, caches): + b = [{'n': c.name, 't': c.title} for c in caches] +- caches = json.dumps(b) ++ caches = simplejson.dumps(b) + f = open(os.path.join(self.path, "index.html"), 'w') + f.write('') +-- +1.6.3.3 + --- agtl-0.4.2.orig/debian/patches/0003-set-shebang-to-python2.5.patch +++ agtl-0.4.2/debian/patches/0003-set-shebang-to-python2.5.patch @@ -0,0 +1,22 @@ +From 96e3065d2b9ec2393fa18a3b42d7a6810a6ae15e Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Fri, 11 Sep 2009 19:48:59 +0200 +Subject: [PATCH] set shebang to python2.5 + +--- + files/agtl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/files/agtl b/files/agtl +index 32fc673..990763d 100755 +--- a/files/agtl ++++ b/files/agtl +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2.5 + import advancedcaching.core + + advancedcaching.core.start () +-- +1.6.3.3 +