Commit aa13c844 authored by Patrick Ohly's avatar Patrick Ohly
Browse files

Merge remote branch 'origin/syncevolution-0-9-branch'

Conflicts:
	configure-pre.in
	src/syncevo/Makefile.am

Version conflict in configure and unrelated changes near
same line in Makefile.
parents ec34471e 87311e6c
......@@ -11,6 +11,7 @@ EXTRA_DIST = \
description \
configure-pre.in \
configure-post.in \
gen-autotools.sh \
autogen.sh \
Makefile-gen.am \
Doxyfile
......@@ -101,8 +102,6 @@ PKGS = $(addprefix syncevolution-evolution-, 2.6 2.8 2.12)
deb rpm : dist/$(distdir) dist/debian/control doc-pak description-pak
tmpdir=`mktemp -d $$HOME/syncevolution.XXXXXXXXXX` && \
trap "rm -rf $$tmpdir" EXIT && \
docdir="$(docdir)" && \
if [ ! "$$docdir" ]; then docdir="$(datadir)/doc/$(PACKAGE)"; fi && \
fakeroot checkinstall </dev/null \
$(TYPE_$@) \
$(REQUIRES_$@) \
......@@ -119,7 +118,7 @@ deb rpm : dist/$(distdir) dist/debian/control doc-pak description-pak
--pkgsource='http://sourceforge.net/project/showfiles.php?group_id=146288' \
--pkgaltsource='http://www.estamos.de/projects/SyncML/' \
--pkggroup='gnome' \
--docdir=":$$docdir" cp -r `pwd`/$</usr/* /usr
cp -r `pwd`/$</usr/* /usr
if [ $@ == "rpm" ]; then cp /usr/src/rpm/RPMS/*/${PKGNAME}-${VERSION}-2.*.rpm .; fi
.PHONY: dist/$(distdir) clean_dist
......@@ -132,16 +131,15 @@ clean-local: clean_dist
clean_dist:
rm -rf dist doc-pak description-pak
# install doc files via normal autotools
dist_doc_DATA = README NEWS COPYING $(TEST_README_FILES)
# required by dpkg-shlibdeps
dist/debian/control:
mkdir -p ${@D}
touch $@
doc-pak : README NEWS COPYING $(TEST_README_FILES)
rm -rf $@
mkdir $@
cp $+ $@
# for checkinstall
description-pak : description
cp $< $@
......
SyncEvolution 0.9.1 -> 0.9.2, 27.11.2009
========================================
Synthesis SyncML Engine version: see src/synthesis/ChangeLog
Incremental update, with several updated translations and addressing
most of the issues reported by users for 0.9.1:
- Evolution Address Book: avoid picking CouchDB by default (MB #7877, evolution-couchdb #479110)
CouchDB address books are appended at the end of the local database
list, otherwise preserving the order of address books. The initial
release of evolution-couchdb in Ubuntu 9.10 is unusable because it
does not support the REV property.
Reordering the entries ensures that the CouchDB address book is not
used as the default database by SyncEvolution, as it happened in
Ubuntu 9.10. Users can still pick it intentionally via
"evolutionsource".
- installation: templates now in $(datadir)/syncevolution/templates (MB #7808)
This are files used internally, meant to be extended by distributors.
Storing them in /etc is no longer supported, but also unlikely to be
needed. Added warnings that these files cannot simply be copied into
.config because they are not complete configurations.
- installation: "make install" populates $(docdir) (MB #7168)
Previously README, COPYING, NEWS, and server READMEs were copied
into syncevolution.org .tar.gz/.deb/.rpm archives as part of
custom make rules and thus missing in other installations.
- autotools + Boost: --with-boost had no effect (MB#7856)
- configure: detect incorrect use of --with-synthesis-src
- stderr redirection: detect "error" messages and show them (MB#7655)
The "GConf Error: Failed to contact configuration server..." error
message was suppressed by the code which catches noise from libraries
invoked by SyncEvolution. Now it is printed as ERROR, making it
easier to detect why running SyncEvolution inside cron needs
additional changes:
http://www.estamos.de/blog/2009/05/08/running-syncevolution-as-cron-job/
SyncEvolution 0.9 -> 0.9.1, 26.10.2009
======================================
Synthesis SyncML Engine version: see src/synthesis/ChangeLog
......
......@@ -26,7 +26,7 @@ for sub in src/backends/*/configure-sub.in; do
done
cat configure-post.in >>configure.in
TEMPLATE_FILES=`cd src && find default/syncevolution -type f \( -name '*.png' -o -name '*.svg' -o -name '*.ini' \)`
TEMPLATE_FILES=`cd src && find templates -type f \( -name README -o -name '*.png' -o -name '*.svg' -o -name '*.ini' \)`
TEMPLATE_FILES=`echo $TEMPLATE_FILES`
# create Makefile.am files
......
......@@ -42,7 +42,8 @@ endif
EXTRA_DIST = shlibs.local Makefile-gen.am syncclient_sample_config.xml $(service_in_files)
TEMPLATE_FILES = @TEMPLATE_FILES@
nobase_dist_sysconf_DATA = $(TEMPLATE_FILES)
templatedir = $(datadir)/syncevolution/
nobase_dist_template_DATA = $(TEMPLATE_FILES)
DISTCLEANFILES = synccompare
MAINTAINERCLEANFILES = Makefile.in
......
The configuration templates in this directory get installed into
sysconfdir/etc/default.
The configuration templates in "templates" get installed into
$(datadir)/syncevolution/templates.
When adding/changing a new server, then only enter the properties
which need to be changed here so that the default values can
......@@ -15,5 +15,4 @@ Server configurations must be kept in sync in three different places:
- in test/test-dbus.py testGetConfigsTemplates()
Note that server icons must come with a suitable license that allows
redistribution. TODO: verify the license of ScheduleWorld and
Funambol icons.
redistribution.
......@@ -120,7 +120,7 @@ EXTRA_DIST =syncevolution.pc.in
libsyncevolution_la_SOURCES = $(SYNCEVOLUTION_SOURCES)
libsyncevolution_la_LIBADD = @EPACKAGE_LIBS@ @GLIB_LIBS@ $(SYNTHESIS_LIBS) $(TRANSPORT_LIBS) @LIBS@ $(SYNCEVOLUTION_LDADD)
libsyncevolution_la_CXXFLAGS = $(TRANSPORT_CFLAGS) $(SYNCEVOLUTION_CXXFLAGS) $(SYNTHESIS_CFLAGS)
libsyncevolution_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEMPLATE_DIR=\""$(sysconfdir)/default/syncevolution"\" -DLIBDIR=\""$(libdir)"\"
libsyncevolution_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEMPLATE_DIR=\""$(datadir)/syncevolution/templates"\" -DLIBDIR=\""$(libdir)"\"
libsyncevolution_la_DEPENDENCIES = $(SYNTHESIS_DEP)
if ENABLE_MODULES
......
# *not* a complete config, do not copy manually into ~/.config
syncURL = http://my.funambol.com/sync
WebURL = http://my.funambol.com
enableWBXML = FALSE
......
The configuration templates in this directory are *not* complete and
therefore not suitable for copying them directly in a .config
directory.
They contain only those properties which are different for a certain
peer compared to the built-in default values. They are used by the
SyncEvolution binaries to create complete configurations.
# *not* a complete config, do not copy manually into ~/.config
syncURL = http://sync.scheduleworld.com/funambol/ds
WebURL = http://sync.scheduleworld.com
ConsumerReady = TRUE
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment