From d38b93dadc38617a14dcd7187845defa90ed245b Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 28 Jun 2013 11:47:37 +0000 Subject: [PATCH] Imported Upstream version 1.3.1 --- Makefile.am | 4 +- Makefile.in | 4 +- NEWS | 48 +++++++++++++++++ README | 4 +- configure | 63 +++++++++++----------- configure.ac | 4 +- src/syncevo/Cmdline.cpp | 1 + src/syncevo/SyncContext.cpp | 10 ++-- .../configs/scripting/04vcard-photo-value.xml | 2 +- src/syncevo/configs/scripting/11calendar.xml | 1 + src/synthesis/ChangeLog | 55 ++++++++++++++++++- 11 files changed, 148 insertions(+), 48 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2df623f..9be9aec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -220,8 +220,8 @@ SYNCEVOLUTION_evolution_DEB_ARGS = \ --conflicts="'evolution-data-server (>= 3.6), libebook-1.2-14 (>= 3.6), libecal-1.2.12 (>= 3.6)'" \ --replaces=syncevolution-foobar SYNCEVOLUTION_evolution_DEB_REQUIRES = \ - , libebook-1.2-5 | libebook-1.2-6 | libebook-1.2-7 | libebook-1.2-8 | libebook-1.2-9 | libebook-1.2-10 | libebook-1.2-11 | libebook-1.2-12 | libebook-1.2-13 \ - , libecal-1.2-3 | libecal-1.2-4 | libecal-1.2-5 | libecal-1.2-6 | libecal-1.2-7 | libecal-1.2-8 | libecal-1.2-9 | libecal-1.2-10 | libecal-1.2-11 + , libebook1.2-5 | libebook1.2-6 | libebook1.2-7 | libebook1.2-8 | libebook1.2-9 | libebook1.2-10 | libebook1.2-11 | libebook-1.2-11 | libebook-1.2-12 | libebook-1.2-13 \ + , libecal1.2-3 | libecal1.2-4 | libecal1.2-5 | libecal1.2-6 | libecal1.2-7 | libecal1.2-8 | libecal1.2-9 | libecal1.2-10 | libecal-1.2-10 | libecal-1.2-11 syncevolution-%-deb: checkinstall/dist/$(distdir) checkinstall/dist/debian/control (echo "SyncEvolution - meta package for $*" && cat $(srcdir)/description) >checkinstall/description-pak diff --git a/Makefile.in b/Makefile.in index c61fbc1..150b6af 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3312,8 +3312,8 @@ SYNCEVOLUTION_evolution_DEB_ARGS = \ --replaces=syncevolution-foobar SYNCEVOLUTION_evolution_DEB_REQUIRES = \ - , libebook-1.2-5 | libebook-1.2-6 | libebook-1.2-7 | libebook-1.2-8 | libebook-1.2-9 | libebook-1.2-10 | libebook-1.2-11 | libebook-1.2-12 | libebook-1.2-13 \ - , libecal-1.2-3 | libecal-1.2-4 | libecal-1.2-5 | libecal-1.2-6 | libecal-1.2-7 | libecal-1.2-8 | libecal-1.2-9 | libecal-1.2-10 | libecal-1.2-11 + , libebook1.2-5 | libebook1.2-6 | libebook1.2-7 | libebook1.2-8 | libebook1.2-9 | libebook1.2-10 | libebook1.2-11 | libebook-1.2-11 | libebook-1.2-12 | libebook-1.2-13 \ + , libecal1.2-3 | libecal1.2-4 | libecal1.2-5 | libecal1.2-6 | libecal1.2-7 | libecal1.2-8 | libecal1.2-9 | libecal1.2-10 | libecal-1.2-10 | libecal-1.2-11 # Some exceptions for the link check above (= symbol may be used without linking). diff --git a/NEWS b/NEWS index 1e6754a..2db7f74 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,51 @@ +SyncEvolution 1.3 -> 1.3.1, 05.10.2012 +====================================== + +Minor bug fix release. Details: + +* command line: fix output of --import for directories + + The running count at the start of the line (#0, #1, ...) was + not incremented when reading individual files from a directory. + +* Funambol: work around PHOTO TYPE=image/jpeg, part II + + The final version of the fix hadn't made it into the source code. + +* vCalendar 1.0 + tasks: DUE date could be shifted by a day (FDO #55238) + + Because of incomplete support for time conversion, the due date + could get mixed up when phone and PC were set to something other + than UTC. Reported and fixed by Peter Jan. + +* syncevolution.org: syncevolution-evolution had incorrect dependencies + + Installation on older Linux distros was not possible because the ebook/ecal + package dependencies were named incorrectly, for example libebook-1.2-10 + instead of libebook1.2-10. Only more recent packages have the extra + dash, for example libebook-1.2-12. Reported by Mariusz Sokolowski. + +* GTK-3 UI: fixed compile problem + + The GTK-3 UI depends on a class from gio-unix-2.0 and failed to + compile on Fedora Core 16 because the configure checks for that lib + (and thus the compiler flags) were missing. Reported by Peter + Robinson. + +* Curl: allow using it in the D-Bus server + + In the past, using curl as HTTP transport in the syncevo-dbus-server + was prevented, leading to "unsupported transport type is specified in + the configuration". The reason was that using curl would block the + server and make it unresponsive on D-Bus. + + This reason has gone away, because now the HTTP traffic happens in a + separate process. Thus now it is allowed to use curl in the + syncevo-dbus-server. + +* fix for false negative in syncevo-dbus-server testing + + SyncEvolution 1.2.2 -> 1.3, 10.09.2012 ====================================== diff --git a/README b/README index fec40e9..e12f008 100644 --- a/README +++ b/README @@ -7,8 +7,8 @@ synchronize personal information management data ------------------------------------------------ :Manual section: 1 -:Version: 1.3 -:Date: 2012-09-10 +:Version: 1.3.1 +:Date: 2012-10-05 SYNOPSIS diff --git a/configure b/configure index 46d2139..d73f250 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for syncevolution 1.3. +# Generated by GNU Autoconf 2.65 for syncevolution 1.3.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -698,8 +698,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='syncevolution' PACKAGE_TARNAME='syncevolution' -PACKAGE_VERSION='1.3' -PACKAGE_STRING='syncevolution 1.3' +PACKAGE_VERSION='1.3.1' +PACKAGE_STRING='syncevolution 1.3.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1786,7 +1786,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures syncevolution 1.3 to adapt to many kinds of systems. +\`configure' configures syncevolution 1.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1856,7 +1856,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of syncevolution 1.3:";; + short | recursive ) echo "Configuration of syncevolution 1.3.1:";; esac cat <<\_ACEOF @@ -2248,7 +2248,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -syncevolution configure 1.3 +syncevolution configure 1.3.1 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2821,7 +2821,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by syncevolution $as_me 1.3, which was +It was created by syncevolution $as_me 1.3.1, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3207,7 +3207,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - # Minimum version of libsynthesis as defined in its # configure script and thus .pc files: @@ -3702,7 +3701,7 @@ fi # Define the identity of the package. PACKAGE='syncevolution' - VERSION='1.3' + VERSION='1.3.1' cat >>confdefs.h <<_ACEOF @@ -5639,13 +5638,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5642: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5641: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5645: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5644: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5648: output\"" >&5) + (eval echo "\"\$as_me:5647: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6851,7 +6850,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6854 "configure"' > conftest.$ac_ext + echo '#line 6853 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8380,11 +8379,11 @@ else -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:8383: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8382: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8387: \$? = $ac_status" >&5 + echo "$as_me:8386: \$? = $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. @@ -8719,11 +8718,11 @@ else -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:8722: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8721: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8726: \$? = $ac_status" >&5 + echo "$as_me:8725: \$? = $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. @@ -8824,11 +8823,11 @@ else -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:8827: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8826: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8831: \$? = $ac_status" >&5 + echo "$as_me:8830: \$? = $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 @@ -8879,11 +8878,11 @@ else -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:8882: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8881: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8886: \$? = $ac_status" >&5 + echo "$as_me:8885: \$? = $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 @@ -11263,7 +11262,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11266 "configure" +#line 11265 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11359,7 +11358,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11362 "configure" +#line 11361 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14246,11 +14245,11 @@ else -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:14249: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14248: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14253: \$? = $ac_status" >&5 + echo "$as_me:14252: \$? = $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. @@ -14345,11 +14344,11 @@ else -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:14348: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14347: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14352: \$? = $ac_status" >&5 + echo "$as_me:14351: \$? = $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 @@ -14397,11 +14396,11 @@ else -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:14400: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14399: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14404: \$? = $ac_status" >&5 + echo "$as_me:14403: \$? = $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 @@ -18494,7 +18493,7 @@ fi - gui_modules="$gtk_version glib-2.0 dbus-glib-1 >= 0.60 gio-2.0" + gui_modules="$gtk_version glib-2.0 dbus-glib-1 >= 0.60 gio-2.0 gio-unix-2.0" if test $enable_gui = "moblin"; then $as_echo "#define USE_MOBLIN_UX 1" >>confdefs.h @@ -24156,7 +24155,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by syncevolution $as_me 1.3, which was +This file was extended by syncevolution $as_me 1.3.1, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24222,7 +24221,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -syncevolution config.status 1.3 +syncevolution config.status 1.3.1 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 14fa75d..0bf3b2a 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl Invoke autogen.sh to produce a configure script. # # Starting with the 1.1 release cycle, the rpm-style # .99 pseudo-version number is used to mark a pre-release. -AC_INIT([syncevolution], [m4_esyscmd([build/gen-git-version.sh 1.3])]) +AC_INIT([syncevolution], [m4_esyscmd([build/gen-git-version.sh 1.3.1])]) # STABLE_VERSION=1.0.1+ AC_SUBST(STABLE_VERSION) @@ -559,7 +559,7 @@ if test $enable_gui != "no"; then AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) - gui_modules="$gtk_version glib-2.0 dbus-glib-1 >= 0.60 gio-2.0" + gui_modules="$gtk_version glib-2.0 dbus-glib-1 >= 0.60 gio-2.0 gio-unix-2.0" if test $enable_gui = "moblin"; then AC_DEFINE(USE_MOBLIN_UX, 1, [Use Moblin UI widgets]) fi diff --git a/src/syncevo/Cmdline.cpp b/src/syncevo/Cmdline.cpp index 9ea20c9..1aa9693 100644 --- a/src/syncevo/Cmdline.cpp +++ b/src/syncevo/Cmdline.cpp @@ -1462,6 +1462,7 @@ bool Cmdline::run() { count, entry.c_str(), insertItem(raw, "", content).getEncoded().c_str()); + count++; } } char *token = NULL; diff --git a/src/syncevo/SyncContext.cpp b/src/syncevo/SyncContext.cpp index 581d755..b437be8 100644 --- a/src/syncevo/SyncContext.cpp +++ b/src/syncevo/SyncContext.cpp @@ -1552,12 +1552,10 @@ boost::shared_ptr SyncContext::createTransportAgent(void *gmainl InitializeTransport(agent, timeout); return agent; #elif defined(ENABLE_LIBCURL) - if (!gmainloop) { - boost::shared_ptr agent(new CurlTransportAgent()); - agent->setConfig(*this); - InitializeTransport(agent, timeout); - return agent; - } + boost::shared_ptr agent(new CurlTransportAgent()); + agent->setConfig(*this); + InitializeTransport(agent, timeout); + return agent; #endif } else if (url.find("obex-bt://") ==0) { #ifdef ENABLE_BLUETOOTH diff --git a/src/syncevo/configs/scripting/04vcard-photo-value.xml b/src/syncevo/configs/scripting/04vcard-photo-value.xml index d3a4064..51f8a21 100644 --- a/src/syncevo/configs/scripting/04vcard-photo-value.xml +++ b/src/syncevo/configs/scripting/04vcard-photo-value.xml @@ -13,7 +13,7 @@ 0) { + DUE = CONVERTTOUSERZONE(DUE); DUE = DATEONLY(DUE); } if (ITEMDATATYPE()=="vCalendar10") { diff --git a/src/synthesis/ChangeLog b/src/synthesis/ChangeLog index bb4f13d..4b4b80f 100644 --- a/src/synthesis/ChangeLog +++ b/src/synthesis/ChangeLog @@ -5676,7 +5676,60 @@ Initial Commit by Synthesis AG for Open Source libsynthesis 3.2.0.25 and libsmltk -tead of +t/test-dbus.py: + + test-dbus: Use non-deprecated unittest assert/fail methods. part + II + +2011-06-28 Chris Kühl + + * test/test-dbus.py: + + test-dbus: Catch missing source exception and trigger test + failure + +2011-06-27 Chris Kühl + + * test/test-dbus.py: + + test-dbus: Remove redundant directory mapping documentation + +2011-06-27 Chris Kühl + + * test/test-dbus.py: + + test-dbus: Fix typos + +2011-06-27 Chris Kühl + + * test/test-dbus.py: + + test-dbus: Update term 'type' to be its non-ambiguous version + +2011-06-27 Chris Kühl + + * test/test-dbus.py: + + test-dbus: Updated term 'evolutionSource' to 'database' + +2011-06-27 Chris Kühl + + * test/test-dbus.py: + + test-dbus: Make method name consistent (setupFiles -> setUpFiles) + +2011-06-27 Chris Kühl + + * test/test-dbus.py: + + test-dbus: Use non-deprecated unittest assert/fail methods. + +2011-06-27 Chris Kühl + + * src/dbus/interfaces/syncevo-server-full.xml: + * src/dbus/interfaces/syncevo-session-full.xml: + + dbus: Updated wording to use 'database' instead of 'evolutionSource' 2011-08-22 Chris Kühl -- 2.7.4