Multisync packages ready for hoary
Michael Banck
mbanck at gmx.net
Fri Dec 10 07:35:50 CST 2004
Hello Warthogs,
I believe now would be a good time to have multisync in hoary/universe.
Over the last days I have (i) NMU'd the Debian package to fix the
outstanding crashers in the Evolution2 plugin and (ii) submitted a patch
and got it applied in upstream's CVS which fixes building multisync with
e-d-s 1.1.
I have prepared hoary source packages with this minimal patch (the
interdiff to the revision in unstable is attached), maybe somebody wants
to upload those to universe. Otherwise, you could just wait until
multisync-0.83 will be release (though there seems to be no ETA yet) and
eventually tickle into unstable and finally universe.
A signed source (there are binaries there as well) package is at
deb-src http://people.debian.org/~mbanck/ubuntu-hoary/ ./
enjoy,
Michael
-------------- next part --------------
diff -u multisync-0.82/plugins/evolution2_sync/configure.in multisync-0.82/plugins/evolution2_sync/configure.in
--- multisync-0.82/plugins/evolution2_sync/configure.in
+++ multisync-0.82/plugins/evolution2_sync/configure.in
@@ -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 -u multisync-0.82/plugins/evolution2_sync/configure multisync-0.82/plugins/evolution2_sync/configure
--- multisync-0.82/plugins/evolution2_sync/configure
+++ multisync-0.82/plugins/evolution2_sync/configure
@@ -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
+
diff -u multisync-0.82/debian/changelog multisync-0.82/debian/changelog
--- multisync-0.82/debian/changelog
+++ multisync-0.82/debian/changelog
@@ -1,3 +1,11 @@
+multisync (0.82-3.2ubuntu1) hoary; urgency=low
+
+ * plugins/evolution2_sync/configure.in: Applied patch from upstream CVS
+ to support building against evolution-data-server-1.1.
+ * plugins/evolution2_sync/configure: Regenerated.
+
+ -- Michael Banck <mbanck at gmx.net> Fri, 10 Dec 2004 13:55:49 +0100
+
multisync (0.82-3.2) unstable; urgency=low
* Non-maintainer upload.
More information about the ubuntu-devel
mailing list