Merge tag 'syncevolution-1-3-1'
This commit is contained in:
Patrick Ohly
commit
6d1cb8f6a0
|
|
@ -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
|
||||
|
|
|
|||
48
NEWS
48
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
|
||||
======================================
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1462,6 +1462,7 @@ bool Cmdline::run() {
|
|||
count,
|
||||
entry.c_str(),
|
||||
insertItem(raw, "", content).getEncoded().c_str());
|
||||
count++;
|
||||
}
|
||||
}
|
||||
char *token = NULL;
|
||||
|
|
|
|||
|
|
@ -1552,12 +1552,10 @@ boost::shared_ptr<TransportAgent> SyncContext::createTransportAgent(void *gmainl
|
|||
InitializeTransport(agent, timeout);
|
||||
return agent;
|
||||
#elif defined(ENABLE_LIBCURL)
|
||||
if (!gmainloop) {
|
||||
boost::shared_ptr<CurlTransportAgent> agent(new CurlTransportAgent());
|
||||
agent->setConfig(*this);
|
||||
InitializeTransport(agent, timeout);
|
||||
return agent;
|
||||
}
|
||||
boost::shared_ptr<CurlTransportAgent> agent(new CurlTransportAgent());
|
||||
agent->setConfig(*this);
|
||||
InitializeTransport(agent, timeout);
|
||||
return agent;
|
||||
#endif
|
||||
} else if (url.find("obex-bt://") ==0) {
|
||||
#ifdef ENABLE_BLUETOOTH
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<macro name="VCARD_INCOMING_PHOTO_TYPE_SCRIPT"><![CDATA[
|
||||
// Fix PHOTO TYPE=image/jpeg (sent by Funambol).
|
||||
INTEGER pos;
|
||||
pos = RFIND(PHOTO_TYPE, "/");
|
||||
pos = RFIND(PHOTO_TYPE, "/", SIZE(PHOTO_TYPE));
|
||||
if (pos != UNASSIGNED) {
|
||||
PHOTO_TYPE = SUBSTR(PHOTO_TYPE, pos + 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,6 +117,7 @@
|
|||
if (SUMMARY==EMPTY) SUMMARY="unnamed"; // set dummy summary if we still don't have one
|
||||
// due shaping for non-iCalendar 2.0
|
||||
if (ITEMDATATYPE()=="vCalendar10" && ALLDAYCOUNT(DUE,DUE,TRUE,TRUE)>0) {
|
||||
DUE = CONVERTTOUSERZONE(DUE);
|
||||
DUE = DATEONLY(DUE);
|
||||
}
|
||||
if (ITEMDATATYPE()=="vCalendar10") {
|
||||
|
|
|
|||
|
|
@ -1288,6 +1288,14 @@ Exec=%s
|
|||
env = copy.deepcopy(os.environ)
|
||||
env['XDG_DATA_DIRS'] = os.path.abspath(os.path.join(xdg_root, "share"))
|
||||
|
||||
# Avoid running EDS and Akonadi. They are not needed for this test
|
||||
# and can cause false failures, for example when the daemons
|
||||
# return an unexpected error cause, which then would be returned
|
||||
# by dbus-session.sh.
|
||||
for key in ('DBUS_SESSION_SH_EDS_BASE', 'DBUS_SESSION_SH_AKONADI'):
|
||||
if env.has_key(key):
|
||||
del env[key]
|
||||
|
||||
# First run something which just starts the daemon.
|
||||
dbus = subprocess.Popen((os.path.join(os.path.dirname(sys.argv[0]), 'dbus-session.sh'),
|
||||
'dbus-send',
|
||||
|
|
|
|||
Loading…
Reference in New Issue