Please unblock viking 0.9.6-1
Hi Release Team,
I'd like to ask for a freeze exception for viking 0.9.6-1. Important
changes are a fix for the Google map layer support (which is used by a
lot of our users) and a large po file update, adding several new
translations and updating others.
The changelog reads:
* New upstream version. The following changes were introduced since
0.9.4.20080717 (which was a pre-release of 0.9.5):
- Manpages are build and installed by upstream now, the according
lines were removed from debian/rules and debian/viking.manpages.
- Update of most translations
- Google map layers stopped working due to changes by Google, this
problem is fixed now (Closes: #491631). As this feature is used by
most of our users, it should be fixed for Lenny.
- The gcget command line needed to be fixed to accommodate negative
coords. This doesn't affect Debian as the geocaching features are
not enabled yet.
- Removing unecessary (and probably broken) Makefile.am directives.
A debdiff (excluding the po changes) is attached to this mail.
Thanks,
Bernd
--
Bernd Zeimetz Debian GNU/Linux Developer
GPG Fingerprint: 06C8 C9A2 EAAD E37E 5B2C BE93 067A AD04 C93B FF79
diff -Nru viking-0.9.4.20080717/aclocal.m4 viking-0.9.6/aclocal.m4
--- viking-0.9.4.20080717/aclocal.m4 2008-07-17 23:13:46.000000000 +0200
+++ viking-0.9.6/aclocal.m4 2008-07-31 21:49:11.000000000 +0200
@@ -210,7 +210,7 @@
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 36 IT_PROG_INTLTOOL
+# serial 40 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
@@ -226,14 +226,21 @@
AC_MSG_CHECKING([for intltool >= $1])
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
]
AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
fi
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
@@ -288,12 +295,7 @@
AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
fi
-# Use the tools built into the package, not the ones that are installed.
-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
+AC_PATH_PROG(INTLTOOL_PERL, [perl])
if test -z "$INTLTOOL_PERL"; then
AC_MSG_ERROR([perl not found; required for intltool])
fi
@@ -339,42 +341,6 @@
IT_PO_SUBDIR([po])
-dnl The following is very similar to
-dnl
-dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
-dnl
-dnl with the following slight differences:
-dnl - the *.in files are in ac_aux_dir,
-dnl - if the file haven't changed upon reconfigure, it's not touched,
-dnl - the evaluation of the third parameter enables a hack which computes
-dnl the actual value of $libdir,
-dnl - the user sees "executing intltool commands", instead of
-dnl "creating intltool-extract" and such.
-dnl
-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
-dnl a reason for it.
-
-AC_CONFIG_COMMANDS([intltool], [
-
-for file in intltool-extract intltool-merge intltool-update; do
- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
- < ${ac_aux_dir}/${file}.in > ${file}.out
- if cmp -s ${file} ${file}.out 2>/dev/null; then
- rm -f ${file}.out
- else
- mv -f ${file}.out ${file}
- fi
- chmod ugo+x ${file}
- chmod u+w ${file}
-done
-
-],
-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
-
])
diff -Nru viking-0.9.4.20080717/AUTHORS viking-0.9.6/AUTHORS
--- viking-0.9.4.20080717/AUTHORS 2008-07-17 23:12:23.000000000 +0200
+++ viking-0.9.6/AUTHORS 2008-07-28 22:46:31.000000000 +0200
@@ -7,6 +7,7 @@
Guilhem Bonnefille <guilhem.bonnefille@gmail.com> ** Autotools and releases
Jocelyn Jaubert <jocelyn.jaubert@gmail.com> ** Track Properties dialog improves
Mark Coulter <i_offroad@yahoo.com> ** Waypoint symbols
+Mathieu Albinet <mathieu17@gmail.com> ** Windows port
Quy Tonthat <qtonthat@gmail.com> ** Many improves
Few other bugfixes/minor patches from various contributors. See ChangeLog for details.
diff -Nru viking-0.9.4.20080717/ChangeLog viking-0.9.6/ChangeLog
--- viking-0.9.4.20080717/ChangeLog 2008-07-16 22:33:22.000000000 +0200
+++ viking-0.9.6/ChangeLog 2008-07-31 21:43:41.000000000 +0200
@@ -1,3 +1,26 @@
+2008-07-31
+Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+ * Release Viking 0.9.6
+ * Fix unecessary (and probably) Makefile.am directive
+
+2008-07-28
+Quy Tonthat <qtonthat@gmail.com>:
+ * Fix gcget command line to accomodate negative coords.
+
+2008-07-22
+Quy Tonthat <qtonthat@gmail.com>:
+ * Google maps no longer worked due to changes made by Google.
+ The Problems now fixed.
+
+2008-07-21:
+Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+ * Release Viking 0.9.5
+
+2008-07-18:
+Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+ * Install man pages
+ * Update translations
+
2008-07-15
Quy Tonthat <qtonthat@gmail.com>:
* Added viking.desktop
diff -Nru viking-0.9.4.20080717/configure viking-0.9.6/configure
--- viking-0.9.4.20080717/configure 2008-07-17 23:13:52.000000000 +0200
+++ viking-0.9.6/configure 2008-07-31 21:49:30.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for viking 0.9.4.20080717.
+# Generated by GNU Autoconf 2.61 for viking 0.9.6.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@
# Identity of this package.
PACKAGE_NAME='viking'
PACKAGE_TARNAME='viking'
-PACKAGE_VERSION='0.9.4.20080717'
-PACKAGE_STRING='viking 0.9.4.20080717'
+PACKAGE_VERSION='0.9.6'
+PACKAGE_STRING='viking 0.9.6'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -715,6 +715,9 @@
POFILES
POSUB
MKINSTALLDIRS
+INTLTOOL_UPDATE
+INTLTOOL_MERGE
+INTLTOOL_EXTRACT
INTLTOOL_DESKTOP_RULE
INTLTOOL_DIRECTORY_RULE
INTLTOOL_KEYS_RULE
@@ -735,9 +738,6 @@
INTLTOOL_SERVICE_RULE
INTLTOOL_POLICY_RULE
MSGMERGE
-INTLTOOL_EXTRACT
-INTLTOOL_MERGE
-INTLTOOL_UPDATE
INTLTOOL_PERL
ALL_LINGUAS
CONFIG_STATUS_DEPENDENCIES
@@ -771,6 +771,10 @@
DEM24K_FALSE
REALTIME_GPS_TRACKING_TRUE
REALTIME_GPS_TRACKING_FALSE
+DB2MAN_XSL
+XP
+GEN_MANPAGES_TRUE
+GEN_MANPAGES_FALSE
LTLIBOBJS'
ac_subst_files=''
ac_precious_vars='build_alias
@@ -1284,7 +1288,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures viking 0.9.4.20080717 to adapt to many kinds of systems.
+\`configure' configures viking 0.9.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1354,7 +1358,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of viking 0.9.4.20080717:";;
+ short | recursive ) echo "Configuration of viking 0.9.6:";;
esac
cat <<\_ACEOF
@@ -1459,7 +1463,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-viking configure 0.9.4.20080717
+viking configure 0.9.6
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1473,7 +1477,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by viking $as_me 0.9.4.20080717, which was
+It was created by viking $as_me 0.9.6, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2143,7 +2147,7 @@
# Define the identity of the package.
PACKAGE='viking'
- VERSION='0.9.4.20080717'
+ VERSION='0.9.6'
cat >>confdefs.h <<_ACEOF
@@ -7311,8 +7315,8 @@
echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
{ echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
@@ -7322,6 +7326,132 @@
{ (exit 1); exit 1; }; }
fi
+# Extract the first word of "intltool-update", so it can be a program name with args.
+set dummy intltool-update; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $INTLTOOL_UPDATE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+if test -n "$INTLTOOL_UPDATE"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
+echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "intltool-merge", so it can be a program name with args.
+set dummy intltool-merge; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $INTLTOOL_MERGE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+if test -n "$INTLTOOL_MERGE"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
+echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "intltool-extract", so it can be a program name with args.
+set dummy intltool-extract; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $INTLTOOL_EXTRACT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+if test -n "$INTLTOOL_EXTRACT"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
+echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+ { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -7497,14 +7627,6 @@
{ (exit 1); exit 1; }; }
fi
-# Use the tools built into the package, not the ones that are installed.
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
-
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -7717,10 +7839,6 @@
-ac_config_commands="$ac_config_commands intltool"
-
-
-
CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/po/LINGUAS'
@@ -10276,6 +10394,59 @@
_ACEOF
+DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+
+# Extract the first word of "xsltproc", so it can be a program name with args.
+set dummy xsltproc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_XP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $XP in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XP="$XP" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_XP="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+XP=$ac_cv_path_XP
+if test -n "$XP"; then
+ { echo "$as_me:$LINENO: result: $XP" >&5
+echo "${ECHO_T}$XP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+
+
+if test "x$XP" != "x" && test -r "$DB2MAN_XSL"; then
+ GEN_MANPAGES_TRUE=
+ GEN_MANPAGES_FALSE='#'
+else
+ GEN_MANPAGES_TRUE='#'
+ GEN_MANPAGES_FALSE=
+fi
+
+
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
@@ -10461,6 +10632,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${GEN_MANPAGES_TRUE}" && test -z "${GEN_MANPAGES_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"GEN_MANPAGES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"GEN_MANPAGES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -10761,7 +10939,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by viking $as_me 0.9.4.20080717, which was
+This file was extended by viking $as_me 0.9.6, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10814,7 +10992,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-viking config.status 0.9.4.20080717
+viking config.status 0.9.6
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -10920,9 +11098,6 @@
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
_ACEOF
@@ -10936,7 +11111,6 @@
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
- "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/icons/Makefile") CONFIG_FILES="$CONFIG_FILES src/icons/Makefile" ;;
@@ -11152,6 +11326,9 @@
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
@@ -11172,9 +11349,6 @@
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
-INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
-INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
-INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
CONFIG_STATUS_DEPENDENCIES!$CONFIG_STATUS_DEPENDENCIES$ac_delim
@@ -11208,10 +11382,14 @@
DEM24K_FALSE!$DEM24K_FALSE$ac_delim
REALTIME_GPS_TRACKING_TRUE!$REALTIME_GPS_TRACKING_TRUE$ac_delim
REALTIME_GPS_TRACKING_FALSE!$REALTIME_GPS_TRACKING_FALSE$ac_delim
+DB2MAN_XSL!$DB2MAN_XSL$ac_delim
+XP!$XP$ac_delim
+GEN_MANPAGES_TRUE!$GEN_MANPAGES_TRUE$ac_delim
+GEN_MANPAGES_FALSE!$GEN_MANPAGES_FALSE$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -11776,23 +11954,6 @@
"default-2":C) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
- "intltool":C)
-
-for file in intltool-extract intltool-merge intltool-update; do
- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
- < ${ac_aux_dir}/${file}.in > ${file}.out
- if cmp -s ${file} ${file}.out 2>/dev/null; then
- rm -f ${file}.out
- else
- mv -f ${file}.out ${file}
- fi
- chmod ugo+x ${file}
- chmod u+w ${file}
-done
-
- ;;
"po/stamp-it":C)
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
diff -Nru viking-0.9.4.20080717/configure.ac viking-0.9.6/configure.ac
--- viking-0.9.4.20080717/configure.ac 2008-07-17 23:13:33.000000000 +0200
+++ viking-0.9.6/configure.ac 2008-07-31 21:48:42.000000000 +0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(viking, 0.9.4.20080717)
+AC_INIT(viking, 0.9.6)
AM_INIT_AUTOMAKE()
dnl AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_HEADERS([src/config.h])
@@ -192,6 +192,12 @@
AC_DEFINE_UNQUOTED(VIK_CONFIG_MAPCACHE_SIZE, ${VIK_CONFIG_MAPCACHE_SIZE},
[Size of the map cache])
+dnl man pages processing
+DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+AC_SUBST(DB2MAN_XSL)
+AC_PATH_PROG(XP,xsltproc)
+AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"])
+
dnl This will cause the automake generated makefiles to pass the
dnl correct flags to aclocal.
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
diff -Nru viking-0.9.4.20080717/debian/changelog viking-0.9.6/debian/changelog
--- viking-0.9.4.20080717/debian/changelog 2008-08-07 23:11:37.000000000 +0200
+++ viking-0.9.6/debian/changelog 2008-08-07 23:11:37.000000000 +0200
@@ -1,3 +1,20 @@
+viking (0.9.6-1) unstable; urgency=low
+
+ * New upstream version. The following changes were introduced since
+ 0.9.4.20080717 (which was a pre-release of 0.9.5):
+ - Manpages are build and installed by upstream now, the according lines
+ were removed from debian/rules and debian/viking.manpages.
+ - Update of most translations
+ - Google map layers stopped working due to changes by Google, this problem
+ is fixed now (Closes: #491631). As this feature is used by most of our
+ users, it should be fixed for Lenny.
+ - The gcget command line needed to be fixed to accommodate negative coords.
+ This doesn't affect Debian as the geocaching features are not enabled
+ yet.
+ - Removing unecessary (and probably ) Makefile.am directive
+
+ -- Bernd Zeimetz <bzed@debian.org> Mon, 04 Aug 2008 02:17:58 +0200
+
viking (0.9.4.20080717-1) unstable; urgency=low
* New upstream version.
diff -Nru viking-0.9.4.20080717/debian/rules viking-0.9.6/debian/rules
--- viking-0.9.4.20080717/debian/rules 2008-08-07 23:11:37.000000000 +0200
+++ viking-0.9.6/debian/rules 2008-08-07 23:11:37.000000000 +0200
@@ -48,7 +48,7 @@
touch $@
-build: build-stamp manpages
+build: build-stamp
build-stamp: config-stamp
dh_testdir
@@ -57,15 +57,6 @@
touch $@
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
-XP=xsltproc -''-nonet
-MANPAGES=debian/viking.1 debian/viking-remote.1
-
-manpages: $(MANPAGES)
-
-debian/%.1: doc/%.xml
- $(XP) -o $@ $(DB2MAN) $<
-
clean:
dh_testdir
dh_testroot
@@ -118,4 +109,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean configure manpages binary-indep binary-arch binary install clean-patched patch unpatch
+.PHONY: build clean configure binary-indep binary-arch binary install clean-patched patch unpatch
diff -Nru viking-0.9.4.20080717/debian/viking.manpages viking-0.9.6/debian/viking.manpages
--- viking-0.9.4.20080717/debian/viking.manpages 2008-08-07 23:11:37.000000000 +0200
+++ viking-0.9.6/debian/viking.manpages 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-debian/viking.1
-debian/viking-remote.1
diff -Nru viking-0.9.4.20080717/doc/dev/Makefile.in viking-0.9.6/doc/dev/Makefile.in
--- viking-0.9.4.20080717/doc/dev/Makefile.in 2008-07-17 23:13:50.000000000 +0200
+++ viking-0.9.6/doc/dev/Makefile.in 2008-07-31 21:49:24.000000000 +0200
@@ -69,6 +69,7 @@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DB2MAN_XSL = @DB2MAN_XSL@
DEFS = @DEFS@
DEM24K_FALSE = @DEM24K_FALSE@
DEM24K_TRUE = @DEM24K_TRUE@
@@ -85,6 +86,8 @@
EXPEDIA_FALSE = @EXPEDIA_FALSE@
EXPEDIA_TRUE = @EXPEDIA_TRUE@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@
+GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@
GEOCACHES_FALSE = @GEOCACHES_FALSE@
GEOCACHES_TRUE = @GEOCACHES_TRUE@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -164,6 +167,7 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+XP = @XP@
_libcurl_config = @_libcurl_config@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
diff -Nru viking-0.9.4.20080717/doc/Makefile.am viking-0.9.6/doc/Makefile.am
--- viking-0.9.4.20080717/doc/Makefile.am 2008-07-16 21:31:36.000000000 +0200
+++ viking-0.9.6/doc/Makefile.am 2008-07-28 22:46:31.000000000 +0200
@@ -2,3 +2,19 @@
EXTRA_DIST = GEOCODED-PHOTOS GETTING-STARTED GPSMAPPER \
viking.xml viking-remote.xml
+
+CLEANFILES=
+
+# man pages processing
+# TODO conditional processing
+# (availability of docbook stylesheet and xsltproc)
+if GEN_MANPAGES
+MANPAGES=viking.1 viking-remote.1
+man_MANS = $(MANPAGES)
+CLEANFILES+=$(MANPAGES)
+endif
+DB2MAN=@DB2MAN_XSL@
+XP=@XP@ -''-nonet
+
+%.1: %.xml
+ $(XP) -o $@ $(DB2MAN) $<
diff -Nru viking-0.9.4.20080717/doc/Makefile.in viking-0.9.6/doc/Makefile.in
--- viking-0.9.4.20080717/doc/Makefile.in 2008-07-17 23:13:50.000000000 +0200
+++ viking-0.9.6/doc/Makefile.in 2008-07-31 21:49:23.000000000 +0200
@@ -35,6 +35,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@GEN_MANPAGES_TRUE@am__append_1 = $(MANPAGES)
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -54,6 +55,10 @@
install-recursive installcheck-recursive installdirs-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)"
+NROFF = nroff
+MANS = $(man_MANS)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -78,6 +83,7 @@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DB2MAN_XSL = @DB2MAN_XSL@
DEFS = @DEFS@
DEM24K_FALSE = @DEM24K_FALSE@
DEM24K_TRUE = @DEM24K_TRUE@
@@ -94,6 +100,8 @@
EXPEDIA_FALSE = @EXPEDIA_FALSE@
EXPEDIA_TRUE = @EXPEDIA_TRUE@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@
+GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@
GEOCACHES_FALSE = @GEOCACHES_FALSE@
GEOCACHES_TRUE = @GEOCACHES_TRUE@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -173,6 +181,7 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+XP = @XP@ -''-nonet
_libcurl_config = @_libcurl_config@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -221,6 +230,14 @@
EXTRA_DIST = GEOCODED-PHOTOS GETTING-STARTED GPSMAPPER \
viking.xml viking-remote.xml
+CLEANFILES = $(am__append_1)
+
+# man pages processing
+# TODO conditional processing
+# (availability of docbook stylesheet and xsltproc)
+@GEN_MANPAGES_TRUE@MANPAGES = viking.1 viking-remote.1
+@GEN_MANPAGES_TRUE@man_MANS = $(MANPAGES)
+DB2MAN = @DB2MAN_XSL@
all: all-recursive
.SUFFIXES:
@@ -254,6 +271,51 @@
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
+install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.1*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+ *) ext='1' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.1*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+ *) ext='1' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -431,9 +493,12 @@
done
check-am: all-am
check: check-recursive
-all-am: Makefile
+all-am: Makefile $(MANS)
installdirs: installdirs-recursive
installdirs-am:
+ for dir in "$(DESTDIR)$(man1dir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -451,6 +516,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -476,13 +542,13 @@
info-am:
-install-data-am:
+install-data-am: install-man
install-exec-am:
install-info: install-info-recursive
-install-man:
+install-man: install-man1
installcheck-am:
@@ -502,22 +568,28 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-man
uninstall-info: uninstall-info-recursive
+uninstall-man: uninstall-man1
+
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
clean clean-generic clean-recursive ctags ctags-recursive \
distclean distclean-generic distclean-recursive distclean-tags \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am
+ install-man1 install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-info-am uninstall-man uninstall-man1
+
+%.1: %.xml
+ $(XP) -o $@ $(DB2MAN) $<
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -Nru viking-0.9.4.20080717/Makefile.in viking-0.9.6/Makefile.in
--- viking-0.9.4.20080717/Makefile.in 2008-07-17 23:13:51.000000000 +0200
+++ viking-0.9.6/Makefile.in 2008-07-31 21:49:27.000000000 +0200
@@ -98,6 +98,7 @@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DB2MAN_XSL = @DB2MAN_XSL@
DEFS = @DEFS@
DEM24K_FALSE = @DEM24K_FALSE@
DEM24K_TRUE = @DEM24K_TRUE@
@@ -114,6 +115,8 @@
EXPEDIA_FALSE = @EXPEDIA_FALSE@
EXPEDIA_TRUE = @EXPEDIA_TRUE@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@
+GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@
GEOCACHES_FALSE = @GEOCACHES_FALSE@
GEOCACHES_TRUE = @GEOCACHES_TRUE@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -193,6 +196,7 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+XP = @XP@
_libcurl_config = @_libcurl_config@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
diff -Nru viking-0.9.4.20080717/NEWS viking-0.9.6/NEWS
--- viking-0.9.4.20080717/NEWS 2008-07-17 23:12:23.000000000 +0200
+++ viking-0.9.6/NEWS 2008-07-31 21:48:30.000000000 +0200
@@ -1,3 +1,36 @@
+Viking 0.9.6 (2008-07-31)
+Fixes since 0.9.5
+
+* Fix Google maps' URL
+* Fix gcget command line to accomodate negative coords
+* Fix unecessary viking.desktop
+
+Viking 0.9.5 (2008-07-21)
+New features since 0.9.4
+
+* Add panning tool as default.
+* Replace GtkFileSelection by GtkFileChooser.
+* No longer converts waypoint names to uppercase. Waypoint names are now case insensitive.
+* Windows port updated.
+* Track properties: Keep markers of the graphs in sync with each other.
+* Track properties: split track at marker.
+* New translations: el, it, ja, lt, nb, nl, pl, zh_CN, zh_TW
+* Added viking.desktop
+* Added --debug and --verbose command line options.
+* Updated man pages.
+
+Fixes since 0.9.4
+
+* Fix #1839948: Maximize/Restore changes current cursor.
+* Bug #1915121: add an utility to reproduce (test/gpx2gpx).
+* Fix #1915121: use GLib functions to handle ISO8601 dates.
+* Fix pipe leaks.
+* Remove dependency to wget.
+* Fix google version number.
+* Track graph marker now works again.
+* Fix #1947456: Compiler warning fixes
+
+
Viking 0.9.4 (2008-02-25)
New features since 0.9.3
diff -Nru viking-0.9.4.20080717/src/authors.h viking-0.9.6/src/authors.h
--- viking-0.9.4.20080717/src/authors.h 2008-07-17 23:14:21.000000000 +0200
+++ viking-0.9.6/src/authors.h 2008-07-31 22:17:10.000000000 +0200
@@ -9,6 +9,7 @@
"Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n"\
"Jocelyn Jaubert <jocelyn.jaubert@gmail.com>\n"\
"Mark Coulter <i_offroad@yahoo.com>\n"\
+"Mathieu Albinet <mathieu17@gmail.com>\n"\
"Quy Tonthat <qtonthat@gmail.com>\n"\
"\n"\
"Few other bugfixes/minor patches from various contributors. See ChangeLog for details.\n"
diff -Nru viking-0.9.4.20080717/src/config.h viking-0.9.6/src/config.h
--- viking-0.9.4.20080717/src/config.h 2008-07-17 23:14:18.000000000 +0200
+++ viking-0.9.6/src/config.h 2008-07-31 21:50:04.000000000 +0200
@@ -168,7 +168,7 @@
#define LIBCURL_PROTOCOL_HTTPS 1
/* Defined if libcurl supports LDAP */
-#define LIBCURL_PROTOCOL_LDAP 1
+/* #undef LIBCURL_PROTOCOL_LDAP */
/* Defined if libcurl supports TELNET */
#define LIBCURL_PROTOCOL_TELNET 1
@@ -177,7 +177,7 @@
#define LIBCURL_PROTOCOL_TFTP 1
/* Define the location where the catalogs will be installed */
-#define LOCALEDIR "/tmp/share/locale"
+#define LOCALEDIR "/usr/local/share/locale"
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
@@ -193,19 +193,19 @@
#define PACKAGE_NAME "viking"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "viking 0.9.4.20080717"
+#define PACKAGE_STRING "viking 0.9.6"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "viking"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.9.4.20080717"
+#define PACKAGE_VERSION "0.9.6"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.9.4.20080717"
+#define VERSION "0.9.6"
/* NO ALPHABETIZED TRW */
#define VIK_CONFIG_ALPHABETIZED_TRW
diff -Nru viking-0.9.4.20080717/src/datasource_gc.c viking-0.9.6/src/datasource_gc.c
--- viking-0.9.4.20080717/src/datasource_gc.c 2008-07-16 21:31:36.000000000 +0200
+++ viking-0.9.6/src/datasource_gc.c 2008-07-28 22:46:52.000000000 +0200
@@ -202,7 +202,7 @@
gchar *safe_string = g_shell_quote ( gtk_entry_get_text ( GTK_ENTRY(widgets->center_entry) ) );
gchar *safe_user = g_shell_quote ( a_preferences_get ( VIKING_GC_PARAMS_NAMESPACE "username")->s );
gchar *safe_pass = g_shell_quote ( a_preferences_get ( VIKING_GC_PARAMS_NAMESPACE "password")->s );
- *cmd = g_strdup_printf( "gcget -u %s -p %s %s %d %.2lf", safe_user, safe_pass, safe_string,
+ *cmd = g_strdup_printf( "gcget -u %s -p -- %s %s %d %.2lf", safe_user, safe_pass, safe_string,
gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(widgets->num_spin) ),
gtk_spin_button_get_value_as_float ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) ) );
*input_file_type = NULL;
diff -Nru viking-0.9.4.20080717/src/dialog.c viking-0.9.6/src/dialog.c
--- viking-0.9.4.20080717/src/dialog.c 2008-07-16 21:31:36.000000000 +0200
+++ viking-0.9.6/src/dialog.c 2008-07-28 22:46:31.000000000 +0200
@@ -579,7 +579,7 @@
char *msg = g_markup_printf_escaped (
_(_("<span font_desc='20' weight='bold'>Viking %s</span>\n\n"
"GPS Data and Topo Analyzer, Explorer, and Manager.\n\n"
- "<small>(C) 2003-2007, Evan Battaglia</small>\n\n"
+ "<small>(C) 2003-2008, Evan Battaglia</small>\n\n"
"<small>Web site: %s</small>")),
VIKING_VERSION, VIKING_URL);
GtkWidget *msgbox = gtk_message_dialog_new_with_markup ( parent,
diff -Nru viking-0.9.4.20080717/src/google.c viking-0.9.6/src/google.c
--- viking-0.9.4.20080717/src/google.c 2008-07-16 22:33:22.000000000 +0200
+++ viking-0.9.6/src/google.c 2008-07-28 22:46:31.000000000 +0200
@@ -117,8 +117,8 @@
gsize len;
gchar *gvers, *tvers, *kvers, *terrvers, *tmpvers;
static DownloadOptions dl_options = { "http://maps.google.com/";, 0, a_check_map_file };
- static const char *gvers_pat = "http://mt0.google.com/mt?n\\x3d404\\x26v\\x3d";;
- static const char *kvers_pat = "http://khm0.google.com/kh?n\\x3d404\\x26v\\x3d";;
+ static const char *gvers_pat = "http://mt0.google.com/mt?v\\x3d";;
+ static const char *kvers_pat = "http://khm0.google.com/kh?v\\x3d";;
g_assert(google_type < TYPE_GOOGLE_NUM);
diff -Nru viking-0.9.4.20080717/src/icons/Makefile.in viking-0.9.6/src/icons/Makefile.in
--- viking-0.9.4.20080717/src/icons/Makefile.in 2008-07-17 23:13:51.000000000 +0200
+++ viking-0.9.6/src/icons/Makefile.in 2008-07-31 21:49:26.000000000 +0200
@@ -96,6 +96,7 @@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DB2MAN_XSL = @DB2MAN_XSL@
DEFS = @DEFS@
DEM24K_FALSE = @DEM24K_FALSE@
DEM24K_TRUE = @DEM24K_TRUE@
@@ -112,6 +113,8 @@
EXPEDIA_FALSE = @EXPEDIA_FALSE@
EXPEDIA_TRUE = @EXPEDIA_TRUE@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@
+GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@
GEOCACHES_FALSE = @GEOCACHES_FALSE@
GEOCACHES_TRUE = @GEOCACHES_TRUE@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -191,6 +194,7 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+XP = @XP@
_libcurl_config = @_libcurl_config@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
diff -Nru viking-0.9.4.20080717/src/Makefile.am viking-0.9.6/src/Makefile.am
--- viking-0.9.4.20080717/src/Makefile.am 2008-07-16 22:33:22.000000000 +0200
+++ viking-0.9.6/src/Makefile.am 2008-07-28 22:47:38.000000000 +0200
@@ -114,6 +114,5 @@
desktop_in_files = viking.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST=$(desktop_in_files)
-BUILT_SOURCES += viking.desktop
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) $(desktop_DATA)
diff -Nru viking-0.9.4.20080717/src/Makefile.in viking-0.9.6/src/Makefile.in
--- viking-0.9.4.20080717/src/Makefile.in 2008-07-17 23:13:50.000000000 +0200
+++ viking-0.9.6/src/Makefile.in 2008-07-31 21:49:25.000000000 +0200
@@ -193,6 +193,7 @@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DB2MAN_XSL = @DB2MAN_XSL@
DEFS = @DEFS@
DEM24K_FALSE = @DEM24K_FALSE@
DEM24K_TRUE = @DEM24K_TRUE@
@@ -209,6 +210,8 @@
EXPEDIA_FALSE = @EXPEDIA_FALSE@
EXPEDIA_TRUE = @EXPEDIA_TRUE@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@
+GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@
GEOCACHES_FALSE = @GEOCACHES_FALSE@
GEOCACHES_TRUE = @GEOCACHES_TRUE@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -288,6 +291,7 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+XP = @XP@
_libcurl_config = @_libcurl_config@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -334,7 +338,7 @@
target_alias = @target_alias@
SUBDIRS = icons
noinst_LIBRARIES = libviking.a
-BUILT_SOURCES = authors.h viking.desktop
+BUILT_SOURCES = authors.h
libviking_a_SOURCES = modules.h modules.c curl_download.c \
curl_download.h menu.xml.h degrees_converters.c \
degrees_converters.h globals.c globals.h viking.h mapcoord.h \
@@ -376,7 +380,7 @@
desktop_in_files = viking.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = $(desktop_in_files)
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) $(desktop_DATA)
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -Nru viking-0.9.4.20080717/test/Makefile.in viking-0.9.6/test/Makefile.in
--- viking-0.9.4.20080717/test/Makefile.in 2008-07-17 23:13:51.000000000 +0200
+++ viking-0.9.6/test/Makefile.in 2008-07-31 21:49:26.000000000 +0200
@@ -91,6 +91,7 @@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DB2MAN_XSL = @DB2MAN_XSL@
DEFS = @DEFS@
DEM24K_FALSE = @DEM24K_FALSE@
DEM24K_TRUE = @DEM24K_TRUE@
@@ -107,6 +108,8 @@
EXPEDIA_FALSE = @EXPEDIA_FALSE@
EXPEDIA_TRUE = @EXPEDIA_TRUE@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GEN_MANPAGES_FALSE = @GEN_MANPAGES_FALSE@
+GEN_MANPAGES_TRUE = @GEN_MANPAGES_TRUE@
GEOCACHES_FALSE = @GEOCACHES_FALSE@
GEOCACHES_TRUE = @GEOCACHES_TRUE@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -186,6 +189,7 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+XP = @XP@
_libcurl_config = @_libcurl_config@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
diff -Nru viking-0.9.4.20080717/viking.spec viking-0.9.6/viking.spec
--- viking-0.9.4.20080717/viking.spec 2008-07-17 23:14:26.000000000 +0200
+++ viking-0.9.6/viking.spec 2008-07-31 22:37:24.000000000 +0200
@@ -3,7 +3,7 @@
#%% May be redistributed without this notice.
Name: viking
-Version: 0.9.4.20080717
+Version: 0.9.6
Release: 1
Summary: GPS data editor and analyzer
Reply to: