Hi,
I prepared (hopefully) fixed packages for evolution2.2, they are
available at
deb http://people.debian.org/~mbanck/debs/ ./
Please test and tell me whether they work, I will then upload the fix.
(Mikael: The interdiff between version 0.82-5 and 0.82-5.1 is attached.)
cheers,
Michael
--
Michael Banck
Debian Developer
[EMAIL PROTECTED]
http://www.advogato.org/person/mbanck/diary.html
diff -Naur multisync-0.82/debian/changelog multisync-0.82-5.1/debian/changelog
--- multisync-0.82/debian/changelog 2005-04-30 18:02:07.096838280 +0200
+++ multisync-0.82-5.1/debian/changelog 2005-04-30 17:40:19.000000000 +0200
@@ -1,3 +1,14 @@
+multisync (0.82-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * plugins/evolution2_sync/configure.in: Add support for both e-d-s-1.0
+ and e-d-s-1.2.
+ * plugins/evolution2_sync/configure: Regenerated.
+ * debian/control: Build-Depend on evolution-data-server1.2-dev instead
+ of evolution-data-server-dev.
+
+ -- Michael Banck <[EMAIL PROTECTED]> Sat, 30 Apr 2005 17:32:57 +0200
+
multisync (0.82-5) unstable; urgency=low
* debian/control add build conflict to libopenobex1 and add dependency
diff -Naur multisync-0.82/debian/control multisync-0.82-5.1/debian/control
--- multisync-0.82/debian/control 2005-04-30 18:02:07.096838280 +0200
+++ multisync-0.82-5.1/debian/control 2005-04-30 17:40:11.000000000 +0200
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Mikael Sennerholm <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), libgnome2-dev, libbonobo2-dev,
liborbit2-dev (>= 1:2.8), libglade2-dev, libgnomeui-dev, libgnomeprintui2.2-dev
, heimdal-dev, libgal2.0-dev, bluez-utils, libbluetooth1-dev,
libopenobex-1.0-0-dev, libssl-dev, libcurl3-dev, autotools-dev, automake1.6,
libpisock-dev, evolution-data-server-dev, libwbxml2-dev
+Build-Depends: debhelper (>> 3.0.0), libgnome2-dev, libbonobo2-dev,
liborbit2-dev (>= 1:2.8), libglade2-dev, libgnomeui-dev, libgnomeprintui2.2-dev
, heimdal-dev, libgal2.0-dev, bluez-utils, libbluetooth1-dev,
libopenobex-1.0-0-dev, libssl-dev, libcurl3-dev, autotools-dev, automake1.6,
libpisock-dev, evolution-data-server1.2-dev, libwbxml2-dev
Build-Conflicts: libopenobex1
Standards-Version: 3.5.8
diff -Naur multisync-0.82/plugins/evolution2_sync/configure.in
multisync-0.82-5.1/plugins/evolution2_sync/configure.in
--- multisync-0.82/plugins/evolution2_sync/configure.in 2005-04-30
18:02:06.916865640 +0200
+++ multisync-0.82-5.1/plugins/evolution2_sync/configure.in 2005-04-30
17:04:39.000000000 +0200
@@ -11,8 +11,11 @@
AC_PROG_LIBTOOL
AC_PROG_YACC
-pkg_modules="gtk+-2.0 libgnomeui-2.0 libbonoboui-2.0 glib-2.0 libbonobo-2.0
evolution-data-server-1.0 libebook-1.0 libecal-1.0 libedata-book-1.0
libedata-cal-1.0 libedataserver-1.0"
-PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+pkg_modules_generic="gtk+-2.0 libgnomeui-2.0 libbonoboui-2.0 glib-2.0
libbonobo-2.0"
+pkg_modules_eds_1_0="evolution-data-server-1.0 libebook-1.0 libecal-1.0
libedata-book-1.0 libedata-cal-1.0 libedataserver-1.0"
+pkg_modules_eds_1_2="evolution-data-server-1.2 libebook-1.2 libecal-1.2
libedata-book-1.2 libedata-cal-1.2 libedataserver-1.2"
+PKG_CHECK_MODULES(PACKAGE, [$pkg_modules_generic $pkg_modules_eds_1_0],
version="2.0",
+ [PKG_CHECK_MODULES(PACKAGE, [$pkg_modules_generic
$pkg_modules_eds_1_2], version="2.2")])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
diff -Naur multisync-0.82/plugins/evolution2_sync/configure
multisync-0.82-5.1/plugins/evolution2_sync/configure
--- multisync-0.82/plugins/evolution2_sync/configure 2005-04-30
18:02:06.993853936 +0200
+++ multisync-0.82-5.1/plugins/evolution2_sync/configure 2005-04-30
17:06:53.000000000 +0200
@@ -20868,7 +20868,9 @@
test -n "$YACC" || YACC="yacc"
-pkg_modules="gtk+-2.0 libgnomeui-2.0 libbonoboui-2.0 glib-2.0 libbonobo-2.0
evolution-data-server-1.0 libebook-1.0 libecal-1.0 libedata-book-1.0
libedata-cal-1.0 libedataserver-1.0"
+pkg_modules_generic="gtk+-2.0 libgnomeui-2.0 libbonoboui-2.0 glib-2.0
libbonobo-2.0"
+pkg_modules_eds_1_0="evolution-data-server-1.0 libebook-1.0 libecal-1.0
libedata-book-1.0 libedata-cal-1.0 libedataserver-1.0"
+pkg_modules_eds_1_2="evolution-data-server-1.2 libebook-1.2 libecal-1.2
libedata-book-1.2 libedata-cal-1.2 libedataserver-1.2"
succeeded=no
@@ -20923,23 +20925,23 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for $pkg_modules" >&5
-echo $ECHO_N "checking for $pkg_modules... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for $pkg_modules_generic
$pkg_modules_eds_1_0" >&5
+echo $ECHO_N "checking for $pkg_modules_generic $pkg_modules_eds_1_0...
$ECHO_C" >&6
- if $PKG_CONFIG --exists "$pkg_modules" ; then
+ if $PKG_CONFIG --exists "$pkg_modules_generic $pkg_modules_eds_1_0" ;
then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking PACKAGE_CFLAGS" >&5
echo $ECHO_N "checking PACKAGE_CFLAGS... $ECHO_C" >&6
- PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules"`
+ PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules_generic
$pkg_modules_eds_1_0"`
echo "$as_me:$LINENO: result: $PACKAGE_CFLAGS" >&5
echo "${ECHO_T}$PACKAGE_CFLAGS" >&6
echo "$as_me:$LINENO: checking PACKAGE_LIBS" >&5
echo $ECHO_N "checking PACKAGE_LIBS... $ECHO_C" >&6
- PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules"`
+ PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules_generic
$pkg_modules_eds_1_0"`
echo "$as_me:$LINENO: result: $PACKAGE_LIBS" >&5
echo "${ECHO_T}$PACKAGE_LIBS" >&6
else
@@ -20947,7 +20949,100 @@
PACKAGE_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"$pkg_modules"`
+ PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"$pkg_modules_generic $pkg_modules_eds_1_0"`
+
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version
$PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig";
+ fi
+ fi
+
+ if test $succeeded = yes; then
+ version="2.0"
+ else
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with
args.
+set dummy pkg-config; 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_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$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
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get
pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ echo "$as_me:$LINENO: checking for $pkg_modules_generic
$pkg_modules_eds_1_2" >&5
+echo $ECHO_N "checking for $pkg_modules_generic $pkg_modules_eds_1_2...
$ECHO_C" >&6
+
+ if $PKG_CONFIG --exists "$pkg_modules_generic $pkg_modules_eds_1_2" ;
then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking PACKAGE_CFLAGS" >&5
+echo $ECHO_N "checking PACKAGE_CFLAGS... $ECHO_C" >&6
+ PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules_generic
$pkg_modules_eds_1_2"`
+ echo "$as_me:$LINENO: result: $PACKAGE_CFLAGS" >&5
+echo "${ECHO_T}$PACKAGE_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking PACKAGE_LIBS" >&5
+echo $ECHO_N "checking PACKAGE_LIBS... $ECHO_C" >&6
+ PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules_generic
$pkg_modules_eds_1_2"`
+ echo "$as_me:$LINENO: result: $PACKAGE_LIBS" >&5
+echo "${ECHO_T}$PACKAGE_LIBS" >&6
+ else
+ PACKAGE_CFLAGS=""
+ PACKAGE_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"$pkg_modules_generic $pkg_modules_eds_1_2"`
echo $PACKAGE_PKG_ERRORS
fi
@@ -20960,13 +21055,15 @@
fi
if test $succeeded = yes; then
- :
+ version="2.2"
else
- { { echo "$as_me:$LINENO: error: Library requirements ($pkg_modules) not
met; consider 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: Library requirements ($pkg_modules) not met; consider
adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a
nonstandard prefix so pkg-config can find them." >&2;}
+ { { echo "$as_me:$LINENO: error: Library requirements
($pkg_modules_generic $pkg_modules_eds_1_2) not met; consider 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: Library requirements ($pkg_modules_generic
$pkg_modules_eds_1_2) not met; consider 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
+
