--- gnome-pilot-2.0.15.orig/applet/GNOME_PilotApplet.server.in.in
+++ gnome-pilot-2.0.15/applet/GNOME_PilotApplet.server.in.in
@@ -25,7 +25,7 @@
-
+
--- gnome-pilot-2.0.15.orig/gpilotd/Makefile.am
+++ gnome-pilot-2.0.15/gpilotd/Makefile.am
@@ -113,6 +113,8 @@
libgpilotd_la_LDFLAGS = \
-version-info $(GPILOTD_CURRENT):$(GPILOTD_REVISION):$(GPILOTD_AGE)
+libgpilotd_la_LIBADD = $(GPILOTD_LIBS)
+
## LIBGPILOTDCONDUIT
libgpilotdconduit_la_SOURCES = \
$(GOB_GPILOTD_CONDUIT_SRCS) \
@@ -142,6 +144,8 @@
libgpilotdconduit_la_LDFLAGS = \
-version-info $(GPILOTD_CONDUIT_CURRENT):$(GPILOTD_CONDUIT_REVISION):$(GPILOTD_CONDUIT_AGE)
+libgpilotdconduit_la_LIBADD = $(GPILOTD_CONDUIT_LIBS)
+
###
noinst_HEADERS = gnome-pilot-conduit-backup-private.h
--- gnome-pilot-2.0.15.orig/libgpilotdCM/Makefile.in
+++ gnome-pilot-2.0.15/libgpilotdCM/Makefile.in
@@ -274,7 +274,9 @@
libgpilotdcm_la_LIBADD =
am__objects_1 = gnome-pilot-conduit-management.lo \
- gnome-pilot-conduit-config.lo
+ gnome-pilot-conduit-config.lo \
+ ../gpilotd/gnome-pilot-structures.lo \
+ ../gpilotd/gnome-pilot-conduit.lo
am_libgpilotdcm_la_OBJECTS = $(am__objects_1)
libgpilotdcm_la_OBJECTS = $(am_libgpilotdcm_la_OBJECTS)
--- gnome-pilot-2.0.15.orig/libgpilotdCM/Makefile.am
+++ gnome-pilot-2.0.15/libgpilotdCM/Makefile.am
@@ -43,5 +43,10 @@
libgpilotdcm_la_LDFLAGS = \
-version-info $(GPILOTD_CM_CURRENT):$(GPILOTD_CM_REVISION):$(GPILOTD_CM_AGE)
+libgpilotdcm_la_LIBADD = \
+ $(GPILOTDCM_LIBS)
+
+libgpilotdcm_la_LIBADD = $(GPILOTDCM_LIBS)
+
EXTRA_DIST = \
$(gobfiles)
--- gnome-pilot-2.0.15.orig/configure
+++ gnome-pilot-2.0.15/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60.
+# Generated by GNU Autoconf 2.60a.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -719,36 +719,36 @@
# Factoring default headers for most tests.
ac_includes_default="\
#include
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
# include
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
# include
#endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
# include
# include
#else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
# include
# endif
#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
# include
# endif
# include
#endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
# include
#endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
# include
#endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
# include
#endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
# include
#endif"
@@ -791,6 +791,18 @@
build_alias
host_alias
target_alias
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+target
+target_cpu
+target_vendor
+target_os
GPILOTD_CURRENT
GPILOTD_REVISION
GPILOTD_AGE
@@ -818,14 +830,6 @@
AWK
SET_MAKE
am__leading_dot
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
CC
CFLAGS
LDFLAGS
@@ -901,6 +905,12 @@
PKG_CONFIG
HAL_CFLAGS
HAL_LIBS
+GPILOTD_CONDUIT_CFLAGS
+GPILOTD_CONDUIT_LIBS
+GPILOTD_CFLAGS
+GPILOTD_LIBS
+GPILOTDCM_CFLAGS
+GPILOTDCM_LIBS
GNOME_PILOT_CFLAGS
GNOME_PILOT_LIBS
PILOT_APPLET_CFLAGS
@@ -953,6 +963,12 @@
PKG_CONFIG
HAL_CFLAGS
HAL_LIBS
+GPILOTD_CONDUIT_CFLAGS
+GPILOTD_CONDUIT_LIBS
+GPILOTD_CFLAGS
+GPILOTD_LIBS
+GPILOTDCM_CFLAGS
+GPILOTDCM_LIBS
GNOME_PILOT_CFLAGS
GNOME_PILOT_LIBS
PILOT_APPLET_CFLAGS
@@ -1524,6 +1540,7 @@
System types:
--build=BUILD configure for building on BUILD [guessed]
--host=HOST cross-compile to build programs to run on HOST [BUILD]
+ --target=TARGET configure for building compilers for TARGET [HOST]
_ACEOF
fi
@@ -1585,6 +1602,18 @@
PKG_CONFIG path to pkg-config utility
HAL_CFLAGS C compiler flags for HAL, overriding pkg-config
HAL_LIBS linker flags for HAL, overriding pkg-config
+ GPILOTD_CONDUIT_CFLAGS
+ C compiler flags for GPILOTD_CONDUIT, overriding pkg-config
+ GPILOTD_CONDUIT_LIBS
+ linker flags for GPILOTD_CONDUIT, overriding pkg-config
+ GPILOTD_CFLAGS
+ C compiler flags for GPILOTD, overriding pkg-config
+ GPILOTD_LIBS
+ linker flags for GPILOTD, overriding pkg-config
+ GPILOTDCM_CFLAGS
+ C compiler flags for GPILOTDCM, overriding pkg-config
+ GPILOTDCM_LIBS
+ linker flags for GPILOTDCM, overriding pkg-config
GNOME_PILOT_CFLAGS
C compiler flags for GNOME_PILOT, overriding pkg-config
GNOME_PILOT_LIBS
@@ -1658,7 +1687,7 @@
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.60a
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1672,7 +1701,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.60a. Invocation command line was
$ $0 $@
@@ -2017,6 +2046,164 @@
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+if test "${ac_cv_target+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "x$target_alias" = x; then
+ ac_cv_target=$ac_cv_host
+else
+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+echo "$as_me: error: invalid value of canonical target" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+target=$ac_cv_target
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+ test "$program_prefix$program_suffix$program_transform_name" = \
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+
GNOME_PILOT_MAJOR=2
GNOME_PILOT_REVISION=0
GNOME_PILOT_PATCHLEVEL=15
@@ -2051,37 +2238,6 @@
ac_config_headers="$ac_config_headers config.h"
am__api_version="1.7"
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
-
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -2549,127 +2705,44 @@
fi
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
{ echo "$as_me:$LINENO: result: $_am_result" >&5
@@ -3100,7 +3173,7 @@
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -3128,6 +3201,12 @@
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
+ ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3139,8 +3218,6 @@
fi
ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
@@ -4440,7 +4517,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4443 "configure"' > conftest.$ac_ext
+ echo '#line 4520 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4593,7 +4670,7 @@
lt_cv_cc_needs_belf=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -7392,11 +7469,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7395: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7472: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7399: \$? = $ac_status" >&5
+ echo "$as_me:7476: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7660,11 +7737,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7663: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7740: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7667: \$? = $ac_status" >&5
+ echo "$as_me:7744: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7764,11 +7841,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7767: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7844: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7771: \$? = $ac_status" >&5
+ echo "$as_me:7848: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8279,7 +8356,7 @@
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8354,7 +8431,7 @@
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -9619,7 +9696,7 @@
ac_cv_lib_dl_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -9730,7 +9807,7 @@
ac_cv_func_shl_load=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -9809,7 +9886,7 @@
ac_cv_lib_dld_shl_load=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -9910,7 +9987,7 @@
ac_cv_func_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -9989,7 +10066,7 @@
ac_cv_lib_dl_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -10069,7 +10146,7 @@
ac_cv_lib_svld_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -10149,7 +10226,7 @@
ac_cv_lib_dld_dld_link=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -10205,7 +10282,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:12753: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12680: \$? = $ac_status" >&5
+ echo "$as_me:12757: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12777,11 +12854,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12780: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12857: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12784: \$? = $ac_status" >&5
+ echo "$as_me:12861: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14338,11 +14415,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14341: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14418: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14345: \$? = $ac_status" >&5
+ echo "$as_me:14422: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14442,11 +14519,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14445: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14522: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14449: \$? = $ac_status" >&5
+ echo "$as_me:14526: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14947,7 +15024,7 @@
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -15012,7 +15089,7 @@
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -16661,11 +16738,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16664: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16741: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16668: \$? = $ac_status" >&5
+ echo "$as_me:16745: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16929,11 +17006,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16932: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17009: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16936: \$? = $ac_status" >&5
+ echo "$as_me:17013: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17033,11 +17110,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17036: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17113: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17040: \$? = $ac_status" >&5
+ echo "$as_me:17117: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17548,7 +17625,7 @@
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17623,7 +17700,7 @@
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -20130,7 +20207,7 @@
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
@@ -22520,7 +22597,7 @@
ac_cv_lib_pisock_pi_accept=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22801,76 +22878,510 @@
done
IFS=$as_save_IFS
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for HAL" >&5
+echo $ECHO_N "checking for HAL... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$HAL_CFLAGS"; then
+ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+ \$DBUS_REQUIRED
+ \$HAL_REQUIRED
+\"") >&5
+ ($PKG_CONFIG --exists --print-errors "
+ $DBUS_REQUIRED
+ $HAL_REQUIRED
+") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "
+ $DBUS_REQUIRED
+ $HAL_REQUIRED
+" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$HAL_LIBS"; then
+ pkg_cv_HAL_LIBS="$HAL_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+ \$DBUS_REQUIRED
+ \$HAL_REQUIRED
+\"") >&5
+ ($PKG_CONFIG --exists --print-errors "
+ $DBUS_REQUIRED
+ $HAL_REQUIRED
+") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "
+ $DBUS_REQUIRED
+ $HAL_REQUIRED
+" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+ $DBUS_REQUIRED
+ $HAL_REQUIRED
+"`
+ else
+ HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+ $DBUS_REQUIRED
+ $HAL_REQUIRED
+"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$HAL_PKG_ERRORS" >&5
+
+ :
+elif test $pkg_failed = untried; then
+ :
+else
+ HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
+ HAL_LIBS=$pkg_cv_HAL_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+ found_hal="yes"
+
+fi
+
+# Check whether --with-hal was given.
+if test "${with_hal+set}" = set; then
+ withval=$with_hal;
+if test x"$withval" = xyes; then
+ if test x"$found_hal" = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_HAL
+_ACEOF
+
+ with_hal=yes
+ else
+ { { echo "$as_me:$LINENO: error: HAL/DBUS Library requirements ($DBUS_REQUIRED, $HAL_REQUIRED)
+not met; consider using --without-hal option, or adjusting the PKG_CONFIG_PATH
+environment variable if your libraries are in a nonstandard prefix so pkg-config
+can find them." >&5
+echo "$as_me: error: HAL/DBUS Library requirements ($DBUS_REQUIRED, $HAL_REQUIRED)
+not met; consider using --without-hal option, or adjusting the PKG_CONFIG_PATH
+environment variable if your libraries are in a nonstandard prefix so pkg-config
+can find them." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+
+else
+
+if test x"$found_hal" = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_HAL
+_ACEOF
+
+ with_hal=yes
+else
+ { echo "$as_me:$LINENO: WARNING: HAL/DBUS Library requirements ($DBUS_REQUIRED, $HAL_REQUIRED)
+not met; disabling HAL support." >&5
+echo "$as_me: WARNING: HAL/DBUS Library requirements ($DBUS_REQUIRED, $HAL_REQUIRED)
+not met; disabling HAL support." >&2;}
+fi
+
+
+fi
+
+LIBXML_REQUIRED="libxml-2.0"
+LIBGTK_REQUIRED="gtk+-2.0 >= 2.0.0"
+LIBGNOME_REQUIRED="libgnome-2.0 >= 2.0.0"
+LIBGNOMEUI_REQUIRED="libgnomeui-2.0 >= 2.0.0"
+LIBGLADE_REQUIRED="libglade-2.0 >= 2.0.0"
+ORBIT_REQUIRED="ORBit-2.0 >= 2.0.0"
+LIBBONOBO_REQUIRED="libbonobo-2.0 >= 2.0.0"
+BONOBO_ACTIVATION_REQUIRED="bonobo-activation-2.0 >= 1.0.3"
+LIBPANELAPPLET_REQUIRED="libpanelapplet-2.0 >= 2.0.6"
+GCONF_REQUIRED="gconf-2.0"
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GPILOTD_CONDUIT" >&5
+echo $ECHO_N "checking for GPILOTD_CONDUIT... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GPILOTD_CONDUIT_CFLAGS"; then
+ pkg_cv_GPILOTD_CONDUIT_CFLAGS="$GPILOTD_CONDUIT_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+ \$LIBGNOME_REQUIRED
+ \$LIBGTK_REQUIRED
+\"") >&5
+ ($PKG_CONFIG --exists --print-errors "
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GPILOTD_CONDUIT_CFLAGS=`$PKG_CONFIG --cflags "
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GPILOTD_CONDUIT_LIBS"; then
+ pkg_cv_GPILOTD_CONDUIT_LIBS="$GPILOTD_CONDUIT_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+ \$LIBGNOME_REQUIRED
+ \$LIBGTK_REQUIRED
+\"") >&5
+ ($PKG_CONFIG --exists --print-errors "
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GPILOTD_CONDUIT_LIBS=`$PKG_CONFIG --libs "
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GPILOTD_CONDUIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+"`
+ else
+ GPILOTD_CONDUIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GPILOTD_CONDUIT_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+) were not met:
+
+$GPILOTD_CONDUIT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GPILOTD_CONDUIT_CFLAGS
+and GPILOTD_CONDUIT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+) were not met:
+
+$GPILOTD_CONDUIT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GPILOTD_CONDUIT_CFLAGS
+and GPILOTD_CONDUIT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GPILOTD_CONDUIT_CFLAGS
+and GPILOTD_CONDUIT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see .
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GPILOTD_CONDUIT_CFLAGS
+and GPILOTD_CONDUIT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see .
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ GPILOTD_CONDUIT_CFLAGS=$pkg_cv_GPILOTD_CONDUIT_CFLAGS
+ GPILOTD_CONDUIT_LIBS=$pkg_cv_GPILOTD_CONDUIT_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GPILOTD" >&5
+echo $ECHO_N "checking for GPILOTD... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GPILOTD_CFLAGS"; then
+ pkg_cv_GPILOTD_CFLAGS="$GPILOTD_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+ \$GNOMEVFS_REQUIRED
+ \$LIBGTK_REQUIRED
+\"") >&5
+ ($PKG_CONFIG --exists --print-errors "
+ $GNOMEVFS_REQUIRED
+ $LIBGTK_REQUIRED
+") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GPILOTD_CFLAGS=`$PKG_CONFIG --cflags "
+ $GNOMEVFS_REQUIRED
+ $LIBGTK_REQUIRED
+" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GPILOTD_LIBS"; then
+ pkg_cv_GPILOTD_LIBS="$GPILOTD_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+ \$GNOMEVFS_REQUIRED
+ \$LIBGTK_REQUIRED
+\"") >&5
+ ($PKG_CONFIG --exists --print-errors "
+ $GNOMEVFS_REQUIRED
+ $LIBGTK_REQUIRED
+") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GPILOTD_LIBS=`$PKG_CONFIG --libs "
+ $GNOMEVFS_REQUIRED
+ $LIBGTK_REQUIRED
+" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GPILOTD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+ $GNOMEVFS_REQUIRED
+ $LIBGTK_REQUIRED
+"`
+ else
+ GPILOTD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+ $GNOMEVFS_REQUIRED
+ $LIBGTK_REQUIRED
+"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GPILOTD_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (
+ $GNOMEVFS_REQUIRED
+ $LIBGTK_REQUIRED
+) were not met:
+
+$GPILOTD_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GPILOTD_CFLAGS
+and GPILOTD_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (
+ $GNOMEVFS_REQUIRED
+ $LIBGTK_REQUIRED
+) were not met:
+
+$GPILOTD_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GPILOTD_CFLAGS
+and GPILOTD_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
+Alternatively, you may set the environment variables GPILOTD_CFLAGS
+and GPILOTD_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- PKG_CONFIG=""
- fi
+To get pkg-config, see .
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GPILOTD_CFLAGS
+and GPILOTD_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+To get pkg-config, see .
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ GPILOTD_CFLAGS=$pkg_cv_GPILOTD_CFLAGS
+ GPILOTD_LIBS=$pkg_cv_GPILOTD_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
fi
+
pkg_failed=no
-{ echo "$as_me:$LINENO: checking for HAL" >&5
-echo $ECHO_N "checking for HAL... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for GPILOTDCM" >&5
+echo $ECHO_N "checking for GPILOTDCM... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
- if test -n "$HAL_CFLAGS"; then
- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
+ if test -n "$GPILOTDCM_CFLAGS"; then
+ pkg_cv_GPILOTDCM_CFLAGS="$GPILOTDCM_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
- \$DBUS_REQUIRED
- \$HAL_REQUIRED
+ \$LIBGNOME_REQUIRED
+ \$LIBGTK_REQUIRED
\"") >&5
($PKG_CONFIG --exists --print-errors "
- $DBUS_REQUIRED
- $HAL_REQUIRED
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "
- $DBUS_REQUIRED
- $HAL_REQUIRED
+ pkg_cv_GPILOTDCM_CFLAGS=`$PKG_CONFIG --cflags "
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
" 2>/dev/null`
else
pkg_failed=yes
@@ -22880,24 +23391,24 @@
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
- if test -n "$HAL_LIBS"; then
- pkg_cv_HAL_LIBS="$HAL_LIBS"
+ if test -n "$GPILOTDCM_LIBS"; then
+ pkg_cv_GPILOTDCM_LIBS="$GPILOTDCM_LIBS"
else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
- \$DBUS_REQUIRED
- \$HAL_REQUIRED
+ \$LIBGNOME_REQUIRED
+ \$LIBGTK_REQUIRED
\"") >&5
($PKG_CONFIG --exists --print-errors "
- $DBUS_REQUIRED
- $HAL_REQUIRED
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "
- $DBUS_REQUIRED
- $HAL_REQUIRED
+ pkg_cv_GPILOTDCM_LIBS=`$PKG_CONFIG --libs "
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
" 2>/dev/null`
else
pkg_failed=yes
@@ -22917,85 +23428,78 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
- $DBUS_REQUIRED
- $HAL_REQUIRED
+ GPILOTDCM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
"`
else
- HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
- $DBUS_REQUIRED
- $HAL_REQUIRED
+ GPILOTDCM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
"`
fi
# Put the nasty error message in config.log where it belongs
- echo "$HAL_PKG_ERRORS" >&5
+ echo "$GPILOTDCM_PKG_ERRORS" >&5
- :
-elif test $pkg_failed = untried; then
- :
-else
- HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
- HAL_LIBS=$pkg_cv_HAL_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { { echo "$as_me:$LINENO: error: Package requirements (
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+) were not met:
- found_hal="yes"
+$GPILOTDCM_PKG_ERRORS
-fi
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
-# Check whether --with-hal was given.
-if test "${with_hal+set}" = set; then
- withval=$with_hal;
-if test x"$withval" = xyes; then
- if test x"$found_hal" = xyes; then
+Alternatively, you may set the environment variables GPILOTDCM_CFLAGS
+and GPILOTDCM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+) were not met:
-cat >>confdefs.h <<\_ACEOF
-#define WITH_HAL
-_ACEOF
+$GPILOTDCM_PKG_ERRORS
- with_hal=yes
- else
- { { echo "$as_me:$LINENO: error: HAL/DBUS Library requirements ($DBUS_REQUIRED, $HAL_REQUIRED)
-not met; consider using --without-hal option, or adjusting the PKG_CONFIG_PATH
-environment variable if your libraries are in a nonstandard prefix so pkg-config
-can find them." >&5
-echo "$as_me: error: HAL/DBUS Library requirements ($DBUS_REQUIRED, $HAL_REQUIRED)
-not met; consider using --without-hal option, or adjusting the PKG_CONFIG_PATH
-environment variable if your libraries are in a nonstandard prefix so pkg-config
-can find them." >&2;}
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GPILOTDCM_CFLAGS
+and GPILOTDCM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
{ (exit 1); exit 1; }; }
- fi
-fi
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
-else
+Alternatively, you may set the environment variables GPILOTDCM_CFLAGS
+and GPILOTDCM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
-if test x"$found_hal" = xyes; then
+To get pkg-config, see .
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
-cat >>confdefs.h <<\_ACEOF
-#define WITH_HAL
-_ACEOF
+Alternatively, you may set the environment variables GPILOTDCM_CFLAGS
+and GPILOTDCM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
- with_hal=yes
+To get pkg-config, see .
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
else
- { echo "$as_me:$LINENO: WARNING: HAL/DBUS Library requirements ($DBUS_REQUIRED, $HAL_REQUIRED)
-not met; disabling HAL support." >&5
-echo "$as_me: WARNING: HAL/DBUS Library requirements ($DBUS_REQUIRED, $HAL_REQUIRED)
-not met; disabling HAL support." >&2;}
-fi
-
-
+ GPILOTDCM_CFLAGS=$pkg_cv_GPILOTDCM_CFLAGS
+ GPILOTDCM_LIBS=$pkg_cv_GPILOTDCM_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
fi
-LIBXML_REQUIRED="libxml-2.0"
-LIBGNOME_REQUIRED="libgnome-2.0 >= 2.0.0"
-LIBGNOMEUI_REQUIRED="libgnomeui-2.0 >= 2.0.0"
-LIBGLADE_REQUIRED="libglade-2.0 >= 2.0.0"
-ORBIT_REQUIRED="ORBit-2.0 >= 2.0.0"
-LIBBONOBO_REQUIRED="libbonobo-2.0 >= 2.0.0"
-BONOBO_ACTIVATION_REQUIRED="bonobo-activation-2.0 >= 1.0.3"
-LIBPANELAPPLET_REQUIRED="libpanelapplet-2.0 >= 2.0.6"
-GCONF_REQUIRED="gconf-2.0"
-
pkg_failed=no
{ echo "$as_me:$LINENO: checking for GNOME_PILOT" >&5
@@ -23208,6 +23712,12 @@
:
fi
+GPILOTD_CONDUIT_CFLAGS="$GPILOTD_CONDUIT_CFLAGS $PISOCK_CFLAGS"
+GPILOTD_CONDUIT_LIBS="$GPILOTD_CONDUIT_LIBS $PISOCK_LIBS"
+GPILOTDCM_CFLAGS="$GPILOTDCM_CFLAGS"
+GPILOTDCM_LIBS="$GPILOTDCM_LIBS"
+GPILOTD_CFLAGS="$GPILOTD_CFLAGS"
+GPILOTD_LIBS="$GPILOTD_LIBS"
GNOME_PILOT_CFLAGS="$GNOME_PILOT_CFLAGS $PISOCK_CFLAGS $HAL_CFLAGS"
GNOME_PILOT_LIBS="$GNOME_PILOT_LIBS $PISOCK_LIBS $HAL_LIBS"
@@ -23215,6 +23725,12 @@
+
+
+
+
+
+
pkg_failed=no
{ echo "$as_me:$LINENO: checking for PILOT_APPLET" >&5
echo $ECHO_N "checking for PILOT_APPLET... $ECHO_C" >&6; }
@@ -23846,7 +24362,7 @@
am_cv_val_LC_MESSAGES=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
@@ -24088,7 +24604,7 @@
gt_cv_func_ngettext_libc=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
@@ -24160,7 +24676,7 @@
gt_cv_func_dgettext_libc=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
@@ -24265,7 +24781,7 @@
eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
@@ -24359,7 +24875,7 @@
ac_cv_lib_intl_bindtextdomain=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -24437,7 +24953,7 @@
ac_cv_lib_intl_ngettext=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -24515,7 +25031,7 @@
ac_cv_lib_intl_dgettext=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -24606,7 +25122,7 @@
ac_cv_lib_intl_ngettext=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -24684,7 +25200,7 @@
ac_cv_lib_intl_dcgettext=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -24808,7 +25324,7 @@
eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
@@ -24984,7 +25500,7 @@
eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
@@ -25225,7 +25741,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
@@ -25246,7 +25762,7 @@
esac
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
@@ -25440,7 +25956,7 @@
ac_cv_lib_socket_sendmsg=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25560,7 +26076,7 @@
eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
@@ -25647,7 +26163,7 @@
ac_cv_lib_ufc_crypt=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25728,7 +26244,7 @@
ac_cv_lib_crypt_crypt=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26185,7 +26701,7 @@
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.60a. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -26214,7 +26730,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
+ -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
@@ -26238,7 +26754,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.60a,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
@@ -26483,6 +26999,18 @@
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+target!$target$ac_delim
+target_cpu!$target_cpu$ac_delim
+target_vendor!$target_vendor$ac_delim
+target_os!$target_os$ac_delim
GPILOTD_CURRENT!$GPILOTD_CURRENT$ac_delim
GPILOTD_REVISION!$GPILOTD_REVISION$ac_delim
GPILOTD_AGE!$GPILOTD_AGE$ac_delim
@@ -26510,14 +27038,6 @@
AWK!$AWK$ac_delim
SET_MAKE!$SET_MAKE$ac_delim
am__leading_dot!$am__leading_dot$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -26531,10 +27051,6 @@
AMDEP_TRUE!$AMDEP_TRUE$ac_delim
AMDEP_FALSE!$AMDEP_FALSE$ac_delim
AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-GREP!$GREP$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
@@ -26584,6 +27100,10 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
LN_S!$LN_S$ac_delim
ECHO!$ECHO$ac_delim
@@ -26642,6 +27162,12 @@
PKG_CONFIG!$PKG_CONFIG$ac_delim
HAL_CFLAGS!$HAL_CFLAGS$ac_delim
HAL_LIBS!$HAL_LIBS$ac_delim
+GPILOTD_CONDUIT_CFLAGS!$GPILOTD_CONDUIT_CFLAGS$ac_delim
+GPILOTD_CONDUIT_LIBS!$GPILOTD_CONDUIT_LIBS$ac_delim
+GPILOTD_CFLAGS!$GPILOTD_CFLAGS$ac_delim
+GPILOTD_LIBS!$GPILOTD_LIBS$ac_delim
+GPILOTDCM_CFLAGS!$GPILOTDCM_CFLAGS$ac_delim
+GPILOTDCM_LIBS!$GPILOTDCM_LIBS$ac_delim
GNOME_PILOT_CFLAGS!$GNOME_PILOT_CFLAGS$ac_delim
GNOME_PILOT_LIBS!$GNOME_PILOT_LIBS$ac_delim
PILOT_APPLET_CFLAGS!$PILOT_APPLET_CFLAGS$ac_delim
@@ -26671,11 +27197,52 @@
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -26693,7 +27260,7 @@
fi
cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
_ACEOF
sed '
@@ -26956,7 +27523,7 @@
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
--- gnome-pilot-2.0.15.orig/configure.in
+++ gnome-pilot-2.0.15/configure.in
@@ -1,5 +1,7 @@
AC_INIT(Makefile.am)
+AC_CANONICAL_TARGET
+
dnl ******************************
dnl Version
dnl ******************************
@@ -149,6 +151,7 @@
dnl Library Checks
dnl ******************************
LIBXML_REQUIRED="libxml-2.0"
+LIBGTK_REQUIRED="gtk+-2.0 >= 2.0.0"
LIBGNOME_REQUIRED="libgnome-2.0 >= 2.0.0"
LIBGNOMEUI_REQUIRED="libgnomeui-2.0 >= 2.0.0"
LIBGLADE_REQUIRED="libglade-2.0 >= 2.0.0"
@@ -158,7 +161,25 @@
LIBPANELAPPLET_REQUIRED="libpanelapplet-2.0 >= 2.0.6"
GCONF_REQUIRED="gconf-2.0"
-PKG_CHECK_MODULES(GNOME_PILOT,
+PKG_CHECK_MODULES(GPILOTD_CONDUIT,
+[
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+])
+
+PKG_CHECK_MODULES(GPILOTD,
+[
+ $GNOMEVFS_REQUIRED
+ $LIBGTK_REQUIRED
+])
+
+PKG_CHECK_MODULES(GPILOTDCM,
+[
+ $LIBGNOME_REQUIRED
+ $LIBGTK_REQUIRED
+])
+
+PKG_CHECK_MODULES(GNOME_PILOT,
[
$LIBXML_REQUIRED
$LIBGNOME_REQUIRED
@@ -171,9 +192,21 @@
$GCONF_REQUIRED
])
+GPILOTD_CONDUIT_CFLAGS="$GPILOTD_CONDUIT_CFLAGS $PISOCK_CFLAGS"
+GPILOTD_CONDUIT_LIBS="$GPILOTD_CONDUIT_LIBS $PISOCK_LIBS"
+GPILOTDCM_CFLAGS="$GPILOTDCM_CFLAGS"
+GPILOTDCM_LIBS="$GPILOTDCM_LIBS"
+GPILOTD_CFLAGS="$GPILOTD_CFLAGS"
+GPILOTD_LIBS="$GPILOTD_LIBS"
GNOME_PILOT_CFLAGS="$GNOME_PILOT_CFLAGS $PISOCK_CFLAGS $HAL_CFLAGS"
GNOME_PILOT_LIBS="$GNOME_PILOT_LIBS $PISOCK_LIBS $HAL_LIBS"
+AC_SUBST(GPILOTD_CONDUIT_CFLAGS)
+AC_SUBST(GPILOTD_CONDUIT_LIBS)
+AC_SUBST(GPILOTDCM_CFLAGS)
+AC_SUBST(GPILOTDCM_LIBS)
+AC_SUBST(GPILOTD_CFLAGS)
+AC_SUBST(GPILOTD_LIBS)
AC_SUBST(GNOME_PILOT_CFLAGS)
AC_SUBST(GNOME_PILOT_LIBS)
--- gnome-pilot-2.0.15.orig/debian/gnome-pilot.prerm
+++ gnome-pilot-2.0.15/debian/gnome-pilot.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/gnome-pilot ]; then
+ rm -f /usr/doc/gnome-pilot
+fi
+
+#DEBHELPER#
--- gnome-pilot-2.0.15.orig/debian/gnome-pilot-applet.1
+++ gnome-pilot-2.0.15/debian/gnome-pilot-applet.1
@@ -0,0 +1,9 @@
+.TH GNOME-PILOT-APPLET 1 "May 06, 2000"
+.SH NAME
+gnome-pilot \- GNOME applet to manipulate a Palm PDA
+.SH DESCRIPTION
+This is one of many applets for gnome-pilot. You should be using it
+from within another program, most likely gnome-pilot's configuration.
+.SH AUTHOR
+This manual page was written by Mike Markley ,
+for the Debian GNU/Linux system (but may be used by others).
--- gnome-pilot-2.0.15.orig/debian/libgnome-pilot2-dev.files
+++ gnome-pilot-2.0.15/debian/libgnome-pilot2-dev.files
@@ -0,0 +1,7 @@
+usr/lib/lib*.a
+usr/lib/lib*.la
+usr/lib/lib*.so
+usr/lib/gnome-pilot/conduits/lib*.a
+usr/lib/gnome-pilot/conduits/lib*.la
+usr/include
+usr/lib/pkgconfig
--- gnome-pilot-2.0.15.orig/debian/gnome-pilot.dirs
+++ gnome-pilot-2.0.15/debian/gnome-pilot.dirs
@@ -0,0 +1 @@
+usr/share/lintian/overrides
--- gnome-pilot-2.0.15.orig/debian/copyright
+++ gnome-pilot-2.0.15/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Mike Markley on
+Thu, 13 Apr 2000 17:16:18 -0700.
+
+It was downloaded from http://www.eskil.org/gnome-pilot/download/tarballs/
+
+Upstream Authors: Eskil Heyn Olsen (lead developer)
+ Manish Vachharajani
+ Neil Vachharajani
+ Michael Fulbright
+ Jonathan
+ Vadim Strizhevsky (developer)
+ Dave Camp (USB support)
+ JP Rosevear
+
+Copyright:
+
+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 General Public License for more details.
+
+A copy of the GNU General Public License, version 2, can be found in
+/usr/share/common-licenses/GPL or in the COPYING file included with the
+source.
--- gnome-pilot-2.0.15.orig/debian/changelog
+++ gnome-pilot-2.0.15/debian/changelog
@@ -0,0 +1,411 @@
+gnome-pilot (2.0.15-0ubuntu1) feisty; urgency=low
+
+ * New upstream release: 2.0.15 'Alice'
+ - Fix memory leak in the usbfs scanning code
+ - Add a 400ms pause between HAL detection of a USB device and the first
+ attempt to sync. Several devices were reported to reset themselves if
+ communication was attempted too soon after the first appearance of the
+ USB device.
+ - Fix a long-standing bug that probably turned up now because of the
+ multiple attempts to add a new pilot due to #362565. Avoid accessing
+ freed memory when the 'add pilot' dialog is opened multiple times.
+ - Tweaks to window placement to support multihead displays. Also, added
+ missing description to .server file for panel applet.
+ - Fix another long-standing bug, that could cause garbage to be shown
+ when a configured conduit was unavailable (e.g. if the .conduit files
+ were in the wrong place after an upgrade).
+ - Fix distcheck target
+ - New translation: ar.
+ - Updated translations: sv, en_GB, hu, fi, ca, es, ne, it, el.
+ * debian/rules: bump shlibs.
+ * Resynchronized with Debian, only Ubuntu changes are:
+ - applet/GNOME_PilotApplet.server.in.in,
+ debian/patches/01_applet_category.patch: changed applet category.
+ - debian/control: drop libglade-gnome0-dev, libgnorba-dev, gdk-imlib1-dev
+ from Build-Depends.
+ - debian/rules: translation related changes: generate .pot file, set
+ gettext domain, etc.
+
+ -- Daniel Holbach Thu, 23 Nov 2006 08:30:32 +0100
+
+gnome-pilot (2.0.14-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release:
+ - Add support for libusb syncing with pilot-link 0.12.x
+ - Fix network hotsync. Use pilot-link to create the listen socket
+ by binding to port "net:". (Closes: #115763, #288820)
+ - HAL is used by default for detecting USB connections
+ - Fix applet message area, and fix transparency for applet panel
+ icon.
+ - Ported to the pilot-link 0.12.0 API, with continuing support for
+ 0.11.* (Closes: #386201)
+ - Big cleanup of the UI, to make it more compatible with the HIG.
+ - Improve robustness of binding, by attempting to connect multiple
+ times. This can solve problems where, for example, HAL
+ notifications are received before the device is ready for binding
+ - Support for international character sets, with pilot-link 0.12.x.
+ Users should set the PILOT_CHARSET to an appropriate value (i.e.
+ one recognised by iconv).
+ - More devices added to devices.xml. (Closes: #276730, #296680,
+ #300164, #335224)
+ - Dropping .prc file on gpilot-applet is fixed. (Closes: #237631)
+ - gpilot-applet does not crash anymore with a left-click from
+ toolbar. (Closes: #230736)
+ * debian/control:
+ - add libdbus-glib-1-dev, libhal-dev and libusb-dev to the
+ Build-Depends.
+ - bump Build-Depends on libpisock-dev. Build against pilot-link >=
+ 0.12.0 which shoud fix problems with databases > 64KB. (Closes:
+ 263306)
+ - Add libusb-dev to the Depends line of libgnome-pilot-dev.
+ * debian/rules:
+ - remove GNOME_PILOT_CFLAGS setting as it breaks the build.
+ - only call distclean when the Makefile as exists.
+ - remove files generated during build to keep diff.gz clean and tiny.
+ * Update patches for new upstream version.
+ * Relibtoolize package (needed for the pacthes) by doing
+ libtoolize --copy --force ; aclocal-1.7 ; autoconf and
+ rm -rf autom4te.cache
+
+ -- Arjan Oosting Mon, 18 Sep 2006 03:52:39 +0200
+
+gnome-pilot (2.0.12-1.6) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Update readline build-dep to libreadline5-dev (Closes: #346263).
+
+ -- Luk Claes Sat, 7 Jan 2006 00:13:25 +0100
+
+gnome-pilot (2.0.12-1.5) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Remove bonobo-activation build-dep as it is now included in
+ libbonobo2-dev (Closes: #332808)
+
+ -- Luk Claes Wed, 28 Dec 2005 18:00:16 +0100
+
+gnome-pilot (2.0.12-1.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Run AC_CANONICAL_TARGET to avoid an implicitly converted pointer which
+ will cause a segfault on some 64-bit systems. Patch from David Mosberger.
+
+ -- dann frazier Thu, 8 Sep 2005 09:19:01 -0600
+
+gnome-pilot (2.0.12-1.3) unstable; urgency=low
+
+ * NMU
+ * debian/gnome-pilot.conffiles:
+ - the schemas is not a conffile.
+ * debian/rules:
+ - use dh_gconf to register the schemas, fix a crasher (Closes: #313075).
+
+ -- Sebastien Bacher Sat, 9 Jul 2005 16:56:11 +0200
+
+gnome-pilot (2.0.12-1.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Recompile to get rid of libhowl0 dependency (Closes: #298848)
+
+ -- Frank Lichtenheld Fri, 18 Mar 2005 22:13:32 +0100
+
+gnome-pilot (2.0.12-1.1) unstable; urgency=high
+
+ * Non-Maintainer Upload (BSP)
+ * Added build-dependency on intltool, as suggested by Stephen Quinney
+ (closes: #287059)
+
+ -- Bas Zoetekouw Sat, 8 Jan 2005 00:23:48 +0000
+
+gnome-pilot (2.0.12-1) unstable; urgency=low
+
+ * New upstream version.
+ * Reorder build-depends to libreadline4-dev | libreadline-dev
+ Closes: #279414
+ * From NMU: Please use gcrypt11/gnutls11 instead of gcrypt7/gnutls10
+ - depend on libgnomeui-dev (>= 2.6.1.1-4) (Closes: #263643)
+
+ -- Mike Markley Thu, 11 Nov 2004 20:55:14 -0800
+
+gnome-pilot (2.0.10-6.1) unstable; urgency=medium
+
+ * NMU.
+ * Closes: #263643: Please use gcrypt11/gnutls11 instead of gcrypt7/gnutls10
+ - depend on libgnomeui-dev (>= 2.6.1.1-4)
+
+ -- Matthias Urlichs Fri, 13 Aug 2004 09:58:24 +0200
+
+gnome-pilot (2.0.10-6) unstable; urgency=low
+
+ * Add Makefile.in hack to resolve the last few missing symbols
+ in libgpilotdcm (Closes: #220061), thanks to Yannick Brosseau
+ * Fix gcc 3.4 FTBFS (Closes: #258792)
+
+ -- Mike Markley Mon, 26 Jul 2004 01:05:57 -0700
+
+gnome-pilot (2.0.10-5) unstable; urgency=low
+
+ * Added new vendor ID/prod ID info for Treo 600 and Clie UX50.
+ Closes: #243421
+
+ -- Mike Markley Sun, 6 Jun 2004 16:46:59 -0700
+
+gnome-pilot (2.0.10-4) unstable; urgency=low
+
+ * Patch to link libs against all required library dependencies.
+ This fixes 99% of the missing symbols in #220061. The remaining
+ missing symbols require a major change to the layout of the source
+ tree, so I have engaged upstream in discussions about it.
+
+ -- Mike Markley Sun, 15 Feb 2004 02:09:48 -0800
+
+gnome-pilot (2.0.10-3) unstable; urgency=low
+
+ * Add call to dh_scrollkeeper to fix DTD reference in .xml files
+ (Closes: #219157)
+
+ -- Mike Markley Sat, 22 Nov 2003 07:32:19 -0800
+
+gnome-pilot (2.0.10-2) unstable; urgency=low
+
+ * Better wording in descriptions + recommends: on -conduits
+ * Applied patch for bad memo_file crash handling
+ * Removed the REALLY old warning about 0.1.62 problems, the
+ dh_debconf call, the override, and the postinst
+ * Bumped priority on -dev to extra since libpisock-dev is same
+
+ -- Mike Markley Fri, 29 Aug 2003 22:53:27 -0700
+
+gnome-pilot (2.0.10-1) unstable; urgency=low
+
+ * New upstream version.
+ * Moved -dev package to section libdevel
+
+ -- Mike Markley Thu, 17 Jul 2003 21:04:00 -0700
+
+gnome-pilot (2.0.9-2) unstable; urgency=low
+
+ * Added libpisock-dev to -dev package dependencies since build
+ spec includes -I and -l flags relating to it (Closes: #196855)
+
+ -- Mike Markley Wed, 11 Jun 2003 21:58:52 -0700
+
+gnome-pilot (2.0.9-1) unstable; urgency=low
+
+ * New upstream version.
+ * This version now supports Gnome 2 (Closes: #173621, #178942, #187878)
+ * Library is now libgnome-pilot2
+
+ -- Mike Markley Sat, 24 May 2003 04:02:38 -0700
+
+gnome-pilot (0.1.71-5) unstable; urgency=low
+
+ * Patched to skip building the applet entirely, since old
+ libpanel-applet is gone from the distribution. It will be
+ re-enabled when upstream's GNOME2 support is finished.
+
+ -- Mike Markley Sun, 2 Feb 2003 19:07:09 -0800
+
+gnome-pilot (0.1.71-4) unstable; urgency=low
+
+ * Added temporary libreadline build-dep, also due to pilot-link's
+ .la files (Closes: #176234)
+ * Updated libtool (Closes: #176728)
+
+ -- Mike Markley Sat, 18 Jan 2003 12:04:59 -0800
+
+gnome-pilot (0.1.71-3) unstable; urgency=low
+
+ * Added temporary libncurses-dev build-dep to be removed when
+ pilot-link's .la files are fixed (Closes: #174903)
+
+ -- Mike Markley Mon, 6 Jan 2003 00:45:39 -0800
+
+gnome-pilot (0.1.71-2) unstable; urgency=low
+
+ * Updated config.guess/sub (Closes: #172492, #174207)
+
+ -- Mike Markley Tue, 31 Dec 2002 20:24:13 -0800
+
+gnome-pilot (0.1.71-1) unstable; urgency=low
+
+ * New upstream version
+ * Removed pisync flags patch and vfs patch since they are integrated
+ upstream
+
+ -- Mike Markley Mon, 16 Dec 2002 11:27:20 -0800
+
+gnome-pilot (0.1.70-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Mike Markley Thu, 5 Dec 2002 22:28:54 -0800
+
+gnome-pilot (0.1.69-1) unstable; urgency=low
+
+ * New upstream version
+ * Updated to libcapplet1 (Closes: #168753, #164633)
+
+ -- Mike Markley Tue, 12 Nov 2002 21:42:14 -0800
+
+gnome-pilot (0.1.67-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Mike Markley Wed, 30 Oct 2002 22:46:07 -0800
+
+gnome-pilot (0.1.66-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Mike Markley Wed, 25 Sep 2002 22:52:51 -0700
+
+gnome-pilot (0.1.65-3) unstable; urgency=low
+
+ * Uh too directly cut-and-pasted the examples for the doc-symlink
+ handling
+
+ -- Mike Markley Wed, 11 Sep 2002 22:04:32 -0700
+
+gnome-pilot (0.1.65-2) unstable; urgency=low
+
+ * Hacked aclocal.m4 to use -lpisync as well as -lpisock
+ Closes: #158212, #157424, probably others that I'll remember
+ later
+ * Added gettext build-dep (Closes: #159227)
+
+ -- Mike Markley Tue, 27 Aug 2002 03:57:23 -0700
+
+gnome-pilot (0.1.65-1) unstable; urgency=low
+
+ * New upstream version.
+ * Added AC_SUBST(OBJEXT) to configure.in to fix applet/Makefile
+ breakage
+ * Fixed patchlevel version in configure.in
+ * Added --enable-usb to configure flags (Closes: #136752)
+
+ -- Mike Markley Tue, 30 Apr 2002 11:44:07 -0700
+
+gnome-pilot (0.1.64-2) unstable; urgency=low
+
+ * Typo fixes in Description (Closes: #124965, #124965)
+
+ -- Mike Markley Wed, 19 Dec 2001 01:36:53 -0800
+
+gnome-pilot (0.1.64-1) unstable; urgency=low
+
+ * New upstream version.
+ * Updated config script to only warn when appropriate
+ * Added German debconf template (Closes: #119940)
+
+ -- Mike Markley Sat, 15 Dec 2001 02:46:06 -0800
+
+gnome-pilot (0.1.63-1) unstable; urgency=high
+
+ * Fix to file/backup conduit that omits a key struct and
+ therefore caused crashes on file uploads and corrupted
+ backups (Closes: #117608)
+
+ -- Mike Markley Tue, 6 Nov 2001 02:06:44 -0800
+
+gnome-pilot (0.1.62-2) unstable; urgency=low
+
+ * Built with VFS (Closes: #116175)
+ * Fixed typo usr/inlude in aclocal.m4
+ * Fixed configure.in typos that were preventing --with-vfs under
+ any circumstances
+ * Changed priority to extra
+
+ -- Mike Markley Fri, 19 Oct 2001 01:55:20 -0700
+
+gnome-pilot (0.1.62-1.1) unstable; urgency=low
+
+ * NMU
+ * Add Build-Dep: gdk-imlib-dev. Closes: #116491
+ * re-run libtoolize & aclocal for new arch support.
+
+ -- LaMont Jones Sun, 21 Oct 2001 10:56:06 -0600
+
+gnome-pilot (0.1.62-1) unstable; urgency=low
+
+ * New upstream version
+ * Upstream library version number bumped, so we're now building as
+ libgnome-pilot1{,-dev}
+ * Changed sections on lib packages to appropriate values.
+ Closes: #113619
+ * USB support (as well as IRDA) are now enabled by default by
+ upstream. Closes: #68859
+ * Minor clarification to doc path and a typo fix in manpages.
+ Closes: #113625
+
+ -- Mike Markley Thu, 11 Oct 2001 23:34:30 -0700
+
+gnome-pilot (0.1.54-2) unstable; urgency=low
+
+ * Rebuilt against new libpisock (Closes: #102415, #103091)
+ * Updated to standards-version 3.5.2
+ * Slightly loosened version restricton in shlibs file (no Debian
+ revision), and excluded internally-used conduit module libraries
+ * Apparently I hadn't added debhelper to Build-Depends yet...
+ whoops. Closes: #68866
+
+ -- Mike Markley Mon, 2 Jul 2001 02:21:48 -0700
+
+gnome-pilot (0.1.54-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Mike Markley Mon, 7 Aug 2000 22:16:57 -0700
+
+gnome-pilot (0.1.52-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Mike Markley Tue, 23 May 2000 15:54:12 -0700
+
+gnome-pilot (0.1.51-3) unstable; urgency=low
+
+ * Moved /usr/lib/gpilotConf.sh into the -dev package
+
+ -- Mike Markley Mon, 22 May 2000 13:18:45 -0700
+
+gnome-pilot (0.1.51-2) unstable; urgency=low
+
+ * Moved conduit .so libraries into gnome-pilot and ditched the custom
+ .conduit files
+ * Added generic manpage for the conduits' binaries
+
+ -- Mike Markley Mon, 22 May 2000 13:11:17 -0700
+
+gnome-pilot (0.1.51-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Mike Markley Sat, 6 May 2000 18:02:32 -0700
+
+gnome-pilot (0.1.50-3) unstable; urgency=low
+
+ * Added custom .conduit files to work around policy violation in
+ upstream
+
+ -- Mike Markley Wed, 3 May 2000 15:02:19 -0700
+
+gnome-pilot (0.1.50-2) unstable; urgency=low
+
+ * Minor bugfixes, typos, packaging issues
+
+ -- Mike Markley Fri, 28 Apr 2000 16:41:31 -0700
+
+gnome-pilot (0.1.50-1) unstable; urgency=low
+
+ * Initial Release.
+ * Split into three packages: Binary, library, and static libraries
+ * Used the debian/rules libtool workaround suggested by lintian
+ * Added a generic manpage and symlinked it for all binaries
+
+ -- Mike Markley Thu, 27 Apr 2000 00:42:58 -0700
+
+Local variables:
+mode: debian-changelog
+End:
--- gnome-pilot-2.0.15.orig/debian/rules
+++ gnome-pilot-2.0.15/debian/rules
@@ -0,0 +1,76 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+export DH_COMPAT=2
+
+GETTEXT_DOMAIN=gnome-pilot
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+
+ CFLAGS="-I/usr/include/libpisock" \
+ ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=\$${prefix}/bin --enable-usb --disable-dependency-tracking
+ sed < libtool > libtool-2 \
+ -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
+ -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/'
+ mv libtool-2 libtool
+ chmod 755 libtool
+
+ $(MAKE)
+
+ # Generate POT file for translators
+ cd po; intltool-update --verbose -p
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ [ ! -f Makefile ] || $(MAKE) distclean
+ rm -f applet/GNOME_PilotApplet.server.in applet/GNOME_PilotApplet.server applet/pilot.schemas \
+ capplet/gpilotd-control-applet.desktop conduits/backup/backup.conduit conduits/file/file.conduit \
+ conduits/file/palm.keys conduits/test/test.conduit gpilotd/GNOME_Pilot_Daemon.server \
+ gpilotd/GNOME_Pilot_Daemon.server.in help/C/gnome-pilot-C.omf.out
+
+ dh_clean config.cache
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) install DESTDIR=`pwd`/debian/gnome-pilot
+
+ dh_movefiles --sourcedir=debian/gnome-pilot
+
+binary-indep: build install
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installmanpages -pgnome-pilot
+ dh_installinfo
+ dh_installchangelogs ChangeLog
+ dh_scrollkeeper
+ dh_gconf
+ dh_strip
+ dh_compress
+ dh_link
+ echo 'X-Ubuntu-Gettext-Domain=$(GETTEXT_DOMAIN)' >> `pwd`/debian/gnome-pilot/usr/share/applications/gpilotd-control-applet.desktop
+ sed -i "s///= 2.0.15)"
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps -ldebian/libgnome-pilot2/usr/lib
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- gnome-pilot-2.0.15.orig/debian/gnome-pilot.1
+++ gnome-pilot-2.0.15/debian/gnome-pilot.1
@@ -0,0 +1,11 @@
+.TH GNOME-PILOT 1 "April 27, 2000"
+.SH NAME
+gnome-pilot \- GNOME applet to manipulate a Palm PDA
+.SH DESCRIPTION
+The gnome-pilot package contains numerous programs, all of which you
+should be running from GNOME.
+.SH SEE ALSO
+Please see /usr/share/doc/gnome-pilot/ for full instructions.
+.SH AUTHOR
+This manual page was written by Mike Markley ,
+for the Debian GNU/Linux system (but may be used by others).
--- gnome-pilot-2.0.15.orig/debian/gnome-pilot.docs
+++ gnome-pilot-2.0.15/debian/gnome-pilot.docs
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO
--- gnome-pilot-2.0.15.orig/debian/libgnome-pilot2.postinst
+++ gnome-pilot-2.0.15/debian/libgnome-pilot2.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+[ "$1" = "configure" ] && [ -x /sbin/ldconfig ] && /sbin/ldconfig
+
+#DEBHELPER#
--- gnome-pilot-2.0.15.orig/debian/libgnome-pilot2-dev.README.Debian
+++ gnome-pilot-2.0.15/debian/libgnome-pilot2-dev.README.Debian
@@ -0,0 +1,7 @@
+libgnome-pilot for Debian
+----------------------
+
+This package contains the libraries and headers needed to build gnome-pilot or
+programs built upon its framework.
+
+ -- Mike Markley , Thu, 13 Apr 2000 17:16:18 -0700
--- gnome-pilot-2.0.15.orig/debian/control
+++ gnome-pilot-2.0.15/debian/control
@@ -0,0 +1,43 @@
+Source: gnome-pilot
+Section: gnome
+Priority: extra
+Maintainer: Mike Markley
+Build-Depends: debhelper (>= 2.0), gob2, libpisock-dev (>= 0.12.0), libglade2-dev, libgnome2-dev, libgnomevfs2-dev, libpanel-applet2-dev (>= 2.0.6), libbonobo2-dev, liborbit2-dev, libgnomeui-dev (>= 2.6.1.1-4), gettext, libncurses-dev | libncurses5-dev, libreadline5-dev | libreadline-dev, scrollkeeper, intltool, libdbus-glib-1-dev, libhal-dev, libusb-dev
+Standards-Version: 3.6.1
+
+Package: gnome-pilot
+Architecture: any
+Recommends: gnome-pilot-conduits
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libgnome-pilot0 (<= 0.1.51-2)
+Description: A GNOME applet for management of your Palm PDA
+ gnome-pilot is a GNOME applet with a daemon that monitors for
+ connections from a PalmOS-based device. It features a conduit
+ system, although it contains only basic conduits.
+ .
+ gnome-pilot-conduits is recommended for a full set of conduits.
+ .
+ pilot-link is used to make the connection to the device, and as
+ such, this package should work with serial devices, USB devices
+ given proper kernel support, and with XCopilot. See the package
+ documentation or pilot-link's documentation for more information
+ on configuring various types of interfaces.
+
+Package: libgnome-pilot2
+Architecture: any
+Section: libs
+Priority: optional
+Depends: ${shlibs:Depends}
+Description: Support libraries for gnome-pilot
+ This package contains a set of shared libraries required for proper
+ operation of the gnome-pilot package and its conduits and add-ons.
+
+Package: libgnome-pilot2-dev
+Architecture: any
+Section: libdevel
+Depends: libgnome-pilot2 (= ${Source-Version}), libc6-dev, libpisock-dev, libusb-dev
+Provides: libgnome-pilot-dev
+Conflicts: libgnome-pilot-dev
+Description: Development libraries for gnome-pilot
+ This package contains the development libraries and headers required
+ to build gnome-pilot conduits and anything else using its libraries.
--- gnome-pilot-2.0.15.orig/debian/libgnome-pilot2.files
+++ gnome-pilot-2.0.15/debian/libgnome-pilot2.files
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
--- gnome-pilot-2.0.15.orig/debian/libgnome-pilot2.README.Debian
+++ gnome-pilot-2.0.15/debian/libgnome-pilot2.README.Debian
@@ -0,0 +1,7 @@
+libgnome-pilot for Debian
+----------------------
+
+This package contains the runtime files needed by gnome-pilot or by other
+programs built upon its framework.
+
+ -- Mike Markley , Thu, 13 Apr 2000 17:16:18 -0700
--- gnome-pilot-2.0.15.orig/debian/README.Debian
+++ gnome-pilot-2.0.15/debian/README.Debian
@@ -0,0 +1,12 @@
+gnome-pilot for Debian
+----------------------
+
+This package contains the binaries needed to run gnome-pilot (including the
+program itself). The libgnome-pilot0 package contains the runtime libraries
+required by gnome-pilot. For a quick-start guide, see
+/usr/share/doc/gnome-pilot/README.gz.
+
+For the moment, the libgpilotdcm Makefile.in must be patched from
+debian/patches/gp-missingsymbol after running automake. This resolves
+the issues with libgpilotdcm requiring symbols provided by libgpilotd,
+which is built later.
--- gnome-pilot-2.0.15.orig/debian/gnome-pilot.links
+++ gnome-pilot-2.0.15/debian/gnome-pilot.links
@@ -0,0 +1,14 @@
+/usr/share/man/man1/gnome-pilot-applet.1.gz /usr/share/man/man1/backup-conduit-control-applet.1.gz
+/usr/share/man/man1/gnome-pilot-applet.1.gz /usr/share/man/man1/email-conduit-control-applet.1.gz
+/usr/share/man/man1/gnome-pilot-applet.1.gz /usr/share/man/man1/expense-conduit-control-applet.1.gz
+/usr/share/man/man1/gnome-pilot-applet.1.gz /usr/share/man/man1/file-conduit-control-applet.1.gz
+/usr/share/man/man1/gnome-pilot.1.gz /usr/share/man/man1/gnome-pilot-config.1.gz
+/usr/share/man/man1/gnome-pilot.1.gz /usr/share/man/man1/gnome-pilot-make-password.1.gz
+/usr/share/man/man1/gnome-pilot.1.gz /usr/share/man/man1/gpilotd.1.gz
+/usr/share/man/man1/gnome-pilot.1.gz /usr/share/man/man1/gpilotd-client.1.gz
+/usr/share/man/man1/gnome-pilot.1.gz /usr/share/man/man1/gpilot-applet.1.gz
+/usr/share/man/man1/gnome-pilot-applet.1.gz /usr/share/man/man1/gpilotd-control-applet.1.gz
+/usr/share/man/man1/gnome-pilot.1.gz /usr/share/man/man1/gpilotd-session-wrapper.1.gz
+/usr/share/man/man1/gnome-pilot.1.gz /usr/share/man/man1/gpilotdcm-client.1.gz
+/usr/share/man/man1/gnome-pilot-applet.1.gz /usr/share/man/man1/memo_file_capplet.1.gz
+/usr/share/man/man1/gnome-pilot-applet.1.gz /usr/share/man/man1/pilot_applet.1.gz
--- gnome-pilot-2.0.15.orig/debian/patches/gp-link
+++ gnome-pilot-2.0.15/debian/patches/gp-link
@@ -0,0 +1,100 @@
+--- gnome-pilot-2.0.14.orig/gpilotd/Makefile.am
++++ gnome-pilot-2.0.14/gpilotd/Makefile.am
+@@ -113,6 +113,8 @@
+ libgpilotd_la_LDFLAGS = \
+ -version-info $(GPILOTD_CURRENT):$(GPILOTD_REVISION):$(GPILOTD_AGE)
+
++libgpilotd_la_LIBADD = $(GPILOTD_LIBS)
++
+ ## LIBGPILOTDCONDUIT
+ libgpilotdconduit_la_SOURCES = \
+ $(GOB_GPILOTD_CONDUIT_SRCS) \
+@@ -142,6 +144,8 @@
+ libgpilotdconduit_la_LDFLAGS = \
+ -version-info $(GPILOTD_CONDUIT_CURRENT):$(GPILOTD_CONDUIT_REVISION):$(GPILOTD_CONDUIT_AGE)
+
++libgpilotdconduit_la_LIBADD = $(GPILOTD_CONDUIT_LIBS)
++
+ ###
+
+ noinst_HEADERS = gnome-pilot-conduit-backup-private.h
+--- gnome-pilot-2.0.14.orig/libgpilotdCM/Makefile.am
++++ gnome-pilot-2.0.14/libgpilotdCM/Makefile.am
+@@ -43,5 +43,10 @@
+ libgpilotdcm_la_LDFLAGS = \
+ -version-info $(GPILOTD_CM_CURRENT):$(GPILOTD_CM_REVISION):$(GPILOTD_CM_AGE)
+
++libgpilotdcm_la_LIBADD = \
++ $(GPILOTDCM_LIBS)
++
++libgpilotdcm_la_LIBADD = $(GPILOTDCM_LIBS)
++
+ EXTRA_DIST = \
+ $(gobfiles)
+--- gnome-pilot-2.0.14.orig/configure.in
++++ gnome-pilot-2.0.14/configure.in
+@@ -1,5 +1,7 @@
+ AC_INIT(Makefile.am)
+
++AC_CANONICAL_TARGET
++
+ dnl ******************************
+ dnl Version
+ dnl ******************************
+@@ -149,6 +151,7 @@
+ dnl Library Checks
+ dnl ******************************
+ LIBXML_REQUIRED="libxml-2.0"
++LIBGTK_REQUIRED="gtk+-2.0 >= 2.0.0"
+ LIBGNOME_REQUIRED="libgnome-2.0 >= 2.0.0"
+ LIBGNOMEUI_REQUIRED="libgnomeui-2.0 >= 2.0.0"
+ LIBGLADE_REQUIRED="libglade-2.0 >= 2.0.0"
+@@ -158,7 +161,25 @@
+ LIBPANELAPPLET_REQUIRED="libpanelapplet-2.0 >= 2.0.6"
+ GCONF_REQUIRED="gconf-2.0"
+
+-PKG_CHECK_MODULES(GNOME_PILOT,
++PKG_CHECK_MODULES(GPILOTD_CONDUIT,
++[
++ $LIBGNOME_REQUIRED
++ $LIBGTK_REQUIRED
++])
++
++PKG_CHECK_MODULES(GPILOTD,
++[
++ $GNOMEVFS_REQUIRED
++ $LIBGTK_REQUIRED
++])
++
++PKG_CHECK_MODULES(GPILOTDCM,
++[
++ $LIBGNOME_REQUIRED
++ $LIBGTK_REQUIRED
++])
++
++PKG_CHECK_MODULES(GNOME_PILOT,
+ [
+ $LIBXML_REQUIRED
+ $LIBGNOME_REQUIRED
+@@ -171,9 +192,21 @@
+ $GCONF_REQUIRED
+ ])
+
++GPILOTD_CONDUIT_CFLAGS="$GPILOTD_CONDUIT_CFLAGS $PISOCK_CFLAGS"
++GPILOTD_CONDUIT_LIBS="$GPILOTD_CONDUIT_LIBS $PISOCK_LIBS"
++GPILOTDCM_CFLAGS="$GPILOTDCM_CFLAGS"
++GPILOTDCM_LIBS="$GPILOTDCM_LIBS"
++GPILOTD_CFLAGS="$GPILOTD_CFLAGS"
++GPILOTD_LIBS="$GPILOTD_LIBS"
+ GNOME_PILOT_CFLAGS="$GNOME_PILOT_CFLAGS $PISOCK_CFLAGS $HAL_CFLAGS"
+ GNOME_PILOT_LIBS="$GNOME_PILOT_LIBS $PISOCK_LIBS $HAL_LIBS"
+
++AC_SUBST(GPILOTD_CONDUIT_CFLAGS)
++AC_SUBST(GPILOTD_CONDUIT_LIBS)
++AC_SUBST(GPILOTDCM_CFLAGS)
++AC_SUBST(GPILOTDCM_LIBS)
++AC_SUBST(GPILOTD_CFLAGS)
++AC_SUBST(GPILOTD_LIBS)
+ AC_SUBST(GNOME_PILOT_CFLAGS)
+ AC_SUBST(GNOME_PILOT_LIBS)
+
--- gnome-pilot-2.0.15.orig/debian/patches/gp-missingsymbol
+++ gnome-pilot-2.0.15/debian/patches/gp-missingsymbol
@@ -0,0 +1,13 @@
+--- gnome-pilot-2.0.14.orig/libgpilotdCM/Makefile.in
++++ gnome-pilot-2.0.14/libgpilotdCM/Makefile.in
+@@ -269,7 +269,9 @@
+
+ libgpilotdcm_la_LIBADD =
+ am__objects_1 = gnome-pilot-conduit-management.lo \
+- gnome-pilot-conduit-config.lo
++ gnome-pilot-conduit-config.lo \
++ ../gpilotd/gnome-pilot-structures.lo \
++ ../gpilotd/gnome-pilot-conduit.lo
+ am_libgpilotdcm_la_OBJECTS = $(am__objects_1)
+ libgpilotdcm_la_OBJECTS = $(am_libgpilotdcm_la_OBJECTS)
+
--- gnome-pilot-2.0.15.orig/debian/patches/01_applet_category.patch
+++ gnome-pilot-2.0.15/debian/patches/01_applet_category.patch
@@ -0,0 +1,33 @@
+diff -ruN orig/applet/GNOME_PilotApplet.server.in.in gnome-pilot-2.0.14/applet/GNOME_PilotApplet.server.in.in
+--- orig/applet/GNOME_PilotApplet.server.in.in 2006-09-18 09:19:37.000000000 +0200
++++ gnome-pilot-2.0.14/applet/GNOME_PilotApplet.server.in.in 2006-09-18 09:20:10.000000000 +0200
+@@ -24,7 +24,7 @@
+
+
+
+-
++
+
+
+
+diff -ruN orig/debian/patches/01_applet_category.patch gnome-pilot-2.0.14/debian/patches/01_applet_category.patch
+--- orig/debian/patches/01_applet_category.patch 2006-09-18 09:19:37.000000000 +0200
++++ gnome-pilot-2.0.14/debian/patches/01_applet_category.patch 2006-09-18 09:20:39.000000000 +0200
+@@ -1,12 +1,12 @@
+-diff -u -Nur gnome-pilot-2.0.13.orig/applet/GNOME_PilotApplet.server.in.in gnome-pilot-2.0.13/applet/GNOME_PilotApplet.server.in.in
+---- gnome-pilot-2.0.13.orig/applet/GNOME_PilotApplet.server.in.in 2003-02-03 08:15:11.000000000 +0100
+-+++ gnome-pilot-2.0.13/applet/GNOME_PilotApplet.server.in.in 2005-08-23 14:15:18.000000000 +0200
++diff -ruN orig/applet/GNOME_PilotApplet.server.in.in gnome-pilot-2.0.14/applet/GNOME_PilotApplet.server.in.in
++--- orig/applet/GNOME_PilotApplet.server.in.in 2006-09-18 09:19:37.000000000 +0200
+++++ gnome-pilot-2.0.14/applet/GNOME_PilotApplet.server.in.in 2006-09-18 09:20:10.000000000 +0200
+ @@ -24,7 +24,7 @@
+
+
+
+ -
+-+
+-
+++
++
+
+