Hi all, I've volunteered to help out with the foxtrotgps package in Debian and I noticed a few minor issues that can be fixed with the attached patches. I'm cloning the bzr repository using git so I hope the patches are compatible with the bzr way of doing things.
-- bye, pabs http://bonedaddy.net/pabs3/
From 582ca3b7255524375c1924810cbcb00eac876f8a Mon Sep 17 00:00:00 2001 From: Paul Wise <pa...@bonedaddy.net> Date: Mon, 8 Apr 2013 14:00:58 +0800 Subject: [PATCH 1/4] Fix typo --- src/geo_photos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/geo_photos.c b/src/geo_photos.c index ed25fdc..b145ffe 100644 --- a/src/geo_photos.c +++ b/src/geo_photos.c @@ -972,7 +972,7 @@ command = g_strdup( "}\n" "\n" "\n" -"#=========== END MAIN FUCTIONS, START HELPER FUNCTIONS ===========\n" +"#=========== END MAIN FUNCTIONS, START HELPER FUNCTIONS ===========\n" "\n" "\n" "sub do_convert2gpx\n" -- 1.8.2
From 1f3ee69efc68dce462970bee4778d8d6f8117f85 Mon Sep 17 00:00:00 2001 From: Paul Wise <pa...@bonedaddy.net> Date: Mon, 8 Apr 2013 14:19:49 +0800 Subject: [PATCH 2/4] Drop obsolete Encoding field from the FreeDesktop menu file --- data/foxtrotgps.desktop.in | 1 - 1 file changed, 1 deletion(-) diff --git a/data/foxtrotgps.desktop.in b/data/foxtrotgps.desktop.in index c4f1131..4adf384 100644 --- a/data/foxtrotgps.desktop.in +++ b/data/foxtrotgps.desktop.in @@ -2,7 +2,6 @@ _Name=FoxtrotGPS _GenericName=GPS and Map _Comment=Display map and GPS position -Encoding=UTF-8 Version=1.0 Type=Application Exec=foxtrotgps -- 1.8.2
From c4b1ca586973c60d18930dc57e80dc898f696a98 Mon Sep 17 00:00:00 2001
From: Paul Wise <pa...@bonedaddy.net>
Date: Mon, 8 Apr 2013 14:20:31 +0800
Subject: [PATCH 3/4] Delete the mkinstalldirs file from the VCS since it is
from autotools.
---
mkinstalldirs | 111 ----------------------------------------------------------
1 file changed, 111 deletions(-)
delete mode 100755 mkinstalldirs
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index d2d5f21..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <fried...@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage" 1>&2
- exit 0
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-case $dirmode in
- '')
- if mkdir -p -- . 2>/dev/null; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- fi
- ;;
-esac
-
-for file
-do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
-
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=""
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
- fi
- fi
-
- pathcomp="$pathcomp/"
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here
--
1.8.2
From 945d78c52a1acbcd46e16152676226a3ec613be0 Mon Sep 17 00:00:00 2001 From: Paul Wise <pa...@bonedaddy.net> Date: Mon, 8 Apr 2013 14:14:03 +0800 Subject: [PATCH 4/4] Add some keywords to the FreeDesktop menu file --- data/foxtrotgps.desktop.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/foxtrotgps.desktop.in b/data/foxtrotgps.desktop.in index 4adf384..8c0cd79 100644 --- a/data/foxtrotgps.desktop.in +++ b/data/foxtrotgps.desktop.in @@ -2,6 +2,7 @@ _Name=FoxtrotGPS _GenericName=GPS and Map _Comment=Display map and GPS position +_Keywords=OpenStreetMap;OSM;Track;Trip;map;location; Version=1.0 Type=Application Exec=foxtrotgps -- 1.8.2
signature.asc
Description: This is a digitally signed message part
_______________________________________________ This message is sent to you from FOSS-GPS@lists.osgeo.org mailing list. Visit http://lists.osgeo.org/mailman/listinfo/foss-gps to manage your subscription For more information, check http://wiki.osgeo.org/wiki/FOSS-GPS
