Package: foxtrotgps
Version: 0.99.4+debian3-3
Severity: minor
Tags: patch upstream
Hi,
I'm not sure if 'metrical' is considered correct English in en_US, but it seems
very strange here in en_AU. The attached patch should fix this in the source,
the po files would still need changing though.
(The patch is my testing patch, feel free to drop my changelog change when
applying it).
kk
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686-bigmem (SMP w/2 CPU cores)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages foxtrotgps depends on:
ii libatk1.0-0 1.30.0-1 The ATK accessibility toolkit
ii libc6 2.11.2-7 Embedded GNU C Library: Shared lib
ii libcairo2 1.8.10-6 The Cairo 2D vector graphics libra
ii libcurl3-gnutls 7.21.0-1 Multi-protocol file transfer libra
ii libexif12 0.6.19-1 library to parse EXIF files
ii libfontconfig1 2.8.0-2.1 generic font configuration library
ii libfreetype6 2.4.2-2.1 FreeType 2 font engine, shared lib
ii libgconf2-4 2.28.1-6 GNOME configuration database syste
ii libglade2-0 1:2.6.4-1 library to load .glade files at ru
ii libglib2.0-0 2.24.2-1 The GLib library of C routines
ii libgps19 2.95-8 Global Positioning System - librar
ii libgtk2.0-0 2.20.1-2 The GTK+ graphical user interface
ii libpango1.0-0 1.28.3-1 Layout and rendering of internatio
ii libsqlite3-0 3.7.3-1 SQLite 3 shared library
ii libxml2 2.7.8.dfsg-1 GNOME XML library
ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime
Versions of packages foxtrotgps recommends:
pn gpsd <none> (no description available)
Versions of packages foxtrotgps suggests:
ii python 2.6.6-3+squeeze2 interactive high-level object-orie
-- no debconf information
diff -u foxtrotgps-0.99.4+debian3/debian/changelog foxtrotgps-0.99.4+debian3/debian/changelog
--- foxtrotgps-0.99.4+debian3/debian/changelog
+++ foxtrotgps-0.99.4+debian3/debian/changelog
@@ -1,3 +1,10 @@
+foxtrotgps (0.99.4+debian3-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Testing patch to s/metrical/metric
+
+ -- Karl Goetz <k...@kgoetz.id.au> Mon, 27 Dec 2010 10:52:08 +1030
+
foxtrotgps (0.99.4+debian3-3) unstable; urgency=medium
* Adding updated gpsd.patch from Timo Juhani Lindfors
only in patch2:
unchanged:
--- foxtrotgps-0.99.4+debian3.orig/data/foxtrotgps.glade.in
+++ foxtrotgps-0.99.4+debian3/data/foxtrotgps.glade.in
@@ -1742,7 +1742,7 @@
<widget class="GtkRadioButton" id="radiobutton14">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">metrical</property>
+ <property name="label" translatable="yes">metric</property>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
only in patch2:
unchanged:
--- foxtrotgps-0.99.4+debian3.orig/src/globals.h
+++ foxtrotgps-0.99.4+debian3/src/globals.h
@@ -188,7 +188,7 @@
};
enum {
- METRICAL = 0,
+ METRIC = 0,
IMPERIAL = 1,
NAUTICAL = 2
};
only in patch2:
unchanged:
--- foxtrotgps-0.99.4+debian3.orig/src/gps_functions.c
+++ foxtrotgps-0.99.4+debian3/src/gps_functions.c
@@ -885,7 +885,7 @@
switch (global_speed_unit)
{
- case METRICAL:
+ case METRIC:
unit_conv = 1.0;
strncpy(unit, "km", 3);
break;
@@ -948,7 +948,7 @@
buf = g_strconcat("1", unit, NULL);
*factor = 1/distance;
}
- else if(global_speed_unit == METRICAL)
+ else if(global_speed_unit == METRIC)
{
if (distance < 1 && distance >= 0.5) {
buf = g_strdup("500m");
diff -u foxtrotgps-0.99.4+debian3/debian/changelog foxtrotgps-0.99.4+debian3/debian/changelog
--- foxtrotgps-0.99.4+debian3/debian/changelog
+++ foxtrotgps-0.99.4+debian3/debian/changelog
@@ -1,3 +1,10 @@
+foxtrotgps (0.99.4+debian3-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Testing patch to s/metrical/metric
+
+ -- Karl Goetz <k...@kgoetz.id.au> Mon, 27 Dec 2010 10:52:08 +1030
+
foxtrotgps (0.99.4+debian3-3) unstable; urgency=medium
* Adding updated gpsd.patch from Timo Juhani Lindfors
only in patch2:
unchanged:
--- foxtrotgps-0.99.4+debian3.orig/data/foxtrotgps.glade.in
+++ foxtrotgps-0.99.4+debian3/data/foxtrotgps.glade.in
@@ -1742,7 +1742,7 @@
<widget class="GtkRadioButton" id="radiobutton14">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">metrical</property>
+ <property name="label" translatable="yes">metric</property>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
only in patch2:
unchanged:
--- foxtrotgps-0.99.4+debian3.orig/src/globals.h
+++ foxtrotgps-0.99.4+debian3/src/globals.h
@@ -188,7 +188,7 @@
};
enum {
- METRICAL = 0,
+ METRIC = 0,
IMPERIAL = 1,
NAUTICAL = 2
};
only in patch2:
unchanged:
--- foxtrotgps-0.99.4+debian3.orig/src/gps_functions.c
+++ foxtrotgps-0.99.4+debian3/src/gps_functions.c
@@ -885,7 +885,7 @@
switch (global_speed_unit)
{
- case METRICAL:
+ case METRIC:
unit_conv = 1.0;
strncpy(unit, "km", 3);
break;
@@ -948,7 +948,7 @@
buf = g_strconcat("1", unit, NULL);
*factor = 1/distance;
}
- else if(global_speed_unit == METRICAL)
+ else if(global_speed_unit == METRIC)
{
if (distance < 1 && distance >= 0.5) {
buf = g_strdup("500m");
